Changeset 1095

Timestamp:

06/17/11 11:23:06 (11 months ago)

Author:

metrot

Message:

Un seul script install.sh pour Debian et CentOS
En mode devel install.sh pointe sur trunk et plus sur branches/1.x
Bugfix: slapd.conf etait copié dans /root/openldap_config

Location:

trunk

Files:

• INSTALL (modified) (2 diffs)
• install.sh (modified) (1 diff)
• install_centos.sh (deleted)
• install_debian.sh (deleted)
• lib/middleware/install_ldap.sh (modified) (1 diff)
• lib/template/config_slapd (modified) (1 diff)

trunk/INSTALL

@@ -52 +52 @@
 
   # wget --no-check-certificate -P /tmp \
-https://svn.math.cnrs.fr/placodev/tags/stable/install_debian.sh
+https://svn.math.cnrs.fr/placodev/tags/stable/install.sh
 
 * run it :
 
-  # chmod +x /tmp/install_debian.sh
-  # /tmp/install_debian.sh
+  # chmod +x /tmp/install.sh
+  # /tmp/install.sh
 
 * reboot the host
@@ -90 +90 @@
   
   # wget --no-check-certificate -P /tmp \
-           https://svn.math.cnrs.fr/placodev/trunk/install_debian.sh
+           https://svn.math.cnrs.fr/placodev/trunk/install.sh
 
 * run it :
 
-  # chmod +x /tmp/install_debian.sh
-  # /tmp/install_debian.sh -d wc_dir
+  # chmod +x /tmp/install.sh
+  # /tmp/install.sh -d wc_dir
 
   where wc_dir is the choosen local svn working-copy directory for the

trunk/install.sh

@@ -181 +181 @@
 then
   # mode devel
-  #lastest="trunk"
-  #depot=${repo}/trunk/
-  lastest="branches/1.x"
-  depot=${repo}/branches/1.x/
+  lastest="trunk"
+  depot=${repo}/trunk/
   srcdir=${opt_d%%/}
   libdir=$srcdir/lib

trunk/lib/middleware/install_ldap.sh

@@ -7 +7 @@
 placomgr put config_initialtree_slapd /root/config_initialtree_slapd $*
 placomgr rexec install_slapd.ex $*
-placomgr put config_slapd openldap_config $*
+placomgr put config_slapd {openldap_config} $*
 placomgr rexec initialize_ldap_db.ex $*

trunk/lib/template/config_slapd

@@ -63 +63 @@
 # rootdn directive for specifying a superuser on the database. This is needed
 # for syncrepl.
-# rootdn          "cn=admin,{!$ldap_root!}"
+rootdn          "cn=admin,{!$ldap_root!}"
+rootpw          "{!$ldap_root_pw!}"
 
 # Where the database file are physically stored for database #1