Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone
# Conflicts: # group_vars/all # host_vars/webserver-test # webserver-test/main.yml # webserver/nginx/tasks/main.yml # webserver/nginx/templates/letsencrypt.sh # webserver/nginx/templates/nginx-site
No related branches found
No related tags found
Showing
- all/common/tasks/main.yml 4 additions, 0 deletionsall/common/tasks/main.yml
- group_vars/debianjessie 0 additions, 5 deletionsgroup_vars/debianjessie
- group_vars/prod 33 additions, 0 deletionsgroup_vars/prod
- group_vars/raspbianjessie 0 additions, 4 deletionsgroup_vars/raspbianjessie
- group_vars/test 24 additions, 0 deletionsgroup_vars/test
- webserver-test/main.yml 4 additions, 3 deletionswebserver-test/main.yml
- webserver/docker_jabber/tasks/main.yaml 15 additions, 0 deletionswebserver/docker_jabber/tasks/main.yaml
- webserver/docker_jabber/templates/certbot-hook.sh 4 additions, 0 deletionswebserver/docker_jabber/templates/certbot-hook.sh
- webserver/docker_jabber/templates/docker-compose.yml 7 additions, 6 deletionswebserver/docker_jabber/templates/docker-compose.yml
- webserver/docker_ldap/tasks/main.yml 4 additions, 15 deletionswebserver/docker_ldap/tasks/main.yml
- webserver/docker_ldap/templates/docker-compose.yml 21 additions, 15 deletionswebserver/docker_ldap/templates/docker-compose.yml
- webserver/docker_warpinfra/templates/config.ini 10 additions, 10 deletionswebserver/docker_warpinfra/templates/config.ini
- webserver/docker_wordpress/tasks/main.yml 11 additions, 13 deletionswebserver/docker_wordpress/tasks/main.yml
- webserver/nginx/templates/certbot-hook.sh 4 additions, 0 deletionswebserver/nginx/templates/certbot-hook.sh
- webserver/nginx/templates/nginx-default 45 additions, 0 deletionswebserver/nginx/templates/nginx-default
- webserver/nginx/templates/nginx-status 24 additions, 0 deletionswebserver/nginx/templates/nginx-status
- webserver/nginx/templates/telegraf.conf 9 additions, 0 deletionswebserver/nginx/templates/telegraf.conf
group_vars/debianjessie
deleted
100644 → 0
group_vars/prod
0 → 100644
group_vars/raspbianjessie
deleted
100644 → 0
group_vars/test
0 → 100644
webserver/nginx/templates/certbot-hook.sh
0 → 100644
webserver/nginx/templates/nginx-default
0 → 100644
webserver/nginx/templates/nginx-status
0 → 100644
webserver/nginx/templates/telegraf.conf
0 → 100644
Please register or sign in to comment