diff --git a/.gitignore b/.gitignore index 6e7fb06..7d9ee3b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,6 @@ diagram_assets/ /caddy/config/conf.002.d/acme.serguzim.me.conf /caddy/config/conf.002.d/analytics.serguzim.me.conf /caddy/config/conf.002.d/git.serguzim.me.conf +/caddy/config/conf.002.d/inventory.serguzim.me.conf /caddy/config/conf.002.d/tick.serguzim.me.conf /caddy/config/conf.002.d/wiki.serguzim.me.conf diff --git a/_ansible/node002.yml b/_ansible/node002.yml index 6ef0dc1..b96b794 100644 --- a/_ansible/node002.yml +++ b/_ansible/node002.yml @@ -4,7 +4,8 @@ roles: - acme-dns - gitea - - gitea-runner + #- gitea-runner + - homebox - influxdb - umami - watchtower diff --git a/_ansible/roles/gitea/vars/main.yml b/_ansible/roles/gitea/vars/main.yml index d5e99f3..077754d 100644 --- a/_ansible/roles/gitea/vars/main.yml +++ b/_ansible/roles/gitea/vars/main.yml @@ -43,6 +43,7 @@ svc_env: GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION: true GITEA__service__ENABLE_BASIC_AUTHENTICATION: false + GITEA__service__DEFAULT_KEEP_EMAIL_PRIVATE: true GITEA__service__NO_REPLY_ADDRESS: "discard.msrg.cc" GITEA__webhook__DELIVER_TIMEOUT: 60 @@ -73,12 +74,12 @@ svc_env: GITEA__storage__MINIO_LOCATION: "de-contabo-1" GITEA__storage__MINIO_USE_SSL: true - GITEA__other__SHOW_FOOTER_BRANDING: true + GITEA__other__SHOW_FOOTER_VERSION: true GITEA__other__SHOW_FOOTER_TEMPLATE_LOAD_TIME: false compose: watchtower: true - image: gitea/gitea:1.19 + image: gitea/gitea:1.20 env: true volumes: - data:/data diff --git a/_ansible/roles/homebox/tasks/main.yml b/_ansible/roles/homebox/tasks/main.yml new file mode 100644 index 0000000..bb1fad4 --- /dev/null +++ b/_ansible/roles/homebox/tasks/main.yml @@ -0,0 +1,7 @@ +--- +- name: Deploy {{ svc.name }} + tags: + - homebox + - inventory + block: + - import_tasks: deploy-common-service.yml diff --git a/_ansible/roles/homebox/vars/main.yml b/_ansible/roles/homebox/vars/main.yml new file mode 100644 index 0000000..4f70e83 --- /dev/null +++ b/_ansible/roles/homebox/vars/main.yml @@ -0,0 +1,24 @@ +svc: + domain: "inventory.serguzim.me" + name: homebox + port: 7745 + +svc_env: + HBOX_OPTIONS_ALLOW_REGISTRATION: false + HBOX_MAILER_HOST: mail.serguzim.me + HBOX_MAILER_PORT: 587 + HBOX_MAILER_USERNAME: inventory@serguzim.me + HBOX_MAILER_PASSWORD: "{{ vault_homebox.mailer_passwd }}" + HBOX_MAILER_FROM: Homebox + HBOX_SWAGGER_SCHEMA: https + +compose: + watchtower: true + image: ghcr.io/hay-kot/homebox:latest-rootless + env: true + volumes: + - data:/data + file: + volumes: + data: + diff --git a/_ansible/roles/umami/vars/main.yml b/_ansible/roles/umami/vars/main.yml index abbb01c..8e6c722 100644 --- a/_ansible/roles/umami/vars/main.yml +++ b/_ansible/roles/umami/vars/main.yml @@ -12,7 +12,6 @@ svc_env: DATABASE_URL: postgres://{{ svc.db.user }}:{{ svc.db.pass }}@{{ svc.db.host }}/{{ svc.db.db }} DATABASE_TYPE: postgresql FORCE_SSL: 1 - HOSTNAME: "{{ svc.domain }}" HASH_SALT: "{{ vault_umami.hash_salt }}" compose: