Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone
# Conflicts: # webserver/docker_warpinfra/files/Dockerfile # webserver/docker_warpinfra/files/entrypoint.sh # webserver/docker_warpinfra/tasks/main.yml # webserver/nginx/files/warpinfra # webserver/nginx/tasks/main.yml
No related branches found
No related tags found
Showing
- webserver/docker_warpinfra/files/Dockerfile 0 additions, 39 deletionswebserver/docker_warpinfra/files/Dockerfile
- webserver/docker_warpinfra/files/entrypoint.sh 0 additions, 9 deletionswebserver/docker_warpinfra/files/entrypoint.sh
- webserver/docker_warpinfra/tasks/main.yml 45 additions, 15 deletionswebserver/docker_warpinfra/tasks/main.yml
- webserver/nginx/files/phpldapadmin 41 additions, 0 deletionswebserver/nginx/files/phpldapadmin
- webserver/nginx/files/warpinfra 26 additions, 21 deletionswebserver/nginx/files/warpinfra
- webserver/nginx/tasks/main.yml 9 additions, 3 deletionswebserver/nginx/tasks/main.yml
webserver/nginx/files/phpldapadmin
0 → 100644
Please register or sign in to comment