Merge pull request 'Use the new LDAP server in the ejabberd configuration' (#406) from chore/ejabberd_new_ldap_server into new_ldap_server

Reviewed-on: #406

data_bags/credentials/ejabberd.json

@@ -1,38 +1,38 @@
 {
   "id": "ejabberd",
   "5apps_ldap_password": {
-    "encrypted_data": "RdzDZk2F4yBvgII84JGt8AF0LT4cyjRQFQvMJ5LhdB54T06Kjq3S\n",
-    "iv": "+3WlMHiNAFVE4iku\n",
-    "auth_tag": "mKheQu/KeHSyt8W783lrzA==\n",
+    "encrypted_data": "+sg4xj4nVTepvCOQ+Nupln+Ni2zkpxEHyJxj8IQqug==\n",
+    "iv": "38KjEZZbI9rNfsA1\n",
+    "auth_tag": "O3onB3RmxU09fBsQO9h5OA==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kosmos_ldap_password": {
-    "encrypted_data": "fABWhxMuLaF2qLFdIN//R6bgBkD60WRWiBZPErB1eBOxHqOp813o\n",
-    "iv": "uBPPYY/FM2hee05V\n",
-    "auth_tag": "cO+zP2QggWIzbuVxtkct2w==\n",
+    "encrypted_data": "GFTIbthhsiVnkRk8C8cqvyBTCnSQ7JgqM1djR63BYg==\n",
+    "iv": "07hmbipcLzslZT81\n",
+    "auth_tag": "yCSwv9oI/eDY5ATXn5oFmQ==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "uploads_secret": {
-    "encrypted_data": "03Y8CNBstV7vYopx8X54hkRSlnwwbOg5Y0KwTPV4qys1\n",
-    "iv": "gLTP7Y2Y70jL+sxH\n",
-    "auth_tag": "HJoyOF4rYm9ayKfViuKBlA==\n",
+    "encrypted_data": "QMY6QnL/hxGAxG4hQBFSsM7sRR3izZO62EjZAIV2F165\n",
+    "iv": "Swez2eH4b11G/exT\n",
+    "auth_tag": "zKsX7IYoMKPOmdGxZcfMPQ==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "admins": {
-    "encrypted_data": "mRX2Lxqxb//Gd76bk+G3V+eObaq+NILiMsHHjFvjBCvJrznvRzezqW1VHhwW\ndH/ZY2gM8CVCcmYNQ8Xtg/1loPYAUjROvDRirj5i9fP7zgJRc1anNmohDOle\n34aNPYverGm+IJ21sFrAv4Xe/KleJBO5ynuiInqqvljcu3LiuvSYBXW34yWB\n",
-    "iv": "QqJJM8gmox565JUd\n",
-    "auth_tag": "yWRLb22JwJjjoK6Wdr1ujg==\n",
+    "encrypted_data": "NMmjCdV3H/cg3G2/gToqxj0iq1UpOBwjaK8eya46doNOC77AlOdV5uPTJvqI\nJYmy31RUFPtjQUfCsidPpsbdx3k6sQjiPSRZDEA9u6S35w9hNBXHz1PLCDKb\nCfEtwM30xhmcDSFEllpXFE+0Bh1lUF/cHFt9/z5ZjSPYKSQg5cM2h89nMScJ\n",
+    "iv": "9TlJYq79eQy6T1l/\n",
+    "auth_tag": "E8KMY1uIVWtnAFmdiP1R5g==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "erlang_cookie": {
-    "encrypted_data": "UDCzEWgVLH0z33Exx5G+OjUXw1odz4xO8qRLXODo5jBzMQdyYQCd\n",
-    "iv": "mm+fYYceD1nPsuo1\n",
-    "auth_tag": "77un6mkgrHAmnBQhrhpPfQ==\n",
+    "encrypted_data": "YKCUrV/vEH2zWXlZJWIQkYhK+uwBaHvSpYmdVQwQgQTxege7HtTs\n",
+    "iv": "c7SINIqy8p+yMlQ+\n",
+    "auth_tag": "b7OyWy3QFaQLENmiNqaFPg==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   }
-}
+}

site-cookbooks/kosmos-ejabberd/recipes/default.rb

@@ -3,6 +3,8 @@
 # Recipe:: default
 #
 
+include_recipe "kosmos-dirsrv::hostsfile"
+
 ejabberd_credentials = data_bag_item("credentials", "ejabberd")
 
 ejabberd_version = node["kosmos-ejabberd"]["version"]
@@ -122,13 +124,13 @@ modules:
 ]
 
 ldap_domain = node['kosmos-dirsrv']['master_hostname']
-ldap_encryption_type = node.chef_environment == "development" ? "none" : "tls"
+ldap_encryption_type = "none"
 ldap_base = "cn=users,dc=kosmos,dc=org"
 
 admin_users = ejabberd_credentials['admins']
 
 hosts.each do |host|
-  ldap_rootdn = "uid=xmpp,ou=#{host[:name]},cn=applications,dc=kosmos,dc=org"
+  ldap_rootdn = "uid=service,ou=#{host[:name]},cn=applications,dc=kosmos,dc=org"
 
   template "/opt/ejabberd/conf/#{host[:name]}.yml" do
     source    "vhost.yml.erb"