Changeset 306

Timestamp:

01/26/2009 21:53:49 (3 years ago)

Author:

blee

Message:

Some Autotools cleanup:

• /var is no longer hard-coded (instead use localstatedir)
• confman.conf.sample is now created by autotools so that it has relevant defaults

Additionally:

• Changing default of CONF_SSH_KEY to /root/.ssh/id_rsa

See #6

Location:

trunk

Files:

• Makefile.am (modified) (3 diffs)
• confman.conf.in (modified) (3 diffs)
• confman.conf.sample.in (moved) (moved from trunk/confman.conf.sample) (2 diffs)

trunk/Makefile.am

@@ -8 +8 @@
 pkgdata_SCRIPTS = confmancommon.sh
 dist_pkgdata_SCRIPTS = confmanlib.sh confmandoc.sh
-dist_sysconf_DATA = confman.conf.sample
+sysconf_DATA = confman.conf.sample
 sysconfdefaults_DATA = confman.conf
 bashcomp_DATA = confman_completion
@@ -25 +25 @@
                 confmancommon.sh.in \
                 confman.conf.in \
+                confman.conf.sample.in \
                 confman_completion.in \
                 LICENSE
 
 do_subst = $(SED) -e 's,[@]datadir[@],$(datadir),g' \
+                -e 's,[@]localstatedir[@],$(localstatedir),g' \
                 -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
                 -e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g' \
+                -e 's,[@]prefix[@],$(prefix),g' \
                 -e 's,[@]sbindir[@],$(sbindir),g' \
                 -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
@@ -57 +60 @@
         $(do_subst) < confman.conf.in > confman.conf
 
+confman.conf.sample: confman.conf.sample.in Makefile
+        $(do_subst) < confman.conf.sample.in > confman.conf.sample
+
 confman_completion: confman_completion.in Makefile
         $(do_subst) < confman_completion.in > confman_completion

trunk/confman.conf.in

@@ -16 +16 @@
 
 # The system lockfile
-LOCKFILE="/var/run/confman.lock"
+LOCKFILE="@localstatedir@/run/confman.lock"
 
 # The script for locking
@@ -30 +30 @@
 WORK_PATH="${HOME}/src/conf"
 
-# The path to our current host's recipe file
-RECIPE_FILE="/var/db/confman/recipe"
-
 # The list of singularities on this host
 SINGULARITIES=""
 
 # A place where confman can keep state
-REPO_DB="/var/db/confman"
+REPO_DB="@localstatedir@/db/confman"
+
+# The path to our current host's recipe file
+RECIPE_FILE="${REPO_DB}/recipe"
 
 # The warning message for all files
@@ -57 +57 @@
 # file://, http://, https://, ftp://, sftp://, and scp://. Port numbers
 # are not handled correctly in sftp and scp URIs.
-CONF_EXPORT_FILE="/var/db/confman/export.tgz"
+CONF_EXPORT_FILE="${REPO_DB}/export.tgz"
 CONF_EXPORT_URI="scp://confman@${REPO_HOSTNAME}${CONF_EXPORT_FILE}"
 CONF_EXPORT_MODE="0640"
 CONF_EXPORT_USER="$(whoami)"
 CONF_EXPORT_GROUP="${CONF_GROUP}"
-CONF_SSH_KEY="/root/id_rsa"
+CONF_SSH_KEY="/root/.ssh/id_rsa"
 
 # Enable or disable debugging

trunk/confman.conf.sample.in

@@ -10 +10 @@
 
 # The path on the remote host to find the repository:
-REPO_PATH="${PREFIX}/repo/conf/conf"
+REPO_PATH="@prefix@/repo/conf/conf"
 
 # The list of singularities on this host
@@ -19 +19 @@
 # file://, http://, https://, ftp://, sftp://, and scp://. Port numbers
 # are not handled correctly in sftp and scp URIs.
-CONF_EXPORT_FILE="/var/db/confman/export.tgz"
+CONF_EXPORT_FILE="@localstatedir@/db/confman/export.tgz"
 CONF_EXPORT_URI="scp://confman@${REPO_HOSTNAME}${CONF_EXPORT_FILE}"
-CONF_SSH_KEY="/root/id_rsa"
+CONF_SSH_KEY="/root/.ssh/id_rsa"