[packages/amanda.git] / amanda-FHS.patch

diff -ur amanda-2.6.0/common-src/conffile.c amanda-2.6.0-fhs/common-src/conffile.c
--- amanda-2.6.0/common-src/conffile.c	2008-01-28 22:57:34.000000000 +0100
+++ amanda-2.6.0-fhs/common-src/conffile.c	2008-05-08 17:39:18.000000000 +0200
@@ -3143,13 +3143,13 @@
     conf_init_str(&conf_data[CNF_TAPEDEV], DEFAULT_TAPE_DEVICE);
     conf_init_proplist(&conf_data[CNF_DEVICE_PROPERTY]);
     conf_init_str(&conf_data[CNF_CHANGERDEV], DEFAULT_CHANGER_DEVICE);
-    conf_init_str(&conf_data[CNF_CHANGERFILE], "/usr/adm/amanda/changer-status");
+    conf_init_str(&conf_data[CNF_CHANGERFILE], "/etc/amanda/changer-status");
     conf_init_str   (&conf_data[CNF_LABELSTR]             , ".*");
     conf_init_str   (&conf_data[CNF_TAPELIST]             , "tapelist");
     conf_init_str   (&conf_data[CNF_DISKFILE]             , "disklist");
-    conf_init_str   (&conf_data[CNF_INFOFILE]             , "/usr/adm/amanda/curinfo");
-    conf_init_str   (&conf_data[CNF_LOGDIR]               , "/usr/adm/amanda");
-    conf_init_str   (&conf_data[CNF_INDEXDIR]             , "/usr/adm/amanda/index");
+    conf_init_str   (&conf_data[CNF_INFOFILE]             , "/var/lib/amanda/curinfo");
+    conf_init_str   (&conf_data[CNF_LOGDIR]               , "/var/lib/amanda");
+    conf_init_str   (&conf_data[CNF_INDEXDIR]             , "/var/lib/amanda/index");
     conf_init_ident    (&conf_data[CNF_TAPETYPE]             , "EXABYTE");
     conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , 10);
     conf_init_int      (&conf_data[CNF_RUNSPERCYCLE]         , 0);
diff -ur amanda-2.6.0/example/amanda.conf.in amanda-2.6.0-fhs/example/amanda.conf.in
--- amanda-2.6.0/example/amanda.conf.in	2008-01-18 01:31:14.000000000 +0100
+++ amanda-2.6.0-fhs/example/amanda.conf.in	2008-05-08 17:42:35.000000000 +0200
@@ -237,9 +237,9 @@
 # Note that, although the keyword below is infofile, it is only so for
 # historic reasons, since now it is supposed to be a directory (unless
 # you have selected some database format other than the `text' default)
-infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo"	# database DIRECTORY
-logdir   "@CONFIG_DIR@/@DEFAULT_CONFIG@"		# log directory
-indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index"		# index directory
+infofile "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/curinfo"	# database DIRECTORY
+logdir   "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@"		# log directory
+indexdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/index"		# index directory
 #tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist"	# list of used tapes
 # tapelist is stored, by default, in the directory that contains amanda.conf
 
diff -ur amanda-2.6.0/example/template.d/advanced.conf.in amanda-2.6.0-fhs/example/template.d/advanced.conf.in
--- amanda-2.6.0/example/template.d/advanced.conf.in	2008-01-18 01:31:13.000000000 +0100
+++ amanda-2.6.0-fhs/example/template.d/advanced.conf.in	2008-05-08 17:43:27.000000000 +0200
@@ -97,10 +97,10 @@
 # Note that, although the keyword below is infofile, it is only so for
 # historic reasons, since now it is supposed to be a directory (unless
 # you have selected some database format other than the `text' default)
-infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo"      # database DIRECTORY
-logdir   "@CONFIG_DIR@/@DEFAULT_CONFIG@"              # log directory
-indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index"        # index directory
-#tapelist "@CONFIG_DIR/DailySet1/tapelist"	# list of used tapes
+infofile "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/curinfo"      # database DIRECTORY
+logdir   "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@"              # log directory
+indexdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/index"        # index directory
+#tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist"	# list of used tapes
 # tapelist is stored, by default, in the directory that contains amanda.conf
 
 # Specify holding disks.  These are used as a temporary staging area for
diff -ur amanda-2.6.0/server-src/amserverconfig.pl amanda-2.6.0-fhs/server-src/amserverconfig.pl
--- amanda-2.6.0/server-src/amserverconfig.pl	2008-01-18 01:31:25.000000000 +0100
+++ amanda-2.6.0-fhs/server-src/amserverconfig.pl	2008-05-08 17:37:13.000000000 +0200
@@ -99,16 +99,16 @@
 	    unlink "$confdir/$config/tapelist" || 
 	    print LOG "unlink $confdir/$config/tapelist failed: $!\n";
 	}
-	if ( -e "$confdir/$config/curinfo" ) {
-	    rmdir "$confdir/$config/curinfo" || 
-	    print LOG "rmdir $confdir/$config failed: $!\n";
-	}
-	if ( -e "$confdir/$config/index" ) {
-	    rmdir "$confdir/$config/index" || 
-	    print LOG "rmdir $confdir/$config/index failed: $!\n";
+	if ( -e "$localstatedir/lib/amanda/$config/curinfo" ) {
+	    rmdir "$localstatedir/lib/amanda/$config/curinfo" || 
+	    print LOG "rmdir $localstatedir/lib/amanda/$config/curinfo failed: $!\n";
+	}
+	if ( -e "$localstatedir/lib/amanda/$config/index" ) {
+	    rmdir "$localstatedir/lib/amanda/$config/index" || 
+	    print LOG "rmdir $localstatedir/lib/amanda/$config/index failed: $!\n";
 	}
 	rmdir "$confdir/$config" || 
-	    print LOG "rmdir $confdir/$config failed: $!\n";
+	    print LOG "rmdir $localstatedir/lib/amanda/$config failed: $!\n";
     }
     die $err;
 }
@@ -173,10 +173,12 @@
 
 
 sub create_curinfo_index_dir {
-    mkdir("$confdir/$config/curinfo", $def_perm) ||
-	&log_and_die ("ERROR: mkdir: $confdir/$config/curinfo failed: $!\n", 1);
-    mkdir("$confdir/$config/index", $def_perm) || 
-	&log_and_die ("ERROR: mkdir: $confdir/$config/index failed: $!\n", 1);
+    mkdir("$localstatedir/lib/amanda/$config", $def_perm) ||
+	&log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config failed: $!\n", 1);
+    mkdir("$localstatedir/lib/amanda/$config/curinfo", $def_perm) ||
+	&log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config/curinfo failed: $!\n", 1);
+    mkdir("$localstatedir/lib/amanda/$config/index", $def_perm) || 
+	&log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config/index failed: $!\n", 1);
     &mprint ("curinfo and index directory created\n");
 }
Commit	Line	Data
4b51c379 JR	1	diff -ur amanda-2.6.0/common-src/conffile.c amanda-2.6.0-fhs/common-src/conffile.c
	2	--- amanda-2.6.0/common-src/conffile.c 2008-01-28 22:57:34.000000000 +0100
	3	+++ amanda-2.6.0-fhs/common-src/conffile.c 2008-05-08 17:39:18.000000000 +0200
	4	@@ -3143,13 +3143,13 @@
	5	conf_init_str(&conf_data[CNF_TAPEDEV], DEFAULT_TAPE_DEVICE);
	6	conf_init_proplist(&conf_data[CNF_DEVICE_PROPERTY]);
	7	conf_init_str(&conf_data[CNF_CHANGERDEV], DEFAULT_CHANGER_DEVICE);
	8	- conf_init_str(&conf_data[CNF_CHANGERFILE], "/usr/adm/amanda/changer-status");
	9	+ conf_init_str(&conf_data[CNF_CHANGERFILE], "/etc/amanda/changer-status");
	10	conf_init_str (&conf_data[CNF_LABELSTR] , ".*");
	11	conf_init_str (&conf_data[CNF_TAPELIST] , "tapelist");
	12	conf_init_str (&conf_data[CNF_DISKFILE] , "disklist");
	13	- conf_init_str (&conf_data[CNF_INFOFILE] , "/usr/adm/amanda/curinfo");
	14	- conf_init_str (&conf_data[CNF_LOGDIR] , "/usr/adm/amanda");
	15	- conf_init_str (&conf_data[CNF_INDEXDIR] , "/usr/adm/amanda/index");
	16	+ conf_init_str (&conf_data[CNF_INFOFILE] , "/var/lib/amanda/curinfo");
	17	+ conf_init_str (&conf_data[CNF_LOGDIR] , "/var/lib/amanda");
	18	+ conf_init_str (&conf_data[CNF_INDEXDIR] , "/var/lib/amanda/index");
	19	conf_init_ident (&conf_data[CNF_TAPETYPE] , "EXABYTE");
	20	conf_init_int (&conf_data[CNF_DUMPCYCLE] , 10);
	21	conf_init_int (&conf_data[CNF_RUNSPERCYCLE] , 0);
	22	diff -ur amanda-2.6.0/example/amanda.conf.in amanda-2.6.0-fhs/example/amanda.conf.in
	23	--- amanda-2.6.0/example/amanda.conf.in 2008-01-18 01:31:14.000000000 +0100
	24	+++ amanda-2.6.0-fhs/example/amanda.conf.in 2008-05-08 17:42:35.000000000 +0200
	25	@@ -237,9 +237,9 @@
	26	# Note that, although the keyword below is infofile, it is only so for
	27	# historic reasons, since now it is supposed to be a directory (unless
	28	# you have selected some database format other than the `text' default)
	29	-infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
	30	-logdir "@CONFIG_DIR@/@DEFAULT_CONFIG@" # log directory
	31	-indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index" # index directory
	32	+infofile "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
	33	+logdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@" # log directory
	34	+indexdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/index" # index directory
	35	#tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
	36	# tapelist is stored, by default, in the directory that contains amanda.conf
	37
	38	diff -ur amanda-2.6.0/example/template.d/advanced.conf.in amanda-2.6.0-fhs/example/template.d/advanced.conf.in
	39	--- amanda-2.6.0/example/template.d/advanced.conf.in 2008-01-18 01:31:13.000000000 +0100
	40	+++ amanda-2.6.0-fhs/example/template.d/advanced.conf.in 2008-05-08 17:43:27.000000000 +0200
	41	@@ -97,10 +97,10 @@
	42	# Note that, although the keyword below is infofile, it is only so for
	43	# historic reasons, since now it is supposed to be a directory (unless
	44	# you have selected some database format other than the `text' default)
	45	-infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
	46	-logdir "@CONFIG_DIR@/@DEFAULT_CONFIG@" # log directory
	47	-indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index" # index directory
	48	-#tapelist "@CONFIG_DIR/DailySet1/tapelist" # list of used tapes
	49	+infofile "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
	50	+logdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@" # log directory
	51	+indexdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/index" # index directory
	52	+#tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
	53	# tapelist is stored, by default, in the directory that contains amanda.conf
	54
	55	# Specify holding disks. These are used as a temporary staging area for
	56	diff -ur amanda-2.6.0/server-src/amserverconfig.pl amanda-2.6.0-fhs/server-src/amserverconfig.pl
	57	--- amanda-2.6.0/server-src/amserverconfig.pl 2008-01-18 01:31:25.000000000 +0100
	58	+++ amanda-2.6.0-fhs/server-src/amserverconfig.pl 2008-05-08 17:37:13.000000000 +0200
	59	@@ -99,16 +99,16 @@
	60	unlink "$confdir/$config/tapelist" \|\|
	61	print LOG "unlink $confdir/$config/tapelist failed: $!\n";
	62	}
	63	- if ( -e "$confdir/$config/curinfo" ) {
	64	- rmdir "$confdir/$config/curinfo" \|\|
65	- print LOG "rmdir $confdir/$config failed: $!\n";
66	- }
67	- if ( -e "$confdir/$config/index" ) {
68	- rmdir "$confdir/$config/index" \|\|
69	- print LOG "rmdir $confdir/$config/index failed: $!\n";
70	+ if ( -e "$localstatedir/lib/amanda/$config/curinfo" ) {
71	+ rmdir "$localstatedir/lib/amanda/$config/curinfo" \|\|
72	+ print LOG "rmdir $localstatedir/lib/amanda/$config/curinfo failed: $!\n";
73	+ }
74	+ if ( -e "$localstatedir/lib/amanda/$config/index" ) {
75	+ rmdir "$localstatedir/lib/amanda/$config/index" \|\|
76	+ print LOG "rmdir $localstatedir/lib/amanda/$config/index failed: $!\n";
77	}
78	rmdir "$confdir/$config" \|\|
79	- print LOG "rmdir $confdir/$config failed: $!\n";
80	+ print LOG "rmdir $localstatedir/lib/amanda/$config failed: $!\n";
81	}
82	die $err;
83	}
84	@@ -173,10 +173,12 @@
85
86
87	sub create_curinfo_index_dir {
88	- mkdir("$confdir/$config/curinfo", $def_perm) \|\|
89	- &log_and_die ("ERROR: mkdir: $confdir/$config/curinfo failed: $!\n", 1);
90	- mkdir("$confdir/$config/index", $def_perm) \|\|
91	- &log_and_die ("ERROR: mkdir: $confdir/$config/index failed: $!\n", 1);
92	+ mkdir("$localstatedir/lib/amanda/$config", $def_perm) \|\|
93	+ &log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config failed: $!\n", 1);
94	+ mkdir("$localstatedir/lib/amanda/$config/curinfo", $def_perm) \|\|
95	+ &log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config/curinfo failed: $!\n", 1);
96	+ mkdir("$localstatedir/lib/amanda/$config/index", $def_perm) \|\|
97	+ &log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config/index failed: $!\n", 1);
98	&mprint ("curinfo and index directory created\n");
99	}
100