separate default config and dev config

Author: simonLeary42

defaults/config.ini.default

@@ -8,7 +8,7 @@ repo = "https://github.com/UnityHPC/unity-web-portal"  ; Upstream URL for the we
 [site]
 prefix = ""  ; prefix of website, no ending / should be included
 name = "Unity HPC Account Portal"  ; Name of the website
-url = "http://127.0.0.1:8000/"  ; URL of the website
+url = "https://account.acme.edu"  ; URL of the website
 description = "The Unity HPC Account Portal is an identity management GUI for research computing"  ; Description of the website
 logo = "logo.png"  ; path to logo file, in the webroot/assets/branding folder
 terms_of_service_url = "https://github.com" ;
@@ -23,39 +23,39 @@ enable_error_handler = true ; internal use only
 session_cleanup_idle_seconds = 1800 ; how long a session must be idle before messages and CSRF tokens are cleared
 
 [ldap]
-uri = "ldap://identity"  ; URI of remote LDAP server
-user = "cn=admin,dc=unityhpc,dc=test"  ; Admin bind DN LDAP user
-pass = "password"  ; Admin bind password
+uri = "ldap://identity.acme.edu"  ; URI of remote LDAP server
+user = "cn=admin,dc=acme,dc=edu"  ; Admin bind DN LDAP user
+pass = "CHANGE_THIS_PASSWORD_OR_ELSE"  ; Admin bind password
 custom_user_mappings_dir = "deployment/custom_user_mappings" ; for internal use only
-basedn = "dc=unityhpc,dc=test"  ; Base search DN
-user_ou = "ou=users,dc=unityhpc,dc=test"  ; User organizational unit (may contain more than user group)
-usergroup_ou = "ou=user_groups,dc=unityhpc,dc=test"  ; Group organizational unit
-pigroup_ou = "ou=pi_groups,dc=unityhpc,dc=test"  ; PI Group organizational unit
-orggroup_ou = "ou=org_groups,dc=unityhpc,dc=test"  ; ORG group organizational unit
+basedn = "dc=acme,dc=edu"  ; Base search DN
+user_ou = "ou=users,ou=account_portal,dc=acme,dc=edu"  ; User organizational unit (may contain more than user group)
+usergroup_ou = "ou=user_groups,ou=account_portal,dc=acme,dc=edu"  ; Group organizational unit
+pigroup_ou = "ou=pi_groups,ou=account_portal,dc=acme,dc=edu"  ; PI Group organizational unit
+orggroup_ou = "ou=org_groups,ou=account_portal,dc=acme,dc=edu"  ; ORG group organizational unit
 def_user_shell = "/bin/bash"  ; Default shell for new users
 offset_UIDGID = 1000000 ; start point when allocating new UID/GID pairs for a new user
 offset_PIGID = 2000000 ; start point when allocating new GID for a new PI group
 offset_ORGGID = 3000000 ; start point when allocating new GID for a new org group
-user_flag_groups[admin] =      "cn=web_admins,dc=unityhpc,dc=test" ; admin user group dn
-user_flag_groups[disabled] =   "cn=disabled,dc=unityhpc,dc=test"   ; disabled user group dn
-user_flag_groups[idlelocked] = "cn=idlelocked,dc=unityhpc,dc=test" ; idlelocked user group dn
-user_flag_groups[immortal] = "cn=immortal,dc=unityhpc,dc=test"     ; immortal user group dn
-user_flag_groups[locked] =     "cn=locked,dc=unityhpc,dc=test"     ; locked user group dn
-user_flag_groups[qualified] =  "cn=unityusers,dc=unityhpc,dc=test" ; qualified user group (in at least one PI group)
+user_flag_groups[admin] =      "cn=admin,dc=acme,dc=edu"      ; admin user group dn
+user_flag_groups[disabled] =   "cn=disabled,dc=acme,dc=edu"   ; disabled user group dn
+user_flag_groups[idlelocked] = "cn=idlelocked,dc=acme,dc=edu" ; idlelocked user group dn
+user_flag_groups[immortal] =   "cn=immortal,dc=acme,dc=edu"   ; immortal user group dn
+user_flag_groups[locked] =     "cn=locked,dc=acme,dc=edu"     ; locked user group dn
+user_flag_groups[qualified] =  "cn=qualified,dc=acme,dc=edu"  ; qualified user group (in at least one PI group)
 allowed_ssh_key_types[] = ssh-rsa
 allowed_ssh_key_types[] = ecdsa-sha2-nistp256
 allowed_ssh_key_types[] = ecdsa-sha2-nistp384
 allowed_ssh_key_types[] = ecdsa-sha2-nistp521
 allowed_ssh_key_types[] = ssh-ed25519
 
 [sql]
-host = "sql"  ; mariadb hostname
-user = "unity"  ; mariadb username
-pass = "password"  ; mariadb password
-dbname = "unity"  ; mariadb database name
+host = "localhost"  ; mariadb hostname
+user = "account_portal"  ; mariadb username
+pass = "CHANGE_THIS_PASSWORD_OR_ELSE"  ; mariadb password
+dbname = "account_portal"  ; mariadb database name
 
 [smtp]
-host = "smtp"  ; hostname of remote smtp server
+host = "smtp.acme.edu"  ; hostname of remote smtp server
 port = "1025"  ; port of remote smtp server
 security = ""  ; leave blank for no encryption, "ssl", or "tls"
 user = ""  ; smtp username, if exists
@@ -107,14 +107,14 @@ labels[] = "Secure Menuitem 1"
 links[] = "https://github.com/"
 
 [mail]  ; mail addresses
-support = "support-email@unitywebportal.test"  ; Email for user support
-support_name = "Unity Support"
-admin = "admin-email@unitywebportal.test"  ; Email that goes to admins about site messages
-admin_name = "Unity Admins"
-sender = "sender-email@unitywebportal.test"  ; The "from" email for all messages sent from the portal
-sender_name = "Unity Sender"
-pi_approve = "piapproval@unitywebportal.test"  ; Only PI approval messages will go to this email
-pi_approve_name = "Unity PI Approval"
+support = "support-email@acme.edu"  ; Email for user support
+support_name = "acme.edu Support"
+admin = "admin-email@acme.edu"  ; Email that goes to admins about site messages
+admin_name = "acme.edu Admins"
+sender = "sender-email@acme.edu"  ; The "from" email for all messages sent from the portal
+sender_name = "acme.edu account portal"
+pi_approve = "piapproval@acme.edu"  ; Only PI approval messages will go to this email
+pi_approve_name = "acme.edu PI Approval"
 send_pimesg_to_admins = false
 
 [webhook] ; webhook to send messages to admins

deployment/overrides/account-portal-docker-web/config/config.ini

@@ -1,2 +1,49 @@
+[site]
+url = "http://127.0.0.1:8000/"
+
+[ldap]
+uri = "ldap://identity"
+user = "cn=admin,dc=unityhpc,dc=test"
+pass = "password"
+basedn = "dc=unityhpc,dc=test"
+user_ou = "ou=users,dc=unityhpc,dc=test"
+usergroup_ou = "ou=user_groups,dc=unityhpc,dc=test"
+pigroup_ou = "ou=pi_groups,dc=unityhpc,dc=test"
+orggroup_ou = "ou=org_groups,dc=unityhpc,dc=test"
+offset_UIDGID = 1000000 ; start point when allocating new UID/GID pairs for a new user
+offset_PIGID = 2000000 ; start point when allocating new GID for a new PI group
+offset_ORGGID = 3000000 ; start point when allocating new GID for a new org group
+user_flag_groups[admin] =      "cn=web_admins,dc=unityhpc,dc=test" ; admin user group dn
+user_flag_groups[disabled] =   "cn=disabled,dc=unityhpc,dc=test"
+user_flag_groups[idlelocked] = "cn=idlelocked,dc=unityhpc,dc=test" ; idlelocked user group dn
+user_flag_groups[immortal] = "cn=immortal,dc=unityhpc,dc=test"
+user_flag_groups[locked] =     "cn=locked,dc=unityhpc,dc=test"
+user_flag_groups[qualified] =  "cn=unityusers,dc=unityhpc,dc=test" ; qualified user group (in at least one PI group)
+
+[sql]
+host = "sql"
+user = "unity"
+pass = "password"
+dbname = "unity"
+
+[smtp]
+host = "smtp"
+port = "1025"
+security = ""
+user = ""
+pass = ""
+ssl_verify = "false"
+
+[mail]
+support = "support-email@unitywebportal.test"
+support_name = "Unity Support"
+admin = "admin-email@unitywebportal.test"
+admin_name = "Unity Admins"
+sender = "sender-email@unitywebportal.test"
+sender_name = "Unity Sender"
+pi_approve = "piapproval@unitywebportal.test"
+pi_approve_name = "Unity PI Approval"
+send_pimesg_to_admins = false
+
 [api]
 keys[] = "dev_environment_api_key"