diff --git a/dockerapps.yml b/dockerapps.yml index 1e0040f..a1deee5 100644 --- a/dockerapps.yml +++ b/dockerapps.yml @@ -73,76 +73,75 @@ - docker-compose - bootstrap_dockerapp_configure_docker_compose + # - name: Run `docker-compose pull` + # community.docker.docker_compose: + # project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" + # pull: true + # tags: + # - pull - - name: Run `docker-compose pull` - community.docker.docker_compose: - project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" - pull: true - tags: - - pull + # - name: Run `docker-compose up` + # community.docker.docker_compose: + # project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" + # build: false + # tags: + # - pull - - name: Run `docker-compose up` - community.docker.docker_compose: - project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" - build: false - tags: - - pull + # - name: uncomment acme.caserver line + # ansible.builtin.lineinfile: + # path: /etc/sudoers + # state: absent + # regexp: '^%wheel' + # tags: + # - renew-httos - - name: uncomment acme.caserver line - ansible.builtin.lineinfile: - path: /etc/sudoers - state: absent - regexp: '^%wheel' - tags: - - renew-httos + # - name: remove appdata/traefik2/acme/letsencrypt/acme.json file + # file: + # path: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/appdata/traefik2/acme/letsencrypt/acme.json" + # state: absent + # tags: + # - renew-https - - name: remove appdata/traefik2/acme/letsencrypt/acme.json file - file: - path: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/appdata/traefik2/acme/letsencrypt/acme.json" - state: absent - tags: - - renew-https + # - name: Run `docker-compose down` + # community.docker.docker_compose: + # project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" + # state: absent + # tags: + # - renew-https - - name: Run `docker-compose down` - community.docker.docker_compose: - project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" - state: absent - tags: - - renew-https + # - name: Run `docker-compose up` + # community.docker.docker_compose: + # project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" + # build: false + # tags: + # - renew-https - - name: Run `docker-compose up` - community.docker.docker_compose: - project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" - build: false - tags: - - renew-https + # - name: Wait 5 minutes for news cert/key on acme.json (stagging) + # pause: + # seconds: 300 + # tags: + # - renew-https - - name: Wait 5 minutes for news cert/key on acme.json (stagging) - pause: - seconds: 300 - tags: - - renew-https + # - name: comment acme.caserver line + # ansible.builtin.lineinfile: + # path: /etc/sudoers + # state: absent + # regexp: '^%wheel' + # tags: + # - renew-https - - name: comment acme.caserver line - ansible.builtin.lineinfile: - path: /etc/sudoers - state: absent - regexp: '^%wheel' - tags: - - renew-https + # - name: remove appdata/traefik2/acme/letsencrypt/acme.json file + # file: + # path: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/appdata/traefik2/acme/letsencrypt/acme.json" + # state: absent + # tags: + # - renew-https - - name: remove appdata/traefik2/acme/letsencrypt/acme.json file - file: - path: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/appdata/traefik2/acme/letsencrypt/acme.json" - state: absent - tags: - - renew-https - - - name: Run `docker-compose restart traefik` - community.docker.docker_compose: - project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" - restarted: true - services: - - traefik - tags: - - renew-https \ No newline at end of file + # - name: Run `docker-compose restart traefik` + # community.docker.docker_compose: + # project_src: "{{ dockerapp_tree_base_dir | last }}/{{ dockerapp_service }}/docker-compose.yml" + # restarted: true + # services: + # - traefik + # tags: + # - renew-https \ No newline at end of file diff --git a/host_vars/scaleway_fr.yml b/host_vars/scaleway_fr.yml index 9c50616..79601c1 100644 --- a/host_vars/scaleway_fr.yml +++ b/host_vars/scaleway_fr.yml @@ -152,8 +152,7 @@ logrotate_scripts: # - postrotate: docker-compose restart grafana - name: dockerapps-backup paths: - - /opt/dockerapps/backup/gitea-dump-*.zip - - /opt/dockerapps/vaultwarden/backup/*.gpg + - /opt/dockerapps/backup/gitea-dump-*.zip.1.gz - /opt/dockerapps/vaultwarden/backup/*gpg.1.gz options: - rotate 6 @@ -215,30 +214,47 @@ dockerapp_tree_volumes: - ara #BLACKBOX - blackbox + - blackbox/config #GIT - gitea + - gitea/gitea + - gitea/db #GRAF - grafana + - grafana/etc + - grafana/lib #HOMARR - homarr + - homarr/configs + - homarr/icons #HOME - homepage + - homepage/homepage + - homepage/icons #MEALIE - mealie #PORT - portainer #PROM - prometheus + - prometheus/prometheus + - prometheus/prometheus_data #REGISTRY - registry + - registry/data #SEMA - semaphore #TRAF - traefik2 + - traefik2/acme + - traefik2/rules #VAULT - vaultwarden #WIRE - wireguard + - wireguard/config + - wireguard/lib + - wireguard/lib/modules dockerapp_tree_base_dir: - "/opt/" @@ -248,7 +264,6 @@ pip_executable: pip3 pip_install_packages: - docker-compose - dockerapp_compose: version: "3.9" ######### IMPORTANT #############