Paladox has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366751 )

Change subject: Disable ldap usage
......................................................................


Disable ldap usage

Change-Id: I18354ba3a05752ee166bdc352f9abe5355a7c64d
---
M templates/authentication.ini.erb
M templates/resources.ini.erb
2 files changed, 18 insertions(+), 18 deletions(-)

Approvals:
  Paladox: Verified; Looks good to me, approved



diff --git a/templates/authentication.ini.erb b/templates/authentication.ini.erb
index 615818c..5a27f15 100644
--- a/templates/authentication.ini.erb
+++ b/templates/authentication.ini.erb
@@ -2,9 +2,9 @@
 backend = "db"
 resource = "icingaweb_db"
 
-[ad_users]
-resource = "ad_user"
-user_class = "inetOrgPerson"
-user_name_attribute = "uid"
-backend = "ldap"
-base_dn = "ou=people,dc=wikimedia,dc=org"
+;[ad_users]
+;resource = "ad_user"
+;user_class = "inetOrgPerson"
+;user_name_attribute = "uid"
+;backend = "ldap"
+;base_dn = "ou=people,dc=wikimedia,dc=org"
diff --git a/templates/resources.ini.erb b/templates/resources.ini.erb
index b092b3b..084746e 100644
--- a/templates/resources.ini.erb
+++ b/templates/resources.ini.erb
@@ -31,16 +31,16 @@
 password = "<%= @director_password %>"
 charset = "utf8"
 
-[ad_user]
-type = "ldap"
-hostname = "ldap-labs.eqiad.wikimedia.org 
ldaps://ldap-labs.codfw.wikimedia.org"
-port = "636"
-encryption = "ldaps"
-root_dn = "ou=people,dc=wikimedia,dc=org"
+;[ad_user]
+;type = "ldap"
+;hostname = "ldap-labs.eqiad.wikimedia.org 
ldaps://ldap-labs.codfw.wikimedia.org"
+;port = "636"
+;encryption = "ldaps"
+;root_dn = "ou=people,dc=wikimedia,dc=org"
 
-[ad_group]
-type = "ldap"
-hostname = "ldap-labs.eqiad.wikimedia.org 
ldaps://ldap-labs.codfw.wikimedia.org"
-port = "636"
-encryption = "ldaps"
-root_dn = "ou=groups,dc=wikimedia,dc=org"
+;[ad_group]
+;type = "ldap"
+;hostname = "ldap-labs.eqiad.wikimedia.org 
ldaps://ldap-labs.codfw.wikimedia.org"
+;port = "636"
+;encryption = "ldaps"
+;root_dn = "ou=groups,dc=wikimedia,dc=org"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18354ba3a05752ee166bdc352f9abe5355a7c64d
Gerrit-PatchSet: 4
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to