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

Solved bugs occuring during setup of yourls

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2024-01-03 15:46:28 +01:00
parent ece4fe465e
commit a6670ddb01
32 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
group_vars/all
View File

@ -86,6 +86,9 @@ system_maintenance_manipulation_services:
## Total System Maintenance 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
## Nginx-Specific Path Configurations

4
roles/backup-docker-to-local/tasks/main.yml
View File

@ -46,7 +46,6 @@
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}}"
when: >
docker_compose_project_name is defined or
database_host is defined or
database_databasename is defined or
database_username is defined or
@ -59,8 +58,7 @@
owner: root
group: root
when: >
(docker_compose_project_name is defined or
database_host is defined or
(database_host is defined or
database_databasename is defined or
database_username is defined or
database_password is defined) and

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

@ -2,7 +2,7 @@ version: '3.7'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
image: docker.io/akaunting/akaunting:{{version_akaunting}}

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

@ -3,7 +3,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
web:
image: attendize_web:latest

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

@ -4,7 +4,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
baserow:
image: baserow/baserow:1.19.1

3
roles/docker-bigbluebutton/vars/main.yml
View File

@ -1,6 +1,5 @@
docker_compose_project_name: "bigbluebutton"
docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
database_host: "postgres"
database_host: "postgres" # needs to be fixed
database_databasename: "greenlight-v3"
database_username: "postgres"
database_password: ""

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

@ -2,7 +2,7 @@ version: '3'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
logging:

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

@ -3,7 +3,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
web:
image: 'gitlab/gitlab-ee:latest'

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

@ -2,7 +2,7 @@ version: '3'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
image: joomla

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

@ -2,7 +2,7 @@ version: "3.7"
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
restart: unless-stopped

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

@ -4,7 +4,7 @@ services:
{% 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
resolver:

4
roles/docker-mailu/vars/main.yml
View File

@ -1,6 +1,2 @@
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}}"

8
roles/docker-mariadb/tasks/main.yml
View File

@ -29,6 +29,12 @@
timeout: 120
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
mysql_db:
name: "{{database_databasename}}"
@ -37,7 +43,6 @@
login_password: "{{central_mariadb_root_password}}"
login_host: 127.0.0.1
login_port: 3306
listen: create database
- name: create database user
mysql_user:
@ -49,7 +54,6 @@
login_password: "{{central_mariadb_root_password}}"
login_host: 127.0.0.1
login_port: 3306
listen: create database
- name: run the docker_mariadb tasks once
set_fact:

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

@ -3,7 +3,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
web:
image: tootsuite/mastodon:{{version_mastodon}}

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

@ -2,7 +2,7 @@ version: '3'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
logging:

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

@ -2,7 +2,7 @@ version: '3.1'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
synapse:
image: matrixdotorg/synapse:latest

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

@ -1,7 +1,7 @@
version: '3.8'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
logging:

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

@ -4,7 +4,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"

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

@ -21,7 +21,7 @@ x-op-app: &app
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
cache:
image: memcached

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

@ -4,7 +4,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
image: chocobozzz/peertube:production-bullseye

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

@ -2,7 +2,7 @@ version: '2'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}

2
roles/docker-postgres/tasks/main.yml
View File

@ -34,7 +34,6 @@
login_password: "{{ central_postgres_password }}"
login_host: 127.0.0.1
login_port: 5432
listen: create database
- name: Create database user
postgresql_user:
@ -47,7 +46,6 @@
login_password: "{{ central_postgres_password }}"
login_host: 127.0.0.1
login_port: 5432
listen: create database
- name: Run the docker_postgres tasks once
set_fact:

1
roles/docker-roulette-wheel/vars/main.yml
View File

@ -1,3 +1,2 @@
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/"

2
roles/docker-yourls/meta/main.yml
View File

@ -1,2 +0,0 @@
dependencies:
- docker-compose

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

@ -2,6 +2,10 @@
- name: include docker vars
include_vars: vars/docker-database-service.yml.j2
- name: load docker compose dependencies
include_role:
name: docker-compose
- name: create central database
include_role:
name: docker-{{database_type}}

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

@ -2,7 +2,7 @@ version: '3'
services:
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
application:
logging:

7
roles/nginx/tasks/main.yml
View File

@ -4,6 +4,13 @@
notify: restart nginx
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
file:
path: "{{ item }}"

3
roles/nginx/templates/nginx.conf.j2
View File

@ -1,4 +1,7 @@
{% if nginx_matomo_tracking | bool %}
load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
{% endif %}
worker_processes auto;
events

2
templates/docker-container-depends-on-also-database.yml.j2
View File

@ -1,6 +1,6 @@
# This template needs to be included in docker-compose.yml containers which depend on a database and additional containers
depends_on:
{% if enable_central_database | bool %}
{% if not enable_central_database | bool %}
database:
condition: service_healthy
{% endif %}

2
templates/docker-container-depends-on-database-redis.yml.j2
View File

@ -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
depends_on:
{% if enable_central_database | bool %}
{% if not enable_central_database | bool %}
database:
condition: service_healthy
{% endif %}

4
templates/docker-container-depends-on-just-database.yml.j2
View File

@ -1,6 +1,6 @@
# 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:
database:
condition: service_healthy
condition: service_healthy
{% endif %}

10
vars/docker-database-service.yml.j2
View File

@ -1,4 +1,6 @@
docker_compose_instance_directory: "{{ docker_compose_instance_directory | default(path_docker_compose_instances + docker_compose_project_name + '/') }}"
database_host: "{{ database_host | default('database') }}"
database_databasename: "{{ database_databasename | default(docker_compose_project_name) }}"
database_username: "{{ database_username | default(docker_compose_project_name) }}"
docker_compose_instance_directory: "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}"
database_host: "{{ 'central-' + database_type if enable_central_database else 'database' }}"
database_databasename: "{{ docker_compose_project_name }}"
database_username: "{{ docker_compose_project_name }}"
# This will lead to problems with bbb and openproject