diff --git a/imageroot/actions/configure-module/10EnvSOGo b/imageroot/actions/configure-module/10EnvSOGo index 219eb8c..e44f326 100755 --- a/imageroot/actions/configure-module/10EnvSOGo +++ b/imageroot/actions/configure-module/10EnvSOGo @@ -15,7 +15,7 @@ data = json.load(sys.stdin) # Setup configuration from user input. agent.set_env("MAIL_SERVER", data["mail_server"]) -agent.set_env("ADMIN_USERS", data.get("admin_users","Administrator")) +agent.set_env("ADMIN_USERS", data.get("admin_users","administrator").lower()) agent.set_env("LDAP_DOMAIN", data["ldap_domain"]) agent.set_env("MAIL_DOMAIN",data.get("mail_domain","")) agent.set_env("WOWORKERSCOUNT",data.get("workers_count","3")) diff --git a/imageroot/actions/get-configuration/20read b/imageroot/actions/get-configuration/20read index d5757be..809c343 100755 --- a/imageroot/actions/get-configuration/20read +++ b/imageroot/actions/get-configuration/20read @@ -23,7 +23,7 @@ config["host"] = os.getenv("TRAEFIK_HOST","") config["lets_encrypt"] = os.getenv("TRAEFIK_LETS_ENCRYPT") == "True" config["mail_server"] = os.getenv("MAIL_SERVER", "") # the value is the Mail module UUID! config["mail_domain"] = os.getenv("MAIL_DOMAIN", "") # the value is the mail domain of user to force domain identity : user@domain.com ! -config["admin_users"] = os.getenv("ADMIN_USERS", "Administrator") +config["admin_users"] = os.getenv("ADMIN_USERS", "administrator") config["ldap_domain"] = os.getenv("LDAP_DOMAIN", "") config["workers_count"] = os.getenv("WOWORKERSCOUNT", "3") config["auxiliary_account"] = os.getenv("AUXILIARYACCOUNT") == "True" diff --git a/imageroot/bin/expand-configuration b/imageroot/bin/expand-configuration index 6894aab..902b393 100755 --- a/imageroot/bin/expand-configuration +++ b/imageroot/bin/expand-configuration @@ -27,7 +27,7 @@ jenv = Environment( ) properties = { - "admin_users" : os.environ['ADMIN_USERS'], + "admin_users" : os.environ['ADMIN_USERS'].lower(), "ldap_schema" : os.environ['SOGO_LDAP_SCHEMA'], "ldap_port" : int(os.environ['SOGO_LDAP_PORT']), "ldap_user" : os.environ['SOGO_LDAP_USER'], diff --git a/imageroot/templates/sogo.conf b/imageroot/templates/sogo.conf index 2a7f04b..7912d35 100644 --- a/imageroot/templates/sogo.conf +++ b/imageroot/templates/sogo.conf @@ -5,6 +5,7 @@ OCSFolderInfoURL = "mysql://sogo:Nethesis,1234@127.0.0.1:3306/sogo/sogo_folder_info"; OCSSessionsFolderURL = "mysql://sogo:Nethesis,1234@127.0.0.1:3306/sogo/sogo_sessions_folder"; OCSEMailAlarmsFolderURL = "mysql://sogo:Nethesis,1234@127.0.0.1:3306/sogo/sogo_alarms_folder"; + OCSAdminURL = "mysql://sogo:Nethesis,1234@127.0.0.1:3306/sogo/sogo_admin"; /* 20 Mail */