diff --git a/.gitignore b/.gitignore index 89fd396..f966473 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ diagram_assets/ /umami/ /caddy/config/conf.002.d/analytics.serguzim.me.conf /watchtower/ +/wiki-js/ +/caddy/config/conf.002.d/wiki.serguzim.me.conf diff --git a/_ansible/local-dev.yml b/_ansible/local-dev.yml index bc8bb45..d1af673 100644 --- a/_ansible/local-dev.yml +++ b/_ansible/local-dev.yml @@ -11,3 +11,4 @@ - gitea - umami - watchtower + - wiki-js diff --git a/_ansible/node002.yml b/_ansible/node002.yml index 35eb316..7aea9d7 100644 --- a/_ansible/node002.yml +++ b/_ansible/node002.yml @@ -6,3 +6,4 @@ - gitea - umami - watchtower + - wiki-js diff --git a/_ansible/roles/wiki-js/tasks/main.yml b/_ansible/roles/wiki-js/tasks/main.yml new file mode 100644 index 0000000..33eb559 --- /dev/null +++ b/_ansible/roles/wiki-js/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: Deploy {{ svc.name }} + tags: + - wiki-js + block: + - import_tasks: deploy-common-service.yml diff --git a/_ansible/roles/wiki-js/vars/main.yml b/_ansible/roles/wiki-js/vars/main.yml new file mode 100644 index 0000000..d8c1ff8 --- /dev/null +++ b/_ansible/roles/wiki-js/vars/main.yml @@ -0,0 +1,24 @@ +svc: + domain: "wiki.serguzim.me" + name: wiki-js + port: 3000 + db: + host: "{{ postgres.host }}" + port: "{{ postgres.port }}" + user: "{{ vault_wiki_js.db.user }}" + pass: "{{ vault_wiki_js.db.pass }}" + name: "wikijs" + +svc_env: + DB_TYPE: postgres + DB_HOST: "{{ svc.db.host }}" + DB_PORT: "{{ svc.db.port }}" + DB_USER: "{{ svc.db.user }}" + DB_PASS: "{{ svc.db.pass }}" + DB_NAME: "{{ svc.db.name }}" + DB_SSL: 1 + +compose: + watchtower: true + image: requarks/wiki + env: true diff --git a/wiki-js/.env b/wiki-js/.env deleted file mode 100644 index 0e41973..0000000 --- a/wiki-js/.env +++ /dev/null @@ -1,7 +0,0 @@ -DB_TYPE=postgres -DB_HOST=db.serguzim.me -DB_PORT=5432 -DB_USER=wikijs -DB_PASS= -DB_NAME=wikijs -DB_SSL=1 diff --git a/wiki-js/docker-compose.yml b/wiki-js/docker-compose.yml deleted file mode 100644 index 8f6ddf8..0000000 --- a/wiki-js/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3' - -services: - app: - image: requarks/wiki - restart: always - labels: - com.centurylinklabs.watchtower.enable: true - env_file: - - .env - - .secret.env - networks: - apps: - aliases: - - wiki-js - -networks: - apps: - external: true