From fcb906f5feddc9838c1a2ae4d6ca43243c711ccd Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Sat, 29 Feb 2020 18:56:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B2=20=D0=AF=D0=BD=D0=B4=D0=B5=D0=BA=D1=81.=D0=9E=D0=B1?= =?UTF-8?q?=D0=BB=D0=B0=D0=BA=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- ansible/configuration.yml | 40 +++------------------------------- ansible/hosts_prod | 2 +- ansible/requirements.yml | 8 +++---- ansible/templates/Caddyfile.j2 | 12 +--------- 5 files changed, 10 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index b509a00..2cd5076 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="root" + USER_ARGS := --user="mayor" --become else ANSIBLE_HOST_KEY_CHECKING := False INVENTORY := ansible/hosts_vagrant diff --git a/ansible/configuration.yml b/ansible/configuration.yml index 75bc3de..cc1112a 100644 --- a/ansible/configuration.yml +++ b/ansible/configuration.yml @@ -14,6 +14,7 @@ update_cache: yes vars: packages: + - git - python3-pip - import_role: @@ -36,7 +37,7 @@ name: geerlingguy.docker - import_role: - name: antoiner77.caddy + name: caddy_ansible.caddy_ansible vars: caddy_config: '{{ lookup("template", "templates/Caddyfile.j2") }}' caddy_update: False @@ -49,7 +50,7 @@ - import_role: name: netdata vars: - netdata_version: 'v1.18.1' + netdata_version: 'v1.20.0' tags: - monitoring @@ -69,41 +70,6 @@ tags: - apps - - import_role: - name: docker-app - vars: - username: notes - extra_groups: - - docker - ssh_keys: - - '{{ lookup("file", "files/av_id_rsa.pub") }}' - env: - PROJECT_NAME: notes - IMAGE_PREFIX: notes - CONTAINER_PREFIX: notes - WEB_SERVER_PORT: '127.0.0.1:{{ notes_port }}' - DATA_DIR: /home/notes/app/data - CACHE_DIR: /home/notes/app/cache - APP_ENV: prod - SYMFONY_ENV: prod - SECRET_TOKEN: '{{ notes.secret }}' - DATABASE_HOST: notes-db - DATABASE_PORT: 3306 - DATABASE_NAME: notes - DATABASE_USER: notes - DATABASE_PASSWORD: notes - DATABASE_SEARCH_HOST: notes-db-search - DATABASE_SEARCH_PORT: 3306 - DATABASE_SEARCH_NAME: notes-search - DATABASE_SEARCH_USER: notes-search - DATABASE_SEARCH_PASSWORD: notes-search - MAILER_HOST: 127.0.0.1 - MAILER_PORT: 1025 - MAILER_USER: noreply@notes.tld - MAILER_PASSWORD: '' - tags: - - apps - - import_role: name: docker-app vars: diff --git a/ansible/hosts_prod b/ansible/hosts_prod index e27a785..413eeb8 100644 --- a/ansible/hosts_prod +++ b/ansible/hosts_prod @@ -1 +1 @@ -92.53.119.18 +130.193.37.99 diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 7e4d470..e7a38c1 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -3,10 +3,10 @@ version: 1.1.0 - src: geerlingguy.security - version: 1.8.0 + version: 1.9.0 - src: geerlingguy.docker - version: 2.5.2 + version: 2.6.2 -- src: antoiner77.caddy - version: v2.1.0 +- src: caddy_ansible.caddy_ansible + version: v2.1.1 diff --git a/ansible/templates/Caddyfile.j2 b/ansible/templates/Caddyfile.j2 index 85df0db..dcd475f 100644 --- a/ansible/templates/Caddyfile.j2 +++ b/ansible/templates/Caddyfile.j2 @@ -12,7 +12,7 @@ status.vakhrushev.me, :29999 { basicauth / {{ netdata.login }} {{ netdata.password }} } -# Yandex Proxy Imager +# Yandex Image Proxy preview.vakhrushev.me { proxy /img https://webdav.yandex.ru { transparent @@ -39,16 +39,6 @@ homepage.vakhrushev.me, vakhrushev.me { } } -# Notes app -notes.vakhrushev.me { - proxy / 127.0.0.1:{{ notes_port }} { - transparent - } - - tls anwinged@ya.ru - basicauth / {{ notes.login }} {{ notes.password }} -} - # Dayoff app dayoff.vakhrushev.me { proxy / 127.0.0.1:{{ dayoff_port }} {