Implement proper provisioning for gvaldap

- merge improvements from the internal saltstack repository
- define dummy secrets in the pillars
- use systemd to setup the gvaldap celery worker
This commit is contained in:
Jan Dittberner 2020-03-04 00:10:16 +01:00
parent 8d78388915
commit 7381b5bfd8
21 changed files with 306 additions and 44 deletions

View file

@ -2,10 +2,17 @@ include:
- gnuviechadmin
- gnuviechadmin.queues.common
- gnuviechadmin.queues.gvaldap
- ldapserver
gnuviechadmin:
component:
name: gvaldap
amqp_user: ldap
ldap_admin_user: ldapadmin
ldap_admin_password: NnVnGoWBVw6BKb9DhTwHAz0ICrdiDy+HL1A6F2Rz
allowed_hosts: 127.0.0.1,gvaldap.local,localhost
gvaldap:
git_url: https://git.dittberner.info/gnuviech/gvaldap.git
git_branch: master
celery_module: ldaptasks
django_secret_key: IyOiTDt2DMo4gBVTwZ+E2p+mI1S/rNzZVIFlSr6TpgtxtsJODOVWHaxgVW3FqGZVaFU=

View file

@ -8,3 +8,4 @@ gnuviechadmin:
name: gvamysql
amqp_user: mysql
mysql_admin_user: gvamysql
mysql_admin_password: jSXstgT/AbWofdI2tJWYpQvFX1mtxt4tFMlrYxSA

View file

@ -7,4 +7,5 @@ gnuviechadmin:
component:
name: gvapgsql
amqp_user: pgsql
postgresql_admin_user: gvapgsql
pgsql_admin_user: gvapgsql
pgsql_admin_password: AAv6d1t9p/vtX/kVorim2MJROQfQPWJoZP3mzyMW

View file

@ -1,4 +1,6 @@
gnuviechadmin:
ssh_known_hosts: |
nextgit.gnuviech-server.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBESb6Q0nyvx82wJ0S6Jx7ZvY6wJzuwqh2zWOlXzLDcor8Pu5iLqUn5GywS0ooyl3Hkyn983R6Zdr49zgTroRwQA=
deploymenttype: local
mailfrom: admin@gnuviech-server.de
adminemail: admin@gnuviech-server.de
@ -18,6 +20,7 @@ gnuviechadmin:
ldap_users_ou: users
redis_password: j2gfWeACPrj0R2xkgv4KAznCM9nCuUb4
redis_host: gva.local
django_secret_key: yBnbG4azhNaTxIW0/Rv2dEij9PcVU1KVR//1bR6LujmLBnZJw8OOrEi2dIqz3pyOdG8=
machines:
gva.local:
ip: 172.16.3.2

2
pillar/ldapserver.sls Normal file
View file

@ -0,0 +1,2 @@
slapd:
admin_password: W3HelITKNF1jR5YoCCsbQzkktf61ylXb8xEEAFqU