Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257657

Change subject: openldap: enable ldaps:/// for openldap::labs
......................................................................

openldap: enable ldaps:/// for openldap::labs

A few services, such as Gerrit, still depend on it.

Change-Id: I21f7383e39b4a3d1bb75d2895faa825b00f0405b
---
M modules/openldap/templates/default.erb
M modules/role/manifests/openldap/labs.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/257657/1

diff --git a/modules/openldap/templates/default.erb 
b/modules/openldap/templates/default.erb
index 88fcd5c..da37693 100644
--- a/modules/openldap/templates/default.erb
+++ b/modules/openldap/templates/default.erb
@@ -26,7 +26,7 @@
 # sockets.
 # Example usage:
 # SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_SERVICES="ldap:/// ldapi:///"
+SLAPD_SERVICES="ldap:/// ldaps:/// ldapi:///"
 
 # If SLAPD_NO_START is set, the init script will not start or restart
 # slapd (but stop will still work).  Uncomment this if you are
diff --git a/modules/role/manifests/openldap/labs.pp 
b/modules/role/manifests/openldap/labs.pp
index 7b58af5..412551d 100644
--- a/modules/role/manifests/openldap/labs.pp
+++ b/modules/role/manifests/openldap/labs.pp
@@ -32,7 +32,7 @@
     #  labs and on various prod hosts.
     ferm::service { 'labs_ldap':
         proto  => 'tcp',
-        port   => '389',
+        port   => '(389 636)',
         srange => '$ALL_NETWORKS',
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/257657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21f7383e39b4a3d1bb75d2895faa825b00f0405b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to