Changeset 829 for n4d-ldap

Timestamp:

Mar 10, 2016, 4:03:58 PM (3 years ago)

Author:

hectorgh

Message:

renaming etc initd slad calls

Location:

n4d-ldap/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• install/usr/sbin/llx-slapd-backup (modified) (4 diffs)
• install/usr/sbin/reset-slapd (modified) (2 diffs)
• install/usr/share/n4d/python-plugins/SlapdManager.py (modified) (2 diffs)

n4d-ldap/trunk/fuentes/debian/changelog

@@ +1 @@
+n4d-ldap (0.47.6) xenial; urgency=high
+
+  * renaming /etc/init.d/slapd calls
+
+ -- Hector Garcia Huerta <hectorgh@gmail.com>  Thu, 10 Mar 2016 16:03:33 +0100
+
 n4d-ldap (0.47.5) xenial; urgency=high
 

n4d-ldap/trunk/fuentes/install/usr/sbin/llx-slapd-backup

@@ -29 +29 @@
 dump)
         
-        /etc/init.d/slapd stop
+        /usr/sbin/slapd-daemon-starter stop
         slapcat -n 0 > ${BACKUPDIR}/config.ldif
         slapcat -n 1 > ${BACKUPDIR}/data.ldif
@@ -39 +39 @@
         rsync -ptgox /etc/default/slapd  ${BACKUPDIR}/install/etc/default/
         rsync -ptgox /etc/lliurex-secrets/passgen/ldap.secret ${BACKUPDIR}/install/etc/lliurex-secrets/passgen/
-        /etc/init.d/slapd start
+        /usr/sbin/slapd-daemon-starter start
         
         tar -czf $BACKUPFILE -C $BACKUPDIR .
@@ -55 +55 @@
         SLAPD_RUN="/run/slapd"
 
-        /etc/init.d/slapd stop
+        /usr/sbin/slapd-daemon-starter stop
         rm -rf ${SLAPD_CONF} || true
         mkdir -p -m 0755 $SLAPD_CONF
@@ -78 +78 @@
         rsync -ax ${BACKUPDIR}/install/* /
         chmod 600 /etc/lliurex-secrets/passgen/ldap.secret
-        /etc/init.d/slapd start
+        /usr/sbin/slapd-daemon-starter start
         
         ;;

n4d-ldap/trunk/fuentes/install/usr/sbin/reset-slapd

@@ -55 +55 @@
 SLAPD_DB_PATH="/var/lib/ldap"
 
-/etc/init.d/slapd stop
+/usr/sbin/slapd-daemon-starter stop
 
 #Check if directories has correct permissions
@@ -94 +94 @@
 capture_diagnostics slapadd -F "${SLAPD_CONF}" -b "cn=config" -l "${initldif}" || die "Have an error when load init configuration on config directory"
 chown -R ${SLAPD_USER}:${SLAPD_GROUP} $SLAPD_CONF || die "On /etc/default/slapd aren't SLAPD_USER or SLAPD_GROUP variable"
-/etc/init.d/slapd start
+/usr/sbin/slapd-daemon-starter start

n4d-ldap/trunk/fuentes/install/usr/share/n4d/python-plugins/SlapdManager.py

@@ -482 +482 @@
         def reboot_slapd(self):
                 
-                proc = subprocess.Popen(['/etc/init.d/slapd','restart'],stdout=subprocess.PIPE,stdin=subprocess.PIPE).communicate()
+                proc = subprocess.Popen(['/usr/sbin/slapd-daemon-starter','restart'],stdout=subprocess.PIPE,stdin=subprocess.PIPE).communicate()
                 
                 return {"status":True,"msg":"Server is reboot"}
@@ -767 +767 @@
         
         def restore_backup_config(self, path):
-                os.system("/etc/init.d/slapd stop")
+                os.system("/usr/sbin/slapd-daemon-starter stop")
                 os.system("rm -fr /etc/ldap/slapd.d/*")
                 os.system("slapadd -n 0 -l "+path+" -F /etc/ldap/slapd.d/")
                 os.system("chown -R openldap:openldap /etc/ldap/slapd.d/")
-                os.system("/etc/init.d/slapd start")
+                os.system("/usr/sbin/slapd-daemon-starter start")
                 return {"status":True,"msg":"Config backup restored"}