amanda-FHS.patch

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