From dc1226073c47cdb0bd1b3275e588f562f100349c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 14 Feb 2020 13:56:17 +0100 Subject: [PATCH] Move the admin users to the ejabberd encrypted data bag --- data_bags/credentials/ejabberd.json | 13 ++++++++++--- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 9 +-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data_bags/credentials/ejabberd.json b/data_bags/credentials/ejabberd.json index 447c397..ef6155a 100644 --- a/data_bags/credentials/ejabberd.json +++ b/data_bags/credentials/ejabberd.json @@ -1,9 +1,16 @@ { "id": "ejabberd", "5apps_ldap_password": { - "encrypted_data": "NjlYL0mMpXmLP2pk1ZSo5mWt+qosx7eh7+duoPc57avQGwPJ6Vxb\n", - "iv": "q/py5XYCEXARUEA9\n", - "auth_tag": "4xoSjTjLYNzuLvoksf3Thw==\n", + "encrypted_data": "LRafA47WMyuQe5KA4oOc6i/pTflwpG8Gq8v7cvsTr51XwJD62i9L\n", + "iv": "CSvV2mbofDQP4T42\n", + "auth_tag": "PERdYnrFKGs+HaPBD6Um+A==\n", + "version": 3, + "cipher": "aes-256-gcm" + }, + "admins": { + "encrypted_data": "D1fEa5S7ADU4tornw/FdcDifE6CzqM6TrLliWYxQ1AxwAuewdh0G2OfgjKOt\nvvibgIEMkr83FkX4La2wOjW8X6/DpBiyeys9RznVD4s0jmSaCG7qGHask3+R\nFLRl0gcYFCPkQopIAYihjnwvm9t1MwPXPF9c7B7rN5W2VvctQ9OEN3MgboHl\n", + "iv": "IgodYNr3muNTfkhX\n", + "auth_tag": "OJ42GSFtEp/KCxSIGhdbVg==\n", "version": 3, "cipher": "aes-256-gcm" } diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index 2b2f47e..86e80f4 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -122,14 +122,7 @@ ldap_domain = node['kosmos-dirsrv']['master_hostname'] ldap_encryption_type = node.chef_environment == "development" ? "none" : "tls" ldap_base = "cn=users,dc=kosmos,dc=org" -admin_users = [ - "greg@5apps.com", - "sebastian@5apps.com", - "garret@5apps.com", - "raucao@kosmos.org", - "greg@kosmos.org", - "galfert@kosmos.org" -] +admin_users = ejabberd_credentials['admins'] template "/opt/ejabberd/conf/ejabberd.yml" do source "ejabberd.yml.erb"