Andrew Bogott has submitted this change and it was merged.
Change subject: bootstrapvz: fix regexp for ldap server in firstboot
......................................................................
bootstrapvz: fix regexp for ldap server in firstboot
Change-Id: I9fc62a076592b84ada01d01f4963d2779d88d624
---
M modules/labs_bootstrapvz/files/firstboot.sh
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index a938c4b..bd6ff75 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -104,10 +104,11 @@
sed -i "s/_PROJECT_/${project}/g" /etc/ldap/ldap.conf
sed -i "s/_PROJECT_/${project}/g" /etc/sudo-ldap.conf
sed -i "s/_PROJECT_/${project}/g" /etc/nslcd.conf
+sed -i "s%^uri.*%uri ${ldaphosts}%g" /etc/nslcd.conf
sed -i "s/_FQDN_/${fqdn}/g" /etc/puppet/puppet.conf
sed -i "s/_MASTER_/${master}/g" /etc/puppet/puppet.conf
-sed -i "s/^uri.*/uri ${ldaphosts}/g" /etc/ldap.conf
-sed -i "s/^URI.*/URI ${ldaphosts}/g" /etc/ldap/ldap.conf
+sed -i "s%^uri.*%uri ${ldaphosts}%g" /etc/ldap.conf
+sed -i "s%^URI.*%URI ${ldaphosts}%g" /etc/ldap/ldap.conf
# Set resolv.conf and stop anyone else from messing with it.
echo "" > /sbin/resolvconf
--
To view, visit https://gerrit.wikimedia.org/r/287966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fc62a076592b84ada01d01f4963d2779d88d624
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
