diff --git a/ansible/inventory/host_vars/manager.yml b/ansible/inventory/host_vars/manager.yml index 3414360..1d3628d 100644 --- a/ansible/inventory/host_vars/manager.yml +++ b/ansible/inventory/host_vars/manager.yml @@ -21,5 +21,4 @@ docker_node_labels: private: "true" seafile: "true" freshrss: "true" - nextcloud: "true" pihole: "true" diff --git a/ansible/roles/shephard/docker-stack.yml b/ansible/roles/shephard/docker-stack.yml.j2 similarity index 74% rename from ansible/roles/shephard/docker-stack.yml rename to ansible/roles/shephard/docker-stack.yml.j2 index 80261d2..832cf0e 100644 --- a/ansible/roles/shephard/docker-stack.yml +++ b/ansible/roles/shephard/docker-stack.yml.j2 @@ -1,13 +1,19 @@ version: "3" +networks: + shephard: + services: app: image: mazzolino/shepherd + networks: + - shephard environment: TZ: 'Europe/Amsterdam' FILTER_SERVICES: '' IGNORELIST_SERVICES: "" RUN_ONCE_AND_EXIT: "true" + APPRISE_SIDECAR_URL: apprise:5000 volumes: - type: bind source: /var/run/docker.sock @@ -40,3 +46,14 @@ services: placement: constraints: - node.role == manager + + apprise: + image: mazzolino/apprise-microservice:0.1 + environment: + NOTIFICATION_URLS: {{ apprise_urls }} + networks: + - shephard + deploy: + placement: + constraints: + - node.role == manager diff --git a/ansible/roles/shephard/tasks/main.yml b/ansible/roles/shephard/tasks/main.yml index 15d9626..817ebf0 100644 --- a/ansible/roles/shephard/tasks/main.yml +++ b/ansible/roles/shephard/tasks/main.yml @@ -4,8 +4,8 @@ state: directory - name: Copy Docker stack file - copy: - src: "{{ role_path }}/docker-stack.yml" + template: + src: "{{ role_path }}/docker-stack.yml.j2" dest: /srv/shephard/docker-stack.yml - name: Deploy Docker stack diff --git a/ansible/roles/shephard/vars/main.yml b/ansible/roles/shephard/vars/main.yml new file mode 100644 index 0000000..e77fa39 --- /dev/null +++ b/ansible/roles/shephard/vars/main.yml @@ -0,0 +1,15 @@ +apprise_urls: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 61373834303235326432636436363162376430376535623838306432343161376135386332363363 + 3765343762393734636637653331653736616562653466320a353637646533343538636638623761 + 34323137613136353530336663333261313263383439363663373466363634326239613236376338 + 3638616132376261370a633038653861323931306164663934313265623265316231316435306639 + 39386464363337356632323166333736343430356563636261326230393039613034666131663435 + 62326338306561376162393863346361353739626238656663633466653030613935323335626266 + 39656439666536396536663639393332663039633365636236646433373965333339363638643431 + 35366161633437623062373961633662313665643062396430323434346233356163326634373438 + 63346232313466343262623135356663353861383065643566393538336464383930393864636336 + 64336139316261613865376234626164646261623530303138363934353462653562383331356430 + 35366138333066353530326166663230616337333135363938623965313337343931323632623734 + 39646630376662353033653032303865333162363137656666366336636238306566323165316633 + 6364 diff --git a/ansible/roles/traefik/docker-stack.yml.j2 b/ansible/roles/traefik/docker-stack.yml similarity index 100% rename from ansible/roles/traefik/docker-stack.yml.j2 rename to ansible/roles/traefik/docker-stack.yml diff --git a/ansible/roles/traefik/tasks/main.yml b/ansible/roles/traefik/tasks/main.yml index 88415d4..146e0a4 100644 --- a/ansible/roles/traefik/tasks/main.yml +++ b/ansible/roles/traefik/tasks/main.yml @@ -19,8 +19,8 @@ state: directory - name: Copy Docker stack file - template: - src: "{{ role_path }}/docker-stack.yml.j2" + copy: + src: "{{ role_path }}/docker-stack.yml" dest: /srv/traefik/docker-stack.yml - name: Deploy Docker stack