diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-14 13:06:26 -0700 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-09-03 11:01:45 -0700 |
| commit | 025ae07850375cbf981ed335a4ddf702d54be6e3 (patch) | |
| tree | a119246764dc98f0d0c7fb87572cd1b01bc18684 /geo-replication/syncdaemon | |
| parent | 845d6c76701a3de6a11b76b004176971411c714e (diff) | |
build: make GLUSTERD_WORKDIR rely on localstatedir
Backport from master branch - http://review.gluster.org/#/c/8246/
- Break-way from '/var/lib/glusterd' hard-coded previously,
instead rely on 'configure' value from 'localstatedir'
- Provide 's/lib/db' as default working directory for gluster
management daemon for BSD and Darwin based installations
- loff_t is really off_t on Darwin
- fix-off the warnings generated by clang on FreeBSD/Darwin
- Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all
platforms.
- Define proper environment for running tests, define correct PATH
and LD_LIBRARY_PATH when running tests, so that the desired version
of glusterfs is used, regardless where it is installed.
(Thanks to manu@netbsd.org for this additional work)
Change-Id: I06e684ac4c26d1e74c9daf76753403ad15f79276
BUG: 1130308
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8486
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'geo-replication/syncdaemon')
| -rw-r--r-- | geo-replication/syncdaemon/configinterface.py.in (renamed from geo-replication/syncdaemon/configinterface.py) | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/geo-replication/syncdaemon/configinterface.py b/geo-replication/syncdaemon/configinterface.py.in index a94e07f0d4b..acb51486a10 100644 --- a/geo-replication/syncdaemon/configinterface.py +++ b/geo-replication/syncdaemon/configinterface.py.in @@ -36,7 +36,7 @@ CONFIGS = ( ("peersrx . .", "georep_session_working_dir", "", - "/var/lib/glusterd/geo-replication/${mastervol}_${remotehost}_" + "@GLUSTERD_WORKDIR@/geo-replication/${mastervol}_${remotehost}_" "${slavevol}/"), ("peersrx .", "gluster_params", @@ -46,7 +46,7 @@ CONFIGS = ( "ssh_command_tar", "", "ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no " - "-i /var/lib/glusterd/geo-replication/tar_ssh.pem"), + "-i @GLUSTERD_WORKDIR@/geo-replication/tar_ssh.pem"), ("peersrx . .", "changelog_log_file", "", @@ -54,11 +54,7 @@ CONFIGS = ( "/${eSlave}${local_id}-changes.log"), ("peersrx . .", "working_dir", - "/var/run/gluster/${mastervol}/${eSlave}", - "${iprefix}/lib/misc/glusterfsd/${mastervol}/${eSlave}"), - ("peersrx . .", - "working_dir", - "/usr/local/var/run/gluster/${mastervol}/${eSlave}", + "@localstatedir@/run/gluster/${mastervol}/${eSlave}", "${iprefix}/lib/misc/glusterfsd/${mastervol}/${eSlave}"), ) |