Change-Id: Ibcceabf2c76aaeeb8902a670557cc0093943a3e4
Closes-Bug: #1373750
| ... | ... |
@@ -51,9 +51,10 @@ fi |
| 51 | 51 |
# _ldap_varsubst file |
| 52 | 52 |
function _ldap_varsubst {
|
| 53 | 53 |
local infile=$1 |
| 54 |
+ local slappass=$2 |
|
| 54 | 55 |
sed -e " |
| 55 | 56 |
s|\${LDAP_OLCDB_NUMBER}|$LDAP_OLCDB_NUMBER|
|
| 56 |
- s|\${SLAPPASS}|$SLAPPASS|
|
|
| 57 |
+ s|\${SLAPPASS}|$slappass|
|
|
| 57 | 58 |
s|\${LDAP_ROOTPW_COMMAND}|$LDAP_ROOTPW_COMMAND|
|
| 58 | 59 |
s|\${BASE_DC}|$LDAP_BASE_DC|
|
| 59 | 60 |
s|\${BASE_DN}|$LDAP_BASE_DN|
|
| ... | ... |
@@ -130,7 +131,7 @@ function install_ldap {
|
| 130 | 130 |
printf "LDAP secret is $slappass\n" |
| 131 | 131 |
|
| 132 | 132 |
# Create manager.ldif and add to olcdb |
| 133 |
- _ldap_varsubst $FILES/ldap/manager.ldif.in >$tmp_ldap_dir/manager.ldif |
|
| 133 |
+ _ldap_varsubst $FILES/ldap/manager.ldif.in $slappass >$tmp_ldap_dir/manager.ldif |
|
| 134 | 134 |
sudo ldapmodify -Y EXTERNAL -H ldapi:/// -f $tmp_ldap_dir/manager.ldif |
| 135 | 135 |
|
| 136 | 136 |
# On fedora we need to manually add cosine and inetorgperson schemas |