Sort keys in pillar files for easier merging

master
Jan Dittberner 3 years ago
parent c033201caf
commit fa6878e481
  1. 6
      pillar/gnuviechadmin/gva.sls
  2. 2
      pillar/gnuviechadmin/gvafile.sls
  3. 13
      pillar/gnuviechadmin/gvaldap.sls
  4. 8
      pillar/gnuviechadmin/gvamysql.sls
  5. 8
      pillar/gnuviechadmin/gvapgsql.sls
  6. 4
      pillar/gnuviechadmin/gvaweb.sls

@ -9,10 +9,10 @@ gnuviechadmin:
database:
host: pgsql
gva:
fullname: Self Service Web Interface
django_secret_key: yBnbG4azhNaTxIW0/Rv2dEij9PcVU1KVR//1bR6LujmLBnZJw8OOrEi2dIqz3pyOdG8=
git_url: https://git.dittberner.info/gnuviech/gva.git
fullname: Self Service Web Interface
git_branch: master
url_webmail: https://webmail.gva.local/
git_url: https://git.dittberner.info/gnuviech/gva.git
url_mysql_admin: https://phpmyadmin.gva.local/
url_pgsql_admin: https://phppgadmin.gva.local/
url_webmail: https://webmail.gva.local/

@ -12,7 +12,7 @@ gnuviechadmin:
git_branch: master
git_url: https://git.dittberner.info/gnuviech/gvafile.git
mail_directory: /home/mail
web_directory: /home/www
sftp_authkeys_directory: /srv/sftp/authorized_keys
sftp_chroot: /srv/sftp
sftp_group: sftponly
web_directory: /home/www

@ -4,15 +4,11 @@ include:
- gnuviechadmin.queues.gvaldap
gnuviechadmin:
allowed_hosts: 127.0.0.1,gvaldap.local,localhost
appname: gvaldap
server_email: gvaldap@gnuviech-server.de
admin_email: jan@dittberner.info
admin_name: Jan Dittberner
gvaldap:
ldap_groups_ou: groups
ldap_users_ou: users
allowed_hosts: localhost,ldap
admin_email: jan@dittberner.info
admin_name: Jan Dittberner
allowed_hosts: 127.0.0.1,gvaldap.local,localhost,ldap
amqp_user: ldap
celery_module: ldaptasks
django_secret_key: IyOiTDt2DMo4gBVTwZ+E2p+mI1S/rNzZVIFlSr6TpgtxtsJODOVWHaxgVW3FqGZVaFU=
@ -21,3 +17,6 @@ gnuviechadmin:
git_url: https://git.dittberner.info/gnuviech/gvaldap.git
ldap_admin_password: NnVnGoWBVw6BKb9DhTwHAz0ICrdiDy+HL1A6F2Rz
ldap_admin_user: ldapadmin
ldap_groups_ou: groups
ldap_users_ou: users
server_email: gvaldap@gnuviech-server.de

@ -7,9 +7,9 @@ gnuviechadmin:
appname: gvamysql
gvamysql:
amqp_user: mysql
celery_module: mysqltasks
fullname: MySQL Server
mysql_admin_user: gvamysql
mysql_admin_password: jSXstgT/AbWofdI2tJWYpQvFX1mtxt4tFMlrYxSA
git_url: https://git.dittberner.info/gnuviech/gvamysql.git
git_branch: master
celery_module: mysqltasks
git_url: https://git.dittberner.info/gnuviech/gvamysql.git
mysql_admin_password: jSXstgT/AbWofdI2tJWYpQvFX1mtxt4tFMlrYxSA
mysql_admin_user: gvamysql

@ -7,9 +7,9 @@ gnuviechadmin:
appname: gvapgsql
gvapgsql:
amqp_user: pgsql
celery_module: pgsqltasks
fullname: PostgreSQL Server
pgsql_admin_user: gvapgsql
pgsql_admin_password: AAv6d1t9p/vtX/kVorim2MJROQfQPWJoZP3mzyMW
git_url: https://git.dittberner.info/gnuviech/gvapgsql.git
git_branch: master
celery_module: pgsqltasks
git_url: https://git.dittberner.info/gnuviech/gvapgsql.git
pgsql_admin_password: AAv6d1t9p/vtX/kVorim2MJROQfQPWJoZP3mzyMW
pgsql_admin_user: gvapgsql

@ -7,7 +7,7 @@ gnuviechadmin:
appname: gvaweb
gvaweb:
amqp_user: web
celery_module: webtasks
fullname: Web
git_url: https://git.dittberner.info/gnuviech/gvaweb.git
git_branch: master
celery_module: webtasks
git_url: https://git.dittberner.info/gnuviech/gvaweb.git

Loading…
Cancel
Save