This commit is contained in:
Kevin Veen-Birkenbach 2023-12-08 01:13:32 +01:00
commit c5ab6ed353
47 changed files with 338 additions and 83 deletions

View File

@ -29,7 +29,7 @@ size_percent_cleanup_disc_space: 90
path_administrator_home: "/home/administrator/" path_administrator_home: "/home/administrator/"
path_administrator_scripts: "{{path_administrator_home}}scripts/" path_administrator_scripts: "{{path_administrator_home}}scripts/"
path_docker_volumes: "{{path_administrator_home}}volumes/docker/" path_docker_volumes: "{{path_administrator_home}}volumes/docker/"
path_docker_compose_files: "{{path_administrator_home}}docker-compose/" path_docker_compose_instances: "{{path_administrator_home}}docker-compose/"
# Runtime Variables # Runtime Variables
activate_all_timers (bool): false # Activates all timers, independend if the handlers had been triggered activate_all_timers (bool): false # Activates all timers, independend if the handlers had been triggered

View File

@ -202,6 +202,15 @@
domain: listmonk.{{top_domain}} domain: listmonk.{{top_domain}}
http_port: 8019 http_port: 8019
- name: setup discourse
hosts: discourse
become: true
roles:
- role: docker-discourse
vars:
domain: discourse.{{top_domain}}
http_port: 8020
- name: setup akaunting hosts - name: setup akaunting hosts
hosts: akaunting hosts: akaunting
become: true become: true

View File

@ -19,7 +19,7 @@ Due to license issues, bugs and that in the past after an akaunting update your
1. **Navigate to Docker Compose Directory**: Change to the directory containing your Docker Compose files for Akaunting. 1. **Navigate to Docker Compose Directory**: Change to the directory containing your Docker Compose files for Akaunting.
```bash ```bash
cd {{path_docker_compose_files}}akaunting/ cd {{path_docker_compose_instances}}akaunting/
``` ```
2. **Set Environment Variables**: These are necessary to prevent timeouts during long operations. 2. **Set Environment Variables**: These are necessary to prevent timeouts during long operations.

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}akaunting/" docker_compose_instance_directory: "{{path_docker_compose_instances}}akaunting/"

View File

@ -1,3 +1,3 @@
--- ---
docker_compose_instance_directory: "{{path_docker_compose_files}}attendize/" docker_compose_instance_directory: "{{path_docker_compose_instances}}attendize/"
mail_interface_domain: "mail.{{domain}}" mail_interface_domain: "mail.{{domain}}"

View File

@ -2,7 +2,7 @@
- name: recreate baserow - name: recreate baserow
command: command:
cmd: docker-compose -p baserow up -d --force-recreate cmd: docker-compose -p baserow up -d --force-recreate
chdir: "{{path_docker_compose_files}}baserow/" chdir: "{{path_docker_compose_instances}}baserow/"
environment: environment:
COMPOSE_HTTP_TIMEOUT: 600 COMPOSE_HTTP_TIMEOUT: 600
DOCKER_CLIENT_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}baserow/" docker_compose_instance_directory: "{{path_docker_compose_instances}}baserow/"

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}bigbluebutton/" docker_compose_instance_directory: "{{path_docker_compose_instances}}bigbluebutton/"

View File

View File

@ -0,0 +1,12 @@
---
#- name: recreate discourse
# command:
# cmd: docker-compose up -d --force-recreate
# chdir: "{{docker_compose_instance_directory}}"
# environment:
# COMPOSE_HTTP_TIMEOUT: 600
# DOCKER_CLIENT_TIMEOUT: 600
- name: recreate discourse
command:
cmd: ./launcher rebuild app
chdir: "{{docker_compose_instance_directory}}"

View File

@ -0,0 +1,2 @@
dependencies:
- nginx-docker-reverse-proxy

View File

@ -0,0 +1,52 @@
---
- name: "include tasks nginx-docker-proxy-domain.yml"
include_tasks: nginx-docker-proxy-domain.yml
- name: "create {{docker_compose_instance_directory}}"
file:
path: "{{docker_compose_instance_directory}}"
state: directory
mode: 0755
#- name: add docker-compose.yml
# template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
# notify: recreate discourse
- name: register directory
stat:
path: "{{docker_compose_instance_directory}}"
register: docker_compose_instance_directory_register
- name: checkout repository
ansible.builtin.shell: git checkout .
become: true
args:
chdir: "{{docker_compose_instance_directory}}"
when: docker_compose_instance_directory_register.stat.exists
- name: pull docker repository
git:
repo: "https://github.com/discourse/discourse_docker.git"
dest: "{{docker_compose_instance_directory}}"
update: yes
notify: recreate discourse
become: true
register: git_result
ignore_errors: true
- name: Warn if repo is not reachable
debug:
msg: "Warning: Repository is not reachable."
when: git_result.failed
- name: set chmod 700 for {{docker_compose_instance_directory}}containers
ansible.builtin.file:
path: "{{docker_compose_instance_directory}}/containers"
mode: '700'
state: directory
- name: "copy configuration {{docker_compose_instance_directory}}containers/app.yml"
template:
src: app.yml.j2
dest: "{{docker_compose_instance_directory}}containers/app.yml"
notify: recreate discourse

View File

@ -0,0 +1,109 @@
## this is the all-in-one, standalone Discourse Docker container template
##
## After making changes to this file, you MUST rebuild
## /var/discourse/launcher rebuild app
##
## BE *VERY* CAREFUL WHEN EDITING!
## YAML FILES ARE SUPER SUPER SENSITIVE TO MISTAKES IN WHITESPACE OR ALIGNMENT!
## visit http://www.yamllint.com/ to validate this file as needed
templates:
- "templates/postgres.template.yml"
- "templates/redis.template.yml"
- "templates/web.template.yml"
## Uncomment the next line to enable the IPv6 listener
#- "templates/web.ipv6.template.yml"
- "templates/web.ratelimited.template.yml"
## Uncomment these two lines if you wish to add Lets Encrypt (https)
#- "templates/web.ssl.template.yml"
#- "templates/web.letsencrypt.ssl.template.yml"
## which TCP/IP ports should this container expose?
## If you want Discourse to share a port with another webserver like Apache or nginx,
## see https://meta.discourse.org/t/17247 for details
expose:
- "127.0.0.1:{{http_port}}:80" # http
#- "443:443" # https
params:
db_default_text_search_config: "pg_catalog.english"
## Set db_shared_buffers to a max of 25% of the total memory.
## will be set automatically by bootstrap based on detected RAM, or you can override
db_shared_buffers: "4096MB"
## can improve sorting performance, but adds memory usage per-connection
#db_work_mem: "40MB"
## Which Git revision should this container use? (default: tests-passed)
#version: tests-passed
env:
LC_ALL: en_US.UTF-8
LANG: en_US.UTF-8
LANGUAGE: en_US.UTF-8
# DISCOURSE_DEFAULT_LOCALE: en
## How many concurrent web requests are supported? Depends on memory and CPU cores.
## will be set automatically by bootstrap based on detected CPUs, or you can override
UNICORN_WORKERS: 8
## TODO: The domain name this Discourse instance will respond to
## Required. Discourse will not work with a bare IP number.
DISCOURSE_HOSTNAME: localhost
## Uncomment if you want the container to be started with the same
## hostname (-h option) as specified above (default "$hostname-$config")
#DOCKER_USE_HOSTNAME: true
## TODO: List of comma delimited emails that will be made admin and developer
## on initial signup example 'user1@example.com,user2@example.com'
DISCOURSE_DEVELOPER_EMAILS: {{administrator_email}}
## TODO: The SMTP mail server used to validate new accounts and send notifications
# SMTP ADDRESS, username, and password are required
# WARNING the char '#' in SMTP password can cause problems!
DISCOURSE_SMTP_ADDRESS: {{system_email_domain}}
DISCOURSE_SMTP_PORT: 587
DISCOURSE_SMTP_USER_NAME: {{system_email}}
DISCOURSE_SMTP_PASSWORD: {{system_email_password}}
DISCOURSE_SMTP_ENABLE_START_TLS: true # (optional, default true)
DISCOURSE_SMTP_DOMAIN: {{system_email_domain}}
DISCOURSE_NOTIFICATION_EMAIL: {{system_email}}
## If you added the Lets Encrypt template, uncomment below to get a free SSL certificate
#LETSENCRYPT_ACCOUNT_EMAIL: administrator@veen.world
## The http or https CDN address for this Discourse instance (configured to pull)
## see https://meta.discourse.org/t/14857 for details
#DISCOURSE_CDN_URL: https://discourse-cdn.example.com
## The maxmind geolocation IP address key for IP address lookup
## see https://meta.discourse.org/t/-/137387/23 for details
#DISCOURSE_MAXMIND_LICENSE_KEY: 1234567890123456
## The Docker container is stateless; all data is stored in /shared
volumes:
- volume:
host: /var/discourse/shared/standalone
guest: /shared
- volume:
host: /var/discourse/shared/standalone/log/var-log
guest: /var/log
## Plugins go here
## see https://meta.discourse.org/t/19157 for details
hooks:
after_code:
- exec:
cd: $home/plugins
cmd:
- git clone https://github.com/discourse/docker_manager.git
## Any custom commands to run after building
run:
- exec: echo "Beginning of custom commands"
## If you want to set the 'From' email address for your first registration, uncomment and change:
## After getting the first signup email, re-comment the line. It only needs to run once.
#- exec: rails r "SiteSetting.notification_email='info@unconfigured.discourse.org'"
- exec: echo "End of custom commands"

View File

@ -0,0 +1,34 @@
version: '3'
services:
discourse:
image: discourse/base:release
depends_on:
- database
- redis
volumes:
- data:/shared
environment:
DISCOURSE_DB_HOST: database
DISCOURSE_DB_NAME: discourse
DISCOURSE_DB_USERNAME: discourse
DISCOURSE_DB_PASSWORD: {{discourse_database_password}}
DISCOURSE_REDIS_HOST: redis
ports:
- "127.0.0.1:{{http_port}}:80"
database:
image: postgres:latest
environment:
POSTGRES_DB: discourse
POSTGRES_USER: discourse
POSTGRES_PASSWORD: {{discourse_database_password}}
volumes:
- database:/var/lib/postgresql/data
redis:
image: redis:latest
volumes:
- redis_data:/data
volumes:
database:
data:
redis_data:

View File

@ -0,0 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_instances}}discourse/"

View File

@ -1,2 +1,2 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}funkwhale/" docker_compose_instance_directory: "{{path_docker_compose_instances}}funkwhale/"
client_max_body_size: "512M" nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;"

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}gitea/" docker_compose_instance_directory: "{{path_docker_compose_instances}}gitea/"

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}joomla/" docker_compose_instance_directory: "{{path_docker_compose_instances}}joomla/"

View File

@ -2,7 +2,7 @@
- name: recreate listmonk - name: recreate listmonk
command: command:
cmd: docker-compose -p listmonk up -d --force-recreate cmd: docker-compose -p listmonk up -d --force-recreate
chdir: "{{path_docker_compose_files}}listmonk/" chdir: "{{path_docker_compose_instances}}listmonk/"
environment: environment:
COMPOSE_HTTP_TIMEOUT: 600 COMPOSE_HTTP_TIMEOUT: 600
DOCKER_CLIENT_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}listmonk/" docker_compose_instance_directory: "{{path_docker_compose_instances}}listmonk/"

View File

@ -2,11 +2,11 @@
- name: "include tasks nginx-docker-proxy-domain.yml" - name: "include tasks nginx-docker-proxy-domain.yml"
include_tasks: nginx-docker-proxy-domain.yml include_tasks: nginx-docker-proxy-domain.yml
vars: vars:
client_max_body_size: "31M" nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 31M;"
- name: "create {{path_docker_compose_files}}mailu" - name: "create {{path_docker_compose_instances}}mailu"
file: file:
path: "{{path_docker_compose_files}}mailu" path: "{{path_docker_compose_instances}}mailu"
state: directory state: directory
mode: 0755 mode: 0755

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}mailu/" docker_compose_instance_directory: "{{path_docker_compose_instances}}mailu/"

View File

@ -5,11 +5,11 @@
``` ```
## cleanup ## cleanup
```bash ```bash
cd {{path_docker_compose_files}}mastodon/ cd {{path_docker_compose_instances}}mastodon/
docker-compose down docker-compose down
docker volume rm mastodon_data mastodon_database mastodon_redis docker volume rm mastodon_data mastodon_database mastodon_redis
cd {{path_docker_compose_files}} && cd {{path_docker_compose_instances}} &&
rm -vR {{path_docker_compose_files}}mastodon rm -vR {{path_docker_compose_instances}}mastodon
``` ```
## access terminal ## access terminal

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}mastodon/" docker_compose_instance_directory: "{{path_docker_compose_instances}}mastodon/"

View File

@ -12,7 +12,7 @@ This Ansible role deploys a Matomo analytics platform instance using Docker.
- `domain`: The domain where Matomo will be accessible. - `domain`: The domain where Matomo will be accessible.
- `administrator_email`: The email used for SSL certificate registration. - `administrator_email`: The email used for SSL certificate registration.
- `path_docker_compose_files`: Path to store Docker Compose files. - `path_docker_compose_instances`: Path to store Docker Compose files.
- `http_port`: The host port that Matomo will be accessible on. - `http_port`: The host port that Matomo will be accessible on.
- `matomo_database_password`: Password for the Matomo database. - `matomo_database_password`: Password for the Matomo database.

View File

@ -1,2 +1,2 @@
--- ---
docker_compose_instance_directory: "{{path_docker_compose_files}}matomo/" docker_compose_instance_directory: "{{path_docker_compose_instances}}matomo/"

View File

@ -3,26 +3,61 @@
## Dependencies ## Dependencies
- nginx-docker-reverse-proxy - nginx-docker-reverse-proxy
## Variables
- `docker_compose_instance_directory`: The directory where Docker Compose files for MyBB are stored.
- `conf_d_docker_directory`: Directory for Docker Nginx configuration.
- `default_conf_server_file`: The default Nginx configuration file for the server.
- `conf_d_server_directory`: The Nginx server's configuration directory.
## Tasks
1. **Domain Certificate Retrieval:** Automates the process of obtaining SSL certificates for the specified domain using Certbot.
2. **Nginx Configuration:** Handles the configuration of Nginx for the MyBB domain.
3. **Directory Creation:** Ensures the creation of necessary directories including parent directories as required.
4. **MyBB and Nginx Configuration:** Manages the configuration for MyBB and Nginx, including setting up the `default.conf` file.
5. **Docker Compose Setup:** Adds and manages the `docker-compose.yml` file necessary for running MyBB with Docker.
## Usage ## Usage
### Install Plugins ### Multi Domain Installation
To install MyBB plugins, extract them to a mounted volume and sync using the provided `docker run` command If you want to access your mybb over multiple domains, keep the following in mind:
- Set Cookie Domain to nothing
- Access mybb for installation via mybb.<top_domain>
- Set the Board Url to mybb.<top_domain>
### Manual Installation of MyBB Plugins
This guide describes the process of manually installing MyBB plugins in your Docker-MyBB environment. This can be useful if you want to quickly test plugins or do not wish to execute the Ansible role.
#### Steps for Manual Installation
1. **Prepare Plugin Files:**
- Download the desired MyBB plugin zip files.
2. **Copy plugin to host:**
- ```bash scp <plugin> administrator@<server>:/home/administrator/docker-compose/mybb/plugins```
3. **Unzip Plugin Files on the Host:**
- Unzip the plugin zip files in the host's plugin directory:
```bash ```bash
docker run --rm -v mybb-data:/target/ -v /mnt/:/origin/ "kevinveenbirkenbach/alpine-rsync" sh -c "rsync -avv /origin/inc/plugins/ /target/" unzip /home/administrator/docker-compose/mybb/plugins/<plugin-file>.zip -d /home/administrator/docker-compose/mybb/plugins/
``` ```
- Replace `<plugin-file>.zip` with the name of the plugin zip file.
- Repeat this step for each plugin.
4. **Access the Docker Container:**
- Open a terminal or SSH session on the server where the Docker container is running.
5. **Copy Unzipped Plugin Files to the Container:**
- Copy the unzipped plugin files from the host directory to the Docker container:
```bash
docker compose cp /home/administrator/docker-compose/mybb/plugins/<unzipped-plugin-folder> application:/var/www/html/inc/plugins/
```
- Replace `<unzipped-plugin-folder>` with the name of the unzipped plugin folder.
6. **Restart the Container:**
- Execute the following command to restart the MyBB container:
```bash
docker-compose -p mybb up -d --force-recreate
```
- This ensures all changes take effect.
7. **Activate Plugins in the MyBB Admin Panel:**
- Open the MyBB admin panel in your web browser.
- Navigate to the plugin settings and activate the newly installed plugins.
#### Important Notes
- Ensure you use the correct paths and filenames.
- Do not forget to regularly back up your MyBB database and files before making changes.
- If encountering issues, refer to the MyBB documentation or specific instructions from the plugin author.
### Running the Role ### Running the Role
Execute the Ansible playbook containing this role to set up MyBB in a Docker environment. Execute the Ansible playbook containing this role to set up MyBB in a Docker environment.

View File

@ -1,21 +1,21 @@
--- ---
- name: "include tasks nginx-docker-proxy-domain.yml" - name: "include tasks mybb-proxy-domain.yml"
include_tasks: nginx-docker-proxy-domain.yml include_tasks: mybb-proxy-domain.yml
loop: "{{ domains }}" loop: "{{ domains + [mybb_main_domain] }}"
loop_control: loop_control:
loop_var: domain loop_var: domain
- name: "create {{conf_d_server_directory}} and parent directories" - name: "create {{docker_compose_instance_confd_directory}} and parent directories"
file: file:
path: "{{conf_d_server_directory}}" path: "{{docker_compose_instance_confd_directory}}"
state: directory state: directory
mode: 0755 mode: 0755
recurse: yes recurse: yes
- name: "create {{default_conf_server_file}}" - name: "create {{docker_compose_instance_confd_defaultconf_file}}"
template: template:
src: "default.conf" src: "default.conf"
dest: "{{default_conf_server_file}}" dest: "{{docker_compose_instance_confd_defaultconf_file}}"
notify: recreate mybb notify: recreate mybb
- name: add docker-compose.yml - name: add docker-compose.yml

View File

@ -0,0 +1,7 @@
- name: "include task certbot-matomo.yml"
include_tasks: certbot-matomo.yml
- name: "include task create-domain-conf.yml"
include_tasks: create-domain-conf.yml
vars:
nginx_docker_reverse_proxy_extra_configuration: "sub_filter '{{mybb_main_domain}}' '{{domain}}';"

View File

@ -7,7 +7,6 @@ server {
error_log stderr debug; error_log stderr debug;
root /var/www/html; root /var/www/html;
index index.html index.php; index index.html index.php;
worker_processes auto;
location / { location / {
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
@ -30,13 +29,6 @@ server {
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
# client timeout
keepalive_timeout 60s;
client_header_timeout 60s;
client_body_timeout 60s;
send_timeout 300s;
reset_timedout_connection on;
# proxy timeouts # proxy timeouts
proxy_connect_timeout 300s; proxy_connect_timeout 300s;
proxy_send_timeout 300s; proxy_send_timeout 300s;

View File

@ -23,7 +23,7 @@ services:
ports: ports:
- "127.0.0.1:{{http_port}}:80" - "127.0.0.1:{{http_port}}:80"
volumes: volumes:
- "{{conf_d_server_directory}}:{{conf_d_docker_directory}}:ro" - "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
- "data:/var/www/html:ro" - "data:/var/www/html:ro"
database: database:
logging: logging:
@ -36,7 +36,7 @@ services:
POSTGRES_USER: mybb POSTGRES_USER: mybb
image: postgres:14-alpine image: postgres:14-alpine
volumes: volumes:
- ${PWD}/postgres/data:/var/lib/postgresql/data:rw - database:/var/lib/postgresql/data:rw
restart: always restart: always
volumes: volumes:
database: database:

View File

@ -1,5 +1,6 @@
--- ---
docker_compose_instance_directory: "{{path_docker_compose_files}}mybb/" docker_compose_instance_directory: "{{path_docker_compose_instances}}mybb/"
conf_d_server_directory: "{{docker_compose_instance_directory}}conf.d/" docker_compose_instance_confd_directory: "{{docker_compose_instance_directory}}conf.d/"
default_conf_server_file: "{{conf_d_docker_directory}}default.conf" docker_compose_instance_confd_defaultconf_file: "{{docker_compose_instance_confd_directory}}default.conf"
conf_d_docker_directory: "/etc/nginx/conf.d/" target_mount_conf_d_directory: "/etc/nginx/conf.d/"
mybb_main_domain: "mybb.{{top_domain}}"

View File

@ -57,7 +57,7 @@ and disable the not functioning apps.
## recover latest backup ## recover latest backup
```bash ```bash
cd {{path_docker_compose_files}}nextcloud && cd {{path_docker_compose_instances}}nextcloud &&
docker-compose down && docker-compose down &&
docker-compose exec -i database mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/backup-docker-to-local/latest/nextcloud_database/sql/backup.sql" && docker-compose exec -i database mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/backup-docker-to-local/latest/nextcloud_database/sql/backup.sql" &&
cd {{path_administrator_scripts}}backup-docker-to-local && cd {{path_administrator_scripts}}backup-docker-to-local &&

View File

@ -1,2 +1,2 @@
--- ---
docker_compose_instance_directory: "{{path_docker_compose_files}}nextcloud/" docker_compose_instance_directory: "{{path_docker_compose_instances}}nextcloud/"

View File

@ -7,7 +7,7 @@ watch -n 2 "docker ps -a | grep peertube"
## clean rebuild ## clean rebuild
```bash ```bash
cd {{path_docker_compose_files}}peertube/ && cd {{path_docker_compose_instances}}peertube/ &&
docker-compose down docker-compose down
docker volume rm peertube_assets peertube_config peertube_data peertube_database peertube_redis docker volume rm peertube_assets peertube_config peertube_data peertube_database peertube_redis
docker-compose up -d docker-compose up -d

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}peertube/" docker_compose_instance_directory: "{{path_docker_compose_instances}}peertube/"

View File

@ -49,7 +49,7 @@ docker volume rm pixelfed_application_data pixelfed_database pixelfed_redis_data
To update your Pixelfed instance, navigate to the directory where your `docker-compose.yml` file is located and run these commands: To update your Pixelfed instance, navigate to the directory where your `docker-compose.yml` file is located and run these commands:
```bash ```bash
cd {{path_docker_compose_files}}pixelfed/ && cd {{path_docker_compose_instances}}pixelfed/ &&
docker-compose down && docker-compose down &&
docker network prune -f && docker network prune -f &&
docker-compose pull && docker-compose pull &&

View File

@ -2,7 +2,7 @@
- name: recreate pixelfed - name: recreate pixelfed
command: command:
cmd: docker-compose -p pixelfed up -d --force-recreate cmd: docker-compose -p pixelfed up -d --force-recreate
chdir: "{{path_docker_compose_files}}pixelfed/" chdir: "{{path_docker_compose_instances}}pixelfed/"
environment: environment:
COMPOSE_HTTP_TIMEOUT: 600 COMPOSE_HTTP_TIMEOUT: 600
DOCKER_CLIENT_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600

View File

@ -1,2 +1,2 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}pixelfed/" docker_compose_instance_directory: "{{path_docker_compose_instances}}pixelfed/"
client_max_body_size: "512M" nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;"

View File

@ -1,2 +1,2 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}roulette-wheel/" docker_compose_instance_directory: "{{path_docker_compose_instances}}roulette-wheel/"
app_path: "{{path_docker_compose_files}}roulette-wheel/app/" app_path: "{{path_docker_compose_instances}}roulette-wheel/app/"

View File

@ -6,7 +6,7 @@
loop_control: loop_control:
loop_var: domain loop_var: domain
vars: vars:
client_max_body_size: "{{wordpress_max_upload_size}}" nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size {{wordpress_max_upload_size}};"
- name: "create {{docker_compose_instance_directory}}" - name: "create {{docker_compose_instance_directory}}"
file: file:

View File

@ -1,2 +1,2 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}wordpress/" docker_compose_instance_directory: "{{path_docker_compose_instances}}wordpress/"
wordpress_max_upload_size: "64M" wordpress_max_upload_size: "64M"

View File

@ -1 +1 @@
docker_compose_instance_directory: "{{path_docker_compose_files}}yourls/" docker_compose_instance_directory: "{{path_docker_compose_instances}}yourls/"

View File

@ -6,9 +6,9 @@
state: present state: present
notify: docker restart notify: docker restart
- name: "create {{path_docker_compose_files}}" - name: "create {{path_docker_compose_instances}}"
file: file:
path: "{{path_docker_compose_files}}" path: "{{path_docker_compose_instances}}"
state: directory state: directory
mode: 0700 mode: 0700
owner: administrator owner: administrator

View File

@ -2,13 +2,14 @@ server
{ {
server_name {{domain}}; server_name {{domain}};
# Include Matomo Tracking Code
{% if nginx_matomo_tracking_active | default(False) %} {% if nginx_matomo_tracking_active | default(False) %}
{% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %} {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
{% endif %} {% endif %}
# Additional Domain Specific Configuration
{% if client_max_body_size is defined %} {% if nginx_docker_reverse_proxy_extra_configuration is defined %}
client_max_body_size {{ client_max_body_size }}; {{nginx_docker_reverse_proxy_extra_configuration}}
{% endif %} {% endif %}
{% include 'roles/letsencrypt/templates/ssl_header.j2' %} {% include 'roles/letsencrypt/templates/ssl_header.j2' %}

View File

@ -4,4 +4,4 @@ OnFailure=systemd-notifier@%n.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{path_docker_compose_files}}' ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{path_docker_compose_instances}}'

View File

@ -1,7 +1,7 @@
--- ---
- name: "Check if {{ path_docker_compose_files }} directory exists" - name: "Check if {{ path_docker_compose_instances }} directory exists"
stat: stat:
path: "{{ path_docker_compose_files }}" path: "{{ path_docker_compose_instances }}"
register: docker_compose_directory_stat register: docker_compose_directory_stat
- name: "Update with pacman" - name: "Update with pacman"