Fix merge conflicts

docs/applications/joomla.md

@@ -0,0 +1,13 @@
+# Joomla CMS
+
+Bitwarden: [https://bitwarden.com/](https://bitwarden.com/)
+
+This is a Joomla package
+
+## Usage
+
+Set `joomla_enabled: true` in your `group_vars/all.yml` file.
+
+## Specific Configuration
+
+Make sure you you change te MySQL passwords!

group_vars/all.yml.dist

@@ -10,6 +10,10 @@
 # settings.
 traefik_enabled: false
 
+# Joomla
+joomla_enabled: false
+
+
 # Downloading
 # If you plan to use Transmission with OpenVPN, you'll need to copy group_vars/vpn_credentials.yml.dist
 # to group_vars/vpn_credentials.yml, then update it with your own settings.
@@ -319,8 +323,16 @@ transmission_watch_directory: "{{ torrents_root }}"
 transmission_user_id: 0
 transmission_group_id: 0
 transmission_local_network: "192.168.1.0/24"
-
+### Joomla
 ###
+### for security, change the MySQL passwords
+mysql_root_password: changeme
+mysql_password: changeme
+joomla_available_externally: "false"
+###
+
+
+=======
 ### pyLoad
 ###
 pyload_available_externally: "false"
@@ -329,6 +341,7 @@ pyload_download_directory: "{{ downloads_root }}"
 pyload_user_id: 0
 pyload_group_id: 0
 
+
 ###
 ### Plex
 ###

nas.yml

@@ -156,6 +156,10 @@
     when: (jackett_enabled | default(False))
     tags: jackett
 
+  - import_tasks: tasks/joomla.yml
+    when: (joomla_enabled | default(False))
+    tags: joomla
+
   - import_tasks: tasks/bitwarden.yml
     when: (bitwarden_enabled | default(False))
     tags: bitwarden

tasks/joomla.yml

@@ -0,0 +1,52 @@
+---
+- name: Create Joomla Directories
+  file:
+    path: "{{ item }}"
+    state: directory
+    # mode: 0755
+  with_items:
+    - "{{ docker_home }}/joomla"
+
+- name: Create MySQL Directorys for Joomla
+  file:
+    path: "{{ item }}"
+    state: directory
+    # mode: 0755
+  with_items:
+    - "{{ docker_home }}/JoomlaDB"
+
+- name: MySQL Docker Container for Joomla
+  docker_container:
+    name: mysql_joomla
+    image: mysql
+    pull: true
+    volumes:
+      - "{{ docker_home }}/JoomlaDB:/var/lib/mysql"
+    env:
+      MYSQL_DATABASE: joomla
+      MYSQL_USER: joomla
+      MYSQL_PASSWORD: "{{ mysql_password }}"
+      MYSQL_ROOT_PASSWORD: "{{ mysql_root_password }}"
+    restart_policy: unless-stopped
+    memory: 1g
+
+- name: joomla Docker Container
+  docker_container:
+    name: joomla
+    image: joomla
+    pull: true
+    volumes:
+      - "{{ docker_home }}/joomla:/var/www/html:rw"
+    ports:
+      - "8181:80"
+    links:
+      - "mysql_joomla:mysql_joomla"
+    env:
+      JOOMLA_DB_PASSWORD: "{{ mysql_root_password }}"
+    restart_policy: unless-stopped
+    memory: 1g
+    labels:
+      traefik.backend: "joomla"
+      traefik.frontend.rule: "Host: joomla.{{ ansible_nas_domain }}"
+      traefik.enable: "{{ joomla_available_externally }}"
+      traefik.port: "80"

templates/traefik/traefik.toml

@@ -195,6 +195,7 @@ onDemand = false # create certificate when container is created
           "homeassistant.{{ ansible_nas_domain }}",
           "jackett.{{ ansible_nas_domain }}",
           "jellyfin.{{ ansible_nas_domain }}",
+          "joomla.{{ ansible_nas_domain }}",
           "miniflux.{{ ansible_nas_domain }}",
           "netdata.{{ ansible_nas_domain }}",
           "nextcloud.{{ ansible_nas_domain }}",