packaging: move CTDB service file to top-level

Signed-off-by: Vinit Agnihotri <vagnihotri@ddn.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/ctdb.service b/packaging/systemd/ctdb.service.in
similarity index 62%
rename from ctdb/config/ctdb.service
rename to packaging/systemd/ctdb.service.in
index dbe35281f56501a715702f92b1488c9e3cfa0f3d..4494f914cffc5f7764dba19c69876ca755ade397 100644 (file)
--- a/ctdb/config/ctdb.service
+++ b/packaging/systemd/ctdb.service.in
@@ -2,16 +2,16 @@
 Description=CTDB
 Documentation=man:ctdbd(1) man:ctdb(7)
 After=network-online.target time-sync.target
-ConditionFileNotEmpty=/etc/ctdb/nodes
+ConditionFileNotEmpty=@CTDB_ETCDIR@/nodes
 
 [Service]
 Type=forking
 LimitCORE=infinity
 LimitNOFILE=1048576
 TasksMax=4096
-PIDFile=/run/ctdb/ctdbd.pid
-ExecStart=/usr/sbin/ctdbd_wrapper start
-ExecStop=/usr/sbin/ctdbd_wrapper stop
+PIDFile=@CTDB_RUNDIR@/ctdbd.pid
+ExecStart=@SBINDIR@/ctdbd_wrapper start
+ExecStop=@SBINDIR@/ctdbd_wrapper stop
 KillMode=control-group
 Restart=no
 

diff --git a/packaging/wscript b/packaging/wscript
index 1f9a54a787ddb175a3a780b8d0d782a1dcda70e9..ab8e16f1ab9c39b2bac6dd92953af81dcb250fce 100644 (file)
--- a/packaging/wscript
+++ b/packaging/wscript
@@ -41,10 +41,17 @@ def options(opt):
                         +" Can be used multiple times."),
                   action="append", dest="systemd_samba_extra", default=[])
 
+    gr.add_option('--systemd-ctdb-extra',
+                  metavar="Option=Value",
+                  help=("Extra directives added to the ctdb service file."
+                        +" Can be given multiple times."),
+                  action="append", dest="systemd_ctdb_extra", default=[])
+
 def configure(conf):
     conf.env.systemd_install_services = Options.options.systemd_install_services
     conf.env.systemd_smb_extra = '\n'.join(Options.options.systemd_smb_extra)
     conf.env.systemd_nmb_extra = '\n'.join(Options.options.systemd_nmb_extra)
     conf.env.systemd_winbind_extra = '\n'.join(Options.options.systemd_winbind_extra)
     conf.env.systemd_samba_extra = '\n'.join(Options.options.systemd_samba_extra)
+    conf.env.systemd_ctdb_extra = '\n'.join(Options.options.systemd_ctdb_extra)
     conf.env.SYSTEMDDIR = Options.options.SYSTEMDDIR

diff --git a/packaging/wscript_build b/packaging/wscript_build
index fbcd4e55f8c89ff1c4958edd82b0a225b0e72fa8..217bd996348409e82ddcd74b739bd67f98971bf3 100644 (file)
--- a/packaging/wscript_build
+++ b/packaging/wscript_build
@@ -12,5 +12,11 @@ for srv in systemd_services:
     if bld.env.systemd_install_services:
         bld.INSTALL_FILES(bld.env.SYSTEMDDIR, srv, flat=True)
 
+if bld.env.with_ctdb:
+    srv = 'systemd/ctdb.service'
+    bld.CONFIGURE_FILE(srv)
+    if bld.env.systemd_install_services:
+        bld.INSTALL_FILES(bld.env.SYSTEMDDIR, srv, flat=True)
+
 if bld.env.systemd_install_services:
     bld.INSTALL_FILES('${SYSCONFDIR}/sysconfig', 'systemd/samba.sysconfig', destname='samba')