testing

dev/dockerbox.yml

@@ -5,11 +5,9 @@
     - host_vars/dockerbox.yml
   roles:
     - base
-    - proxy
     - docker
-    - mariadb
     - traefik
     - nextcloud
-    # - jenkins
+    - jenkins
-    # - prometheus
+    - prometheus
-    # - nginx
+    - nginx

dev/host_vars/dockerbox.yml

@@ -2,60 +2,29 @@
 allow_reboot: false
 manage_network: false
 
-# Import my GPG key for git signature verification
-root_gpgkeys:
-  - name: kris@lamoureux.io
-    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-
-# proxy
-proxy:
-  servers:
-    - domain: cloud.local.krislamo.org
-      proxy_pass: http://127.0.0.1:8000
-
 # docker
-docker_official: true # docker's apt repos
 docker_users:
   - vagrant
 
-docker_compose_env_nolog: false # dev only setting
-docker_compose_deploy:
-  # Traefik
-  - name: traefik
-    url: https://github.com/krislamo/traefik
-    version: e03268af4cf942c47cba66c2112628dbcad1b756
-    path: docker-compose.web.yml
-    enabled: true
-    accept_newhostkey: true
-    trusted_keys:
-      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
-    env:
-      ENABLE: true
-  # Nextcloud
-  - name: nextcloud
-    url: https://git.krislamo.org/kris/nextcloud
-    version: a2e38cec703839211e11dc8347b4cdd62fa6f24d
-    env:
-      DATA: ./data
-
 # traefik
-traefik:
+traefik_version: latest
-  ENABLE: true
+traefik_dashboard: true
+traefik_domain: traefik.local.krislamo.org
+traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
+traefik_web_entry: 0.0.0.0:80
+traefik_websecure_entry: 0.0.0.0:443
+#traefik_acme_email: realemail@example.com # Let's Encrypt settings
+#traefik_production: true
+#traefik_http_only: true # if behind reverse-proxy
 
 # nextcloud
-nextcloud:
+nextcloud_version: stable
-  DB_NAME: nextcloud
+nextcloud_admin: admin
-  DB_USER: nextcloud
+nextcloud_pass: password
-  DB_PASSWD: password
+nextcloud_domain: cloud.local.krislamo.org
 
-# nextcloud
+nextcloud_dbversion: latest
-#nextcloud_version: stable
+nextcloud_dbpass: password
-#nextcloud_admin: admin
-#nextcloud_pass: password
-#nextcloud_domain: cloud.local.krislamo.org
-
-#nextcloud_dbversion: latest
-#nextcloud_dbpass: password
 
 # jenkins
 jenkins_version: lts

forward-ssh.sh

@@ -28,7 +28,6 @@ fi
 
 # Clean environment
 unset PRIVATE_KEY
-unset HOST_IP
 unset MATCH_PATTERN
 unset PKILL_ANSWER
 
@@ -78,12 +77,17 @@ else
 fi
 
 # Grab first IP or use whatever HOST_IP_FIELD is set to and check that the guest is up
-HOST_IP="$(sudo -u "$SUDO_USER" vagrant ssh -c "hostname -I | cut -d' ' -f${HOST_IP_FIELD:-1}" "${1:-default}" 2>/dev/null)"
 if [ -z "$HOST_IP" ]; then
-  echo "[ERROR]: Failed to find ${1:-default}'s IP"
+  HOST_IP="$(sudo -u "$SUDO_USER" vagrant ssh -c "hostname -I | cut -d' ' -f${HOST_IP_FIELD:-1}" "${1:-default}" 2>/dev/null)"
-  exit 1
+
+  if [ -z "$HOST_IP" ]; then
+    echo "[ERROR]: Failed to find ${1:-default}'s IP"
+    exit 1
+  fi
+  HOST_IP="${HOST_IP::-1}" # trim
+else
+  echo "[INFO]: HOST_IP configured by the shell environment"
 fi
-HOST_IP="${HOST_IP::-1}" # trim
 
 if ! ping -c 1 "$HOST_IP" &>/dev/null; then
   echo "[ERROR]: Cannot ping the host IP '$HOST_IP'"

roles/nextcloud/defaults/main.yml

@@ -1 +1,11 @@
-nextcloud_name: nextcloud
+# container names
+nextcloud_container: nextcloud
+nextcloud_dbcontainer: "{{ nextcloud_container }}-db"
+
+# database settings
+nextcloud_dbname: "{{ nextcloud_container }}"
+nextcloud_dbuser: "{{ nextcloud_dbname }}"
+
+# host mounts
+nextcloud_root: "/opt/{{ nextcloud_container }}/public_html"
+nextcloud_dbroot: "/opt/{{ nextcloud_container }}/database"

roles/nextcloud/tasks/main.yml

@@ -1,54 +1,76 @@
-- name: Install MySQL module for Ansible
+- name: Create Nextcloud network
-  ansible.builtin.apt:
+  community.general.docker_network:
-    name: python3-pymysql
+    name: "{{ nextcloud_container }}"
-    state: present
 
-- name: Create Nextcloud database
+- name: Start Nextcloud's database container
-  community.mysql.mysql_db:
+  community.general.docker_container:
-    name: "{{ nextcloud.DB_NAME }}"
+    name: "{{ nextcloud_dbcontainer }}"
-    state: present
+    image: mariadb:{{ nextcloud_dbversion }}
-    login_unix_socket: /var/run/mysqld/mysqld.sock
-
-- name: Create Nextcloud database user
-  community.mysql.mysql_user:
-    name: "{{ nextcloud.DB_USER }}"
-    password: "{{ nextcloud.DB_PASSWD }}"
-    host: '%'
-    state: present
-    priv: "{{ nextcloud.DB_NAME }}.*:ALL"
-    login_unix_socket: /var/run/mysqld/mysqld.sock
-
-- name: Start Nextcloud service and enable on boot
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ nextcloud_name }}"
     state: started
-    enabled: true
+    restart_policy: always
-  when: nextcloud.ENABLE | default('false')
+    volumes: "{{ nextcloud_dbroot }}:/var/lib/mysql"
+    networks_cli_compatible: true
+    networks:
+      - name: "{{ nextcloud_container }}"
+    env:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"
+      MYSQL_DATABASE: "{{ nextcloud_dbname }}"
+      MYSQL_USER: "{{ nextcloud_dbuser }}"
+      MYSQL_PASSWORD: "{{ nextcloud_dbpass }}"
+
+- name: Start Nextcloud container
+  community.general.docker_container:
+    name: "{{ nextcloud_container }}"
+    image: nextcloud:{{ nextcloud_version }}
+    state: started
+    restart_policy: always
+    volumes: "{{ nextcloud_root }}:/var/www/html"
+    networks_cli_compatible: true
+    networks:
+      - name: "{{ nextcloud_container }}"
+      - name: traefik
+    env:
+      PHP_MEMORY_LIMIT: 1024M
+    labels:
+      traefik.http.routers.nextcloud.rule: "Host(`{{ nextcloud_domain }}`)"
+      traefik.http.routers.nextcloud.entrypoints: websecure
+      traefik.http.routers.nextcloud.tls.certresolver: letsencrypt
+      traefik.http.routers.nextcloud.middlewares: "securehttps@file,nextcloud-webdav"
+      traefik.http.middlewares.nextcloud-webdav.redirectregex.regex: "https://(.*)/.well-known/(card|cal)dav"
+      traefik.http.middlewares.nextcloud-webdav.redirectregex.replacement: "https://${1}/remote.php/dav/"
+      traefik.http.middlewares.nextcloud-webdav.redirectregex.permanent: "true"
+      traefik.docker.network: traefik
+      traefik.enable: "true"
+
+- name: Grab Nextcloud database container information
+  community.general.docker_container_info:
+    name: "{{ nextcloud_dbcontainer }}"
+  register: nextcloud_dbinfo
 
 - name: Grab Nextcloud container information
   community.general.docker_container_info:
-    name: "{{ nextcloud_name }}"
+    name: "{{ nextcloud_container }}"
   register: nextcloud_info
 
 - name: Wait for Nextcloud to become available
   ansible.builtin.wait_for:
-  #debug:
+    host: "{{ nextcloud_info.container.NetworkSettings.Networks.traefik.IPAddress }}"
-    #host: "{{ nextcloud_info.container.NetworkSettings.Networks.traefik.IPAddress }}"
-    #var: nextcloud_info.container.NetworkSettings
     port: 80
 
 - name: Check Nextcloud status
-  ansible.builtin.command: "docker exec --user www-data {{ nextcloud_name }}
+  ansible.builtin.command: "docker exec --user www-data {{ nextcloud_container }}
             php occ status"
   register: nextcloud_status
-  changed_when: false
+  args:
+    removes: "{{ nextcloud_root }}/config/CAN_INSTALL"
 
-- name: Check status return
+- name: Wait for Nextcloud database to become available
-  debug:
+  ansible.builtin.wait_for:
-    var: nextcloud_status.stderr[:26]
+    host: "{{ nextcloud_dbinfo.container.NetworkSettings.Networks.nextcloud.IPAddress }}"
+    port: 3306
 
 - name: Install Nextcloud
-  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_name }}
+  ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}
             php occ maintenance:install
               --database "mysql"
               --database-host "{{ nextcloud_dbcontainer }}"
@@ -58,7 +80,9 @@
               --admin-user "{{ nextcloud_admin }}"
               --admin-pass "{{ nextcloud_pass }}"'
   register: nextcloud_install
-  when: nextcloud_status.stderr[:26] == "Nextcloud is not installed"
+  when:
+    - nextcloud_status.stdout[:26] == "Nextcloud is not installed"
+    - nextcloud_domain is defined
 
 - name: Set Nextcloud's Trusted Proxy
   ansible.builtin.command: 'docker exec --user www-data {{ nextcloud_container }}

roles/traefik/tasks/main.yml

@@ -21,6 +21,20 @@
   loop: "{{ traefik_external }}"
   when: traefik_external is defined
 
+- name: Install Traefik's docker-compose file
+  ansible.builtin.template:
+    src: docker-compose.yml.j2
+    dest: "{{ traefik_root }}/docker-compose.yml"
+    mode: 0400
+  notify: restart_traefik
+
+- name: Install Traefik's docker-compose variables
+  ansible.builtin.template:
+    src: compose-env.j2
+    dest: "{{ traefik_root }}/.env"
+    mode: 0400
+  notify: restart_traefik
+
 - name: Install static Traefik configuration
   ansible.builtin.template:
     src: traefik.yml.j2
@@ -28,9 +42,8 @@
     mode: 0400
   notify: restart_traefik
 
-- name: Start Traefik service and enable on boot
+- name: Start and enable Traefik service
   ansible.builtin.service:
     name: "{{ docker_compose_service }}@{{ traefik_name }}"
     state: started
     enabled: true
-  when: traefik.ENABLED | default('false')