1
0

Перенес все данные в Яндекс.Облако

This commit is contained in:
Anton Vakhrushev 2020-02-29 18:56:02 +03:00
parent 1f74a4194f
commit fcb906f5fe
5 changed files with 10 additions and 54 deletions

View File

@ -12,7 +12,7 @@ STAGE := vagrant
ifeq ($(STAGE), prod) ifeq ($(STAGE), prod)
ANSIBLE_HOST_KEY_CHECKING := True ANSIBLE_HOST_KEY_CHECKING := True
INVENTORY := ansible/hosts_prod INVENTORY := ansible/hosts_prod
USER_ARGS := --user="root" USER_ARGS := --user="mayor" --become
else else
ANSIBLE_HOST_KEY_CHECKING := False ANSIBLE_HOST_KEY_CHECKING := False
INVENTORY := ansible/hosts_vagrant INVENTORY := ansible/hosts_vagrant

View File

@ -14,6 +14,7 @@
update_cache: yes update_cache: yes
vars: vars:
packages: packages:
- git
- python3-pip - python3-pip
- import_role: - import_role:
@ -36,7 +37,7 @@
name: geerlingguy.docker name: geerlingguy.docker
- import_role: - import_role:
name: antoiner77.caddy name: caddy_ansible.caddy_ansible
vars: vars:
caddy_config: '{{ lookup("template", "templates/Caddyfile.j2") }}' caddy_config: '{{ lookup("template", "templates/Caddyfile.j2") }}'
caddy_update: False caddy_update: False
@ -49,7 +50,7 @@
- import_role: - import_role:
name: netdata name: netdata
vars: vars:
netdata_version: 'v1.18.1' netdata_version: 'v1.20.0'
tags: tags:
- monitoring - monitoring
@ -69,41 +70,6 @@
tags: tags:
- apps - 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: - import_role:
name: docker-app name: docker-app
vars: vars:

View File

@ -1 +1 @@
92.53.119.18 130.193.37.99

View File

@ -3,10 +3,10 @@
version: 1.1.0 version: 1.1.0
- src: geerlingguy.security - src: geerlingguy.security
version: 1.8.0 version: 1.9.0
- src: geerlingguy.docker - src: geerlingguy.docker
version: 2.5.2 version: 2.6.2
- src: antoiner77.caddy - src: caddy_ansible.caddy_ansible
version: v2.1.0 version: v2.1.1

View File

@ -12,7 +12,7 @@ status.vakhrushev.me, :29999 {
basicauth / {{ netdata.login }} {{ netdata.password }} basicauth / {{ netdata.login }} {{ netdata.password }}
} }
# Yandex Proxy Imager # Yandex Image Proxy
preview.vakhrushev.me { preview.vakhrushev.me {
proxy /img https://webdav.yandex.ru { proxy /img https://webdav.yandex.ru {
transparent 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 app
dayoff.vakhrushev.me { dayoff.vakhrushev.me {
proxy / 127.0.0.1:{{ dayoff_port }} { proxy / 127.0.0.1:{{ dayoff_port }} {