diff --git a/Makefile b/Makefile index c5aab5d..38d8e39 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ STAGE := vagrant ifeq ($(STAGE), prod) ANSIBLE_HOST_KEY_CHECKING := True INVENTORY := ansible/hosts_prod - USER_ARGS := --user="av" --ask-become-pass + USER_ARGS := --user="root" else ANSIBLE_HOST_KEY_CHECKING := False INVENTORY := ansible/hosts_vagrant @@ -34,8 +34,8 @@ configure: --extra-vars='ansible_python_interpreter=/usr/bin/python3' \ $(PLAYBOOK) -configure-env: - $(MAKE) configure TAGS="env" +configure-apps: + $(MAKE) configure TAGS="webserver,apps,env" dry-run: ANSIBLE_HOST_KEY_CHECKING=$(ANSIBLE_HOST_KEY_CHECKING) \ diff --git a/ansible/hosts_prod b/ansible/hosts_prod index c645c7c..e27a785 100644 --- a/ansible/hosts_prod +++ b/ansible/hosts_prod @@ -1 +1 @@ -188.225.75.67 +92.53.119.18 diff --git a/ansible/templates/Caddyfile.j2 b/ansible/templates/Caddyfile.j2 index 4363c0b..ef8c30e 100644 --- a/ansible/templates/Caddyfile.j2 +++ b/ansible/templates/Caddyfile.j2 @@ -1,11 +1,21 @@ # NetData proxy -:29999 { +status.vakhrushev.me { proxy / 127.0.0.1:19999 { transparent } + + tls anwinged@ya.ru + basicauth / anton show-me-the-status } # Homepage -:80 { +homepage.vakhrushev.me, vakhrushev.me { root /var/www/homepage/current + + tls anwinged@ya.ru + gzip + + errors { + 404 404/index.html + } }