diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d64df6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vault-pass
diff --git a/host-pottwal.yml b/host-pottwal.yml
index 0692a58..061b929 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -52,7 +52,7 @@
- name: Setup the docker container for gitea
docker_container:
name: forgejo
- image: "{{ forgejo_image }}:{{ forgejo_image_tag }}"
+ image: "{{ forgejo_image }}"
pull: true
state: started
restart_policy: unless-stopped
@@ -64,10 +64,10 @@
TZ: "{{ timezone }}"
APP_NAME: "Netz39 Git"
RUN_MODE: "prod"
- SSH_DOMAIN: "{{ forgejo_domain_name }}
+ SSH_DOMAIN: "{{ forgejo_domain_name }}"
SSH_PORT: "2222"
SSH_START_SERVER: "false"
- ROOT_URL: "https://{{ forgejo_domain_name }}
+ ROOT_URL: "https://{{ forgejo_domain_name }}"
DISABLE_REGISTRATION: "true"
USER_UID: "1000"
USER_GID: "1000"
@@ -97,7 +97,7 @@
- name: Ensure container for shlink is running
docker_container:
name: shlink
- image: "{{ shlink_image }}:{{ shlink_image_tag }}"
+ image: "{{ shlink_image }}"
pull: true
state: started
detach: yes
@@ -179,7 +179,7 @@
- name: Ensure container for prosody XMPP server is running
docker_container:
name: prosody
- image: netz39/prosody:0.11
+ image: "{{ prosody_image }}"
pull: true
state: started
detach: true
@@ -201,7 +201,7 @@
- name: Ensure container for static XMPP website is running
docker_container:
name: jabber-static-website
- image: joseluisq/static-web-server:2.14
+ image: "{{ prosody_web_image }}"
pull: true
state: started
detach: true
@@ -252,7 +252,7 @@
- name: Install HedgeDoc database container
docker_container:
name: hedgedocdb
- image: "{{ hedgedoc_db_image }}:{{ hedgedoc_db_image_tag }}"
+ image: "{{ hedgedoc_db_image }}"
pull: true
state: started
restart_policy: unless-stopped
@@ -270,7 +270,7 @@
- name: Ensure container for hedgedoc is running
docker_container:
name: hedgedoc
- image: "{{ hedgedoc_image }}:{{ hedgedoc_image_tag }}"
+ image: "{{ hedgedoc_image }}"
pull: true
state: started
detach: yes
@@ -314,7 +314,7 @@
- name: Ensure container for influxdb is running
docker_container:
name: influxdb
- image: "{{ influxdb_image }}:{{ influxdb_image_tag }}"
+ image: "{{ influxdb_image }}"
pull: true
state: started
detach: yes
@@ -361,7 +361,7 @@
- name: Setup Redmine MySQL container
docker_container:
name: redminedb
- image: "{{ redmine_mysql_image }}:{{ redmine_mysql_image_tag }}"
+ image: "{{ redmine_mysql_image }}"
pull: true
state: started
restart_policy: unless-stopped
@@ -378,7 +378,7 @@
- name: Setup Redmine container
docker_container:
name: redmine
- image: "{{ redmine_image }}:{{ redmine_image_tag }}"
+ image: "{{ redmine_image }}"
pull: true
state: started
restart_policy: unless-stopped
@@ -414,7 +414,7 @@
- name: Ensure container for uptime-kuma is running
docker_container:
name: uptime-kuma
- image: "{{ uptimekuma_image }}:{{ uptimekuma_image_tag }}"
+ image: "{{ uptimekuma_image }}"
pull: true
state: started
detach: yes
@@ -451,7 +451,7 @@
- name: Ensure container for grafana is running
docker_container:
name: grafana
- image: "{{ grafana_image }}:{{ grafana_image_tag }}"
+ image: "{{ grafana_image }}"
pull: true
state: started
detach: yes
diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml
index 8a72f6e..0129f2c 100644
--- a/host_vars/pottwal.n39.eu/vars.yml
+++ b/host_vars/pottwal.n39.eu/vars.yml
@@ -12,56 +12,49 @@ cleanuri_amqp_vhost: "/cleanuri"
forgejo_host_port: 9091
forgejo_ssh_port: 2222
forgejo_domain_name: gitea.n39.eu
-forgejo_image: codeberg.org/forgejo/forgejo
-forgejo_image_tag: 1.19
+forgejo_image: codeberg.org/forgejo/forgejo:1.19
shlink_host_port: 8083
shlink_domain_name: sl.n39.eu
-shlink_image: shlinkio/shlink
-shlink_image_tag: 2.6.2
+shlink_image: shlinkio/shlink:2.6.2
shlink_geolite_license_key: "{{ vault_shlink_geolite_license_key }}"
hedgedoc_host_port: 8084
hedgedoc_domain_name: pad.n39.eu
-hedgedoc_image: quay.io/hedgedoc/hedgedoc
-hedgedoc_image_tag: 1.9.3
-hedgedoc_db_image: postgres
-hedgedoc_db_image_tag: 11.6-alpine
+hedgedoc_image: quay.io/hedgedoc/hedgedoc:1.9.3
+hedgedoc_db_image: postgres:11.6-alpine
hedgedoc_postgres_password: "{{ vault_hedgedoc_postgres_password }}"
redmine_host_port: 8087
redmine_domain_name: redmine.n39.eu
-redmine_image: redmine
-redmine_image_tag: 4.2.7
-redmine_mysql_image: mysql
-redmine_mysql_image_tag: 5.7
+redmine_image: redmine:4.2.7
+redmine_mysql_image: mysql:5.7
redmine_database: redmine
redmine_database_password: "{{ vault_redmine_database_password }}"
influxdb_host_port: 8088
influxdb_domain_name: influx.n39.eu
-influxdb_image: influxdb
-influxdb_image_tag: 2.4-alpine
+influxdb_image: influxdb:2.4-alpine
influxdb_init_username: admin
influxdb_init_password: "{{ vault_influxdb_init_password }}"
+jabber_host_port: 8086
+prosody_domain_name: jabber.n39.eu
+prosody_image: netz39/prosody:0.11
+prosody_web_image: joseluisq/static-web-server:2.14
prosody_config_dir: "/etc/prosody"
prosody_data_dir: "{{ data_dir }}/prosody"
-prosody_domain_name: jabber.n39.eu
-jabber_host_port: 8086
uptimekuma_host_port: 8085
uptimekuma_domain_name: uptime.n39.eu
-uptimekuma_image: louislam/uptime-kuma
-uptimekuma_image_tag: 1
+uptimekuma_image: louislam/uptime-kuma:1
grafana_host_port: 8089
grafana_domain_name: grafana.n39.eu
-grafana_image: grafana/grafana
-grafana_image_tag: 9.4.7
+grafana_image: grafana/grafana:9.4.7
grafana_admin_password: "{{ vault_grafana_admin_password }}"
homebox_host_port: 8092
homebox_domain_name: inventory.n39.eu
-homebox_image: ghcr.io/hay-kot/homebox
+homebox_image: ghcr.io/hay-kot/homebox:v0.9.2