From 898edbf1335726566d501e2409b57fef4f97671e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 31 Jul 2013 08:54:59 +0200 Subject: doc: Move glusterd.vol to extras/ directory It's actually not documentation. Change-Id: I30c84abc9a31edb2f849dd2d6ff6d3129d87392d Signed-off-by: Lubomir Rintel Reviewed-on: http://review.gluster.org/5474 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- doc/Makefile.am | 5 +---- doc/glusterd.vol | 8 -------- extras/Makefile.am | 5 ++++- extras/glusterd.vol | 8 ++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 doc/glusterd.vol create mode 100644 extras/glusterd.vol diff --git a/doc/Makefile.am b/doc/Makefile.am index 0f9feb25..1103b607 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,9 +1,6 @@ -EXTRA_DIST = glusterfs.8 mount.glusterfs.8 glusterd.vol gluster.8 \ +EXTRA_DIST = glusterfs.8 mount.glusterfs.8 gluster.8 \ glusterd.8 glusterfsd.8 -voldir = $(sysconfdir)/glusterfs -vol_DATA = glusterd.vol - man8_MANS = glusterfs.8 mount.glusterfs.8 gluster.8 glusterd.8 glusterfsd.8 CLEANFILES = diff --git a/doc/glusterd.vol b/doc/glusterd.vol deleted file mode 100644 index de17d8fd..00000000 --- a/doc/glusterd.vol +++ /dev/null @@ -1,8 +0,0 @@ -volume management - type mgmt/glusterd - option working-directory /var/lib/glusterd - option transport-type socket,rdma - option transport.socket.keepalive-time 10 - option transport.socket.keepalive-interval 2 - option transport.socket.read-fail-log off -end-volume diff --git a/extras/Makefile.am b/extras/Makefile.am index bfd9101b..1ccd9dbd 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -8,9 +8,12 @@ confdir = $(sysconfdir)/glusterfs conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \ logger.conf.example +voldir = $(sysconfdir)/glusterfs +vol_DATA = glusterd.vol + EXTRA_DIST = specgen.scm MacOSX/Portfile glusterfs-mode.el glusterfs.vim \ migrate-unify-to-distribute.sh backend-xattr-sanitize.sh \ backend-cleanup.sh disk_usage_sync.sh quota-remove-xattr.sh \ quota-metadata-cleanup.sh glusterfs-logrotate clear_xattrs.sh \ group-virt.example glusterd-sysconfig gluster-rsyslog-7.2.conf \ - gluster-rsyslog-5.8.conf logger.conf.example + gluster-rsyslog-5.8.conf logger.conf.example glusterd.vol diff --git a/extras/glusterd.vol b/extras/glusterd.vol new file mode 100644 index 00000000..de17d8fd --- /dev/null +++ b/extras/glusterd.vol @@ -0,0 +1,8 @@ +volume management + type mgmt/glusterd + option working-directory /var/lib/glusterd + option transport-type socket,rdma + option transport.socket.keepalive-time 10 + option transport.socket.keepalive-interval 2 + option transport.socket.read-fail-log off +end-volume -- cgit