kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2024-11-22 20:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed paths,versions and set environment variables correct

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2021-10-21 08:19:19 +02:00
parent 12a8516ad1
commit 8d4d558544
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/docker-mailu/handlers/main.yml
View File

@ -3,6 +3,9 @@
command: command:
cmd: docker-compose -p mailu up -d --force-recreate cmd: docker-compose -p mailu up -d --force-recreate
chdir: /home/administrator/docker-compose/mailu/ chdir: /home/administrator/docker-compose/mailu/
environment:
COMPOSE_HTTP_TIMEOUT: 120
DOCKER_CLIENT_TIMEOUT: 120
- name: "restart deploy-letsencrypt-mailu.service" - name: "restart deploy-letsencrypt-mailu.service"
systemd: systemd:
name: deploy-letsencrypt-mailu.service name: deploy-letsencrypt-mailu.service

2
roles/docker-mailu/templates/docker-compose.yml.j2
View File

@ -17,8 +17,6 @@ services:
MYSQL_USER: "mailu" MYSQL_USER: "mailu"
MYSQL_PASSWORD: "{{mailu_database_password}}" MYSQL_PASSWORD: "{{mailu_database_password}}"
MYSQL_RANDOM_ROOT_PASSWORD: 'yes' MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
COMPOSE_HTTP_TIMEOUT: 120
DOCKER_CLIENT_TIMEOUT: 120
volumes: volumes:
- database:/var/lib/mysql - database:/var/lib/mysql

4
roles/docker-mailu/templates/mailu.env.j2
View File

@ -8,10 +8,6 @@
# Common configuration variables # Common configuration variables
################################### ###################################
# TIMEOUTS
COMPOSE_HTTP_TIMEOUT=300
DOCKER_CLIENT_TIMEOUT=300
# Set to a randomly generated 16 bytes string # Set to a randomly generated 16 bytes string
SECRET_KEY={{mailu_secret_key}} SECRET_KEY={{mailu_secret_key}}

5
roles/docker-nextcloud/handlers/main.yml
View File

@ -2,4 +2,7 @@
- name: recreate nextcloud - name: recreate nextcloud
command: command:
cmd: docker-compose -p nextcloud up -d --force-recreate cmd: docker-compose -p nextcloud up -d --force-recreate
chdir: /usr/local/bin/nextcloud/ chdir: /home/administrator/docker-compose/nextcloud/
environment:
COMPOSE_HTTP_TIMEOUT: 120
DOCKER_CLIENT_TIMEOUT: 120

6
roles/docker-nextcloud/templates/docker-compose.yml.j2
View File

@ -1,4 +1,4 @@
version: '2' version: '3'
services: services:
application: application:
@ -11,8 +11,6 @@ services:
volumes: volumes:
- data:/var/www/html - data:/var/www/html
environment: environment:
COMPOSE_HTTP_TIMEOUT: 120
DOCKER_CLIENT_TIMEOUT: 120
MYSQL_DATABASE: "nextcloud" MYSQL_DATABASE: "nextcloud"
MYSQL_USER: "nextcloud" MYSQL_USER: "nextcloud"
MYSQL_PASSWORD: "{{nextcloud_database_password}}" MYSQL_PASSWORD: "{{nextcloud_database_password}}"
@ -22,8 +20,6 @@ services:
driver: journald driver: journald
image: mariadb image: mariadb
environment: environment:
COMPOSE_HTTP_TIMEOUT: 120
DOCKER_CLIENT_TIMEOUT: 120
MYSQL_DATABASE: "nextcloud" MYSQL_DATABASE: "nextcloud"
MYSQL_USER: "nextcloud" MYSQL_USER: "nextcloud"
MYSQL_PASSWORD: "{{nextcloud_database_password}}" MYSQL_PASSWORD: "{{nextcloud_database_password}}"

5
roles/docker-wordpress/tasks/main.yml
View File

@ -12,6 +12,9 @@
notify: restart nginx notify: restart nginx
- name: "setup wordpress" - name: "setup wordpress"
environment:
DOCKER_CLIENT_TIMEOUT: 120
COMPOSE_HTTP_TIMEOUT: 120
docker_compose: docker_compose:
project_name: wordpress project_name: wordpress
definition: definition:
@ -22,8 +25,6 @@
ports: ports:
- "127.0.0.1:{{http_port}}:80" - "127.0.0.1:{{http_port}}:80"
environment: environment:
DOCKER_CLIENT_TIMEOUT: 120
COMPOSE_HTTP_TIMEOUT: 120
WORDPRESS_DB_HOST: database:3306 WORDPRESS_DB_HOST: database:3306
WORDPRESS_DB_USER: "wordpress" WORDPRESS_DB_USER: "wordpress"
WORDPRESS_DB_PASSWORD: "{{wordpress_database_password}}" WORDPRESS_DB_PASSWORD: "{{wordpress_database_password}}"

5
roles/docker-yourls/tasks/main.yml
View File

@ -7,6 +7,9 @@
notify: restart nginx notify: restart nginx
- name: "setup yourls" - name: "setup yourls"
environment:
DOCKER_CLIENT_TIMEOUT: 120
COMPOSE_HTTP_TIMEOUT: 120
docker_compose: docker_compose:
project_name: yourls project_name: yourls
definition: definition:
@ -16,8 +19,6 @@
ports: ports:
- "127.0.0.1:{{http_port}}:80" - "127.0.0.1:{{http_port}}:80"
environment: environment:
DOCKER_CLIENT_TIMEOUT: 120
COMPOSE_HTTP_TIMEOUT: 120
YOURLS_DB_HOST: "database:3306" YOURLS_DB_HOST: "database:3306"
YOURLS_DB_USER: "yourls" YOURLS_DB_USER: "yourls"
YOURLS_DB_PASS: "{{yourls_database_password}}" YOURLS_DB_PASS: "{{yourls_database_password}}"