mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-09 22:41:03 +01:00
Solved bugs occuring during setup of yourls
This commit is contained in:
parent
9c81a48f17
commit
ce053a0b58
@ -86,6 +86,9 @@ system_maintenance_manipulation_services:
|
|||||||
## Total System Maintenance Services
|
## Total System Maintenance Services
|
||||||
system_maintenance_services: "{{ system_maintenance_backup_services + system_maintenance_cleanup_services + system_maintenance_manipulation_services }}"
|
system_maintenance_services: "{{ system_maintenance_backup_services + system_maintenance_cleanup_services + system_maintenance_manipulation_services }}"
|
||||||
|
|
||||||
|
### Define Variables for Docker Volume Health services
|
||||||
|
whitelisted_anonymous_docker_volumes: []
|
||||||
|
|
||||||
# Webserver Configuration
|
# Webserver Configuration
|
||||||
|
|
||||||
## Nginx-Specific Path Configurations
|
## Nginx-Specific Path Configurations
|
||||||
|
@ -46,7 +46,6 @@
|
|||||||
cmd: "python database_entry_seeder.py databases.csv {{docker_compose_project_name}} {{database_host}} {{database_databasename}} {{database_username}} {{database_password}}"
|
cmd: "python database_entry_seeder.py databases.csv {{docker_compose_project_name}} {{database_host}} {{database_databasename}} {{database_username}} {{database_password}}"
|
||||||
chdir: "{{backup_docker_to_local_folder}}"
|
chdir: "{{backup_docker_to_local_folder}}"
|
||||||
when: >
|
when: >
|
||||||
docker_compose_project_name is defined or
|
|
||||||
database_host is defined or
|
database_host is defined or
|
||||||
database_databasename is defined or
|
database_databasename is defined or
|
||||||
database_username is defined or
|
database_username is defined or
|
||||||
@ -59,8 +58,7 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
when: >
|
when: >
|
||||||
(docker_compose_project_name is defined or
|
(database_host is defined or
|
||||||
database_host is defined or
|
|
||||||
database_databasename is defined or
|
database_databasename is defined or
|
||||||
database_username is defined or
|
database_username is defined or
|
||||||
database_password is defined) and
|
database_password is defined) and
|
||||||
|
@ -2,7 +2,7 @@ version: '3.7'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
image: docker.io/akaunting/akaunting:{{version_akaunting}}
|
image: docker.io/akaunting/akaunting:{{version_akaunting}}
|
||||||
|
@ -3,7 +3,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: attendize_web:latest
|
image: attendize_web:latest
|
||||||
|
@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
baserow:
|
baserow:
|
||||||
image: baserow/baserow:1.19.1
|
image: baserow/baserow:1.19.1
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
docker_compose_project_name: "bigbluebutton"
|
docker_compose_project_name: "bigbluebutton"
|
||||||
docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
|
database_host: "postgres" # needs to be fixed
|
||||||
database_host: "postgres"
|
|
||||||
database_databasename: "greenlight-v3"
|
database_databasename: "greenlight-v3"
|
||||||
database_username: "postgres"
|
database_username: "postgres"
|
||||||
database_password: ""
|
database_password: ""
|
@ -2,7 +2,7 @@ version: '3'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
logging:
|
logging:
|
||||||
|
@ -3,7 +3,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: 'gitlab/gitlab-ee:latest'
|
image: 'gitlab/gitlab-ee:latest'
|
||||||
|
@ -2,7 +2,7 @@ version: '3'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
image: joomla
|
image: joomla
|
||||||
|
@ -2,7 +2,7 @@ version: "3.7"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
# Core services
|
# Core services
|
||||||
resolver:
|
resolver:
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
docker_compose_project_name: "mailu"
|
docker_compose_project_name: "mailu"
|
||||||
docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
|
|
||||||
database_host: "database"
|
|
||||||
database_databasename: "{{docker_compose_project_name}}"
|
|
||||||
database_username: "{{docker_compose_project_name}}"
|
|
||||||
database_password: "{{mailu_database_password}}"
|
database_password: "{{mailu_database_password}}"
|
@ -29,6 +29,12 @@
|
|||||||
timeout: 120
|
timeout: 120
|
||||||
when: run_once_docker_mariadb is not defined
|
when: run_once_docker_mariadb is not defined
|
||||||
|
|
||||||
|
- name: install python-mysqlclient
|
||||||
|
pacman:
|
||||||
|
name: python-mysqlclient
|
||||||
|
state: present
|
||||||
|
when: run_once_docker_mariadb is not defined
|
||||||
|
|
||||||
- name: create database
|
- name: create database
|
||||||
mysql_db:
|
mysql_db:
|
||||||
name: "{{database_databasename}}"
|
name: "{{database_databasename}}"
|
||||||
@ -37,7 +43,6 @@
|
|||||||
login_password: "{{central_mariadb_root_password}}"
|
login_password: "{{central_mariadb_root_password}}"
|
||||||
login_host: 127.0.0.1
|
login_host: 127.0.0.1
|
||||||
login_port: 3306
|
login_port: 3306
|
||||||
listen: create database
|
|
||||||
|
|
||||||
- name: create database user
|
- name: create database user
|
||||||
mysql_user:
|
mysql_user:
|
||||||
@ -49,7 +54,6 @@
|
|||||||
login_password: "{{central_mariadb_root_password}}"
|
login_password: "{{central_mariadb_root_password}}"
|
||||||
login_host: 127.0.0.1
|
login_host: 127.0.0.1
|
||||||
login_port: 3306
|
login_port: 3306
|
||||||
listen: create database
|
|
||||||
|
|
||||||
- name: run the docker_mariadb tasks once
|
- name: run the docker_mariadb tasks once
|
||||||
set_fact:
|
set_fact:
|
||||||
|
@ -3,7 +3,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: tootsuite/mastodon:{{version_mastodon}}
|
image: tootsuite/mastodon:{{version_mastodon}}
|
||||||
|
@ -2,7 +2,7 @@ version: '3'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
logging:
|
logging:
|
||||||
|
@ -2,7 +2,7 @@ version: '3.1'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
synapse:
|
synapse:
|
||||||
image: matrixdotorg/synapse:latest
|
image: matrixdotorg/synapse:latest
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
logging:
|
logging:
|
||||||
|
@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
|
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
|
||||||
|
@ -21,7 +21,7 @@ x-op-app: &app
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: memcached
|
image: memcached
|
||||||
|
@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
image: chocobozzz/peertube:production-bullseye
|
image: chocobozzz/peertube:production-bullseye
|
||||||
|
@ -2,7 +2,7 @@ version: '2'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
login_password: "{{ central_postgres_password }}"
|
login_password: "{{ central_postgres_password }}"
|
||||||
login_host: 127.0.0.1
|
login_host: 127.0.0.1
|
||||||
login_port: 5432
|
login_port: 5432
|
||||||
listen: create database
|
|
||||||
|
|
||||||
- name: Create database user
|
- name: Create database user
|
||||||
postgresql_user:
|
postgresql_user:
|
||||||
@ -47,7 +46,6 @@
|
|||||||
login_password: "{{ central_postgres_password }}"
|
login_password: "{{ central_postgres_password }}"
|
||||||
login_host: 127.0.0.1
|
login_host: 127.0.0.1
|
||||||
login_port: 5432
|
login_port: 5432
|
||||||
listen: create database
|
|
||||||
|
|
||||||
- name: Run the docker_postgres tasks once
|
- name: Run the docker_postgres tasks once
|
||||||
set_fact:
|
set_fact:
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
docker_compose_project_name: "roulette-wheel"
|
docker_compose_project_name: "roulette-wheel"
|
||||||
docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
|
|
||||||
app_path: "{{docker_compose_instance_directory}}/app/"
|
app_path: "{{docker_compose_instance_directory}}/app/"
|
@ -1,2 +0,0 @@
|
|||||||
dependencies:
|
|
||||||
- docker-compose
|
|
@ -2,6 +2,10 @@
|
|||||||
- name: include docker vars
|
- name: include docker vars
|
||||||
include_vars: vars/docker-database-service.yml.j2
|
include_vars: vars/docker-database-service.yml.j2
|
||||||
|
|
||||||
|
- name: load docker compose dependencies
|
||||||
|
include_role:
|
||||||
|
name: docker-compose
|
||||||
|
|
||||||
- name: create central database
|
- name: create central database
|
||||||
include_role:
|
include_role:
|
||||||
name: docker-{{database_type}}
|
name: docker-{{database_type}}
|
||||||
|
@ -2,7 +2,7 @@ version: '3'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
logging:
|
logging:
|
||||||
|
@ -4,6 +4,13 @@
|
|||||||
notify: restart nginx
|
notify: restart nginx
|
||||||
when: run_once_nginx is not defined
|
when: run_once_nginx is not defined
|
||||||
|
|
||||||
|
- name: install nginx-mod-headers-more for matomo
|
||||||
|
pacman:
|
||||||
|
name: nginx-mod-headers-more
|
||||||
|
state: present
|
||||||
|
notify: restart nginx
|
||||||
|
when: run_once_nginx is not defined and nginx_matomo_tracking | bool
|
||||||
|
|
||||||
- name: Ensure nginx configuration directories are present
|
- name: Ensure nginx configuration directories are present
|
||||||
file:
|
file:
|
||||||
path: "{{ item }}"
|
path: "{{ item }}"
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
|
{% if nginx_matomo_tracking | bool %}
|
||||||
load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
|
load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
worker_processes auto;
|
worker_processes auto;
|
||||||
|
|
||||||
events
|
events
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This template needs to be included in docker-compose.yml containers which depend on a database and additional containers
|
# This template needs to be included in docker-compose.yml containers which depend on a database and additional containers
|
||||||
depends_on:
|
depends_on:
|
||||||
{% if enable_central_database | bool %}
|
{% if not enable_central_database | bool %}
|
||||||
database:
|
database:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
{% endif %}
|
{% endif %}
|
@ -1,6 +1,6 @@
|
|||||||
# This template needs to be included in docker-compose.yml contaienrs, which depend on a database, redis and optional additional volumes
|
# This template needs to be included in docker-compose.yml contaienrs, which depend on a database, redis and optional additional volumes
|
||||||
depends_on:
|
depends_on:
|
||||||
{% if enable_central_database | bool %}
|
{% if not enable_central_database | bool %}
|
||||||
database:
|
database:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# This template needs to be included in docker-compose.yml contaienrs, which just depend on a database
|
# This template needs to be included in docker-compose.yml contaienrs, which just depend on a database
|
||||||
{% if enable_central_database | bool %}
|
{% if not enable_central_database | bool %}
|
||||||
depends_on:
|
depends_on:
|
||||||
database:
|
database:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
docker_compose_instance_directory: "{{ docker_compose_instance_directory | default(path_docker_compose_instances + docker_compose_project_name + '/') }}"
|
docker_compose_instance_directory: "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}"
|
||||||
database_host: "{{ database_host | default('database') }}"
|
database_host: "{{ 'central-' + database_type if enable_central_database else 'database' }}"
|
||||||
database_databasename: "{{ database_databasename | default(docker_compose_project_name) }}"
|
database_databasename: "{{ docker_compose_project_name }}"
|
||||||
database_username: "{{ database_username | default(docker_compose_project_name) }}"
|
database_username: "{{ docker_compose_project_name }}"
|
||||||
|
|
||||||
|
# This will lead to problems with bbb and openproject
|
Loading…
Reference in New Issue
Block a user