From a03de1ebdf0938ca35d4d6bb39abe6afe77ba98b Mon Sep 17 00:00:00 2001 From: Arya Kiran Date: Thu, 20 Apr 2023 09:12:25 +0530 Subject: [PATCH] new per-host caddy extras file --- compose/scribe/compose.yml | 17 -------------- compose/teddit/docker-compose.yml | 37 ------------------------------- inventory.yml | 3 +++ playbooks/caddy.yaml | 7 +++++- templates/1-extras.caddy | 1 + templates/2-extras.caddy | 1 + templates/3-extras.caddy | 1 + 7 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 compose/scribe/compose.yml delete mode 100644 compose/teddit/docker-compose.yml create mode 100644 templates/1-extras.caddy create mode 100644 templates/2-extras.caddy create mode 100644 templates/3-extras.caddy diff --git a/compose/scribe/compose.yml b/compose/scribe/compose.yml deleted file mode 100644 index ea1f6d7..0000000 --- a/compose/scribe/compose.yml +++ /dev/null @@ -1,17 +0,0 @@ - -version: "3.8" - -services: - scribe: - image: registry.gitlab.com/lomanic/scribe-binaries:latest - restart: always - container_name: "scribe" - ports: - - 127.0.0.1:6265:8006 - environment: - - SCRIBE_PORT=8006 - - SCRIBE_HOST=0.0.0.0 - - APP_DOMAIN=scribe.projectsegfau.lt - - LUCKY_ENV=production - - PORT=8006 - - SECRET_KEY_BASE=uVN1eX+RQu7HVuIC0IoPonoy9Lk4rdNV0byjHjzo76M= diff --git a/compose/teddit/docker-compose.yml b/compose/teddit/docker-compose.yml deleted file mode 100644 index 30a354a..0000000 --- a/compose/teddit/docker-compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: "3.8" - -services: - - teddit: - container_name: teddit - image: teddit/teddit:latest - environment: - - DOMAIN=teddit.projectsegfau.lt - - USE_HELMET=true - - USE_HELMET_HSTS=true - - TRUST_PROXY=true - - REDIS_HOST=teddit-redis - ports: - - "127.0.0.1:6974:8080" - networks: - - teddit_net - healthcheck: - test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost:8080/about"] - interval: 1m - timeout: 3s - depends_on: - - teddit-redis - restart: always - - teddit-redis: - container_name: teddit-redis - image: redis:6.2.5-alpine - command: redis-server - environment: - - REDIS_REPLICATION_MODE=master - networks: - - teddit_net - restart: always - -networks: - teddit_net: diff --git a/inventory.yml b/inventory.yml index 1c78eef..d00085c 100644 --- a/inventory.yml +++ b/inventory.yml @@ -4,12 +4,15 @@ ansibletest: ansible_host: in.projectsegfau.lt ansible_user: root ansible_port: 6945 + caddy_extras_config: templates/1-extras.caddy ansible02: ansible_host: in.projectsegfau.lt ansible_user: root ansible_port: 6946 + caddy_extras_config: templates/2-extras.caddy ansible03: ansible_host: in.projectsegfau.lt ansible_user: root ansible_port: 6947 + caddy_extras_config: templates/3-extras.caddy diff --git a/playbooks/caddy.yaml b/playbooks/caddy.yaml index dccdcec..ab16788 100644 --- a/playbooks/caddy.yaml +++ b/playbooks/caddy.yaml @@ -1,5 +1,5 @@ --- -- hosts: all +- hosts: ansibletest roles: - role: caddy_ansible.caddy_ansible caddy_systemd_capabilities_enabled: true @@ -8,3 +8,8 @@ caddy_home: "/var/lib/caddy" # Static weekly builds of caddy with rfc2136 caddy_url_base: "https://cb.projectsegfau.lt/api/download" + tasks: + - name: Copy per-server caddy extras + ansible.builtin.copy: + src: "../{{ caddy_extras_config }}" + dest: /etc/caddy/extras.caddy diff --git a/templates/1-extras.caddy b/templates/1-extras.caddy new file mode 100644 index 0000000..5f094ef --- /dev/null +++ b/templates/1-extras.caddy @@ -0,0 +1 @@ +Some shit ansible01 diff --git a/templates/2-extras.caddy b/templates/2-extras.caddy new file mode 100644 index 0000000..7aaeeea --- /dev/null +++ b/templates/2-extras.caddy @@ -0,0 +1 @@ +Some more shit ansible02 diff --git a/templates/3-extras.caddy b/templates/3-extras.caddy new file mode 100644 index 0000000..a680eea --- /dev/null +++ b/templates/3-extras.caddy @@ -0,0 +1 @@ +Some more more shit ansible03