testing

dev/proxy.yml

@@ -5,9 +5,9 @@
     - host_vars/proxy.yml
   roles:
     - base
-#    - mariadb
+    - mariadb
     - proxy
-#    - docker
+    - docker
-#    - gitea
+    - gitea
-#    - bitwarden
+    - bitwarden
     - kutt

roles/kutt/defaults/main.yml

@@ -1,15 +0,0 @@
-# container settings
-kutt_name: kutt
-kutt_webport: 3030
-kutt_web: "127.0.0.1:{{ kutt_webport }}"
-
-# database settings
-kutt_dbname: "{{ kutt_name }}"
-kutt_dbuser: "{{ kutt_name }}"
-kutt_postgres_volume: postgres_data
-
-# redis
-kutt_redis_volume: redis_data
-
-# host
-kutt_root: "{{ docker_compose_root }}/{{ kutt_name }}"

roles/kutt/tasks/main.yml

@@ -14,9 +14,3 @@
     src: compose-env.j2
     dest: "{{ kutt_root }}/.env"
   notify: restart_kutt
-
-- name: Start and enable Gitea service
-  service:
-    name: "{{ docker_compose_service }}@{{ kutt_name }}"
-    state: started
-    enabled: true

roles/kutt/templates/compose-env.j2

@@ -1,11 +0,0 @@
-# {{ ansible_managed }}
-
-kutt_version={{ kutt_version }}
-kutt_name={{ kutt_name }}
-kutt_web={{ kutt_web }}
-kutt_dbname={{ kutt_dbname }}
-kutt_dbuser={{ kutt_dbuser }}
-kutt_dbpass={{ kutt_dbpass }}
-kutt_redis_version={{ kutt_redis_version }}
-kutt_postgres_version={{ kutt_postgres_version }}
-kutt_postgres_volume={{ kutt_postgres_volume }}

roles/kutt/templates/docker-compose.yml.j2

@@ -2,35 +2,35 @@ version: "3.7"
 
 services:
   kutt:
-    image: kutt/kutt:${kutt_version}
+    image: kutt/kutt:${kutt_version:-latest}
-    container_name: ${kutt_name}
+    container_name: ${kutt_name:-kutt}
     depends_on:
       - postgres
       - redis
     command: ["./wait-for-it.sh", "postgres:5432", "--", "npm", "start"]
     ports:
-      - ${kutt_web}:3000
+      - ${kutt_web:-3000}:3000
     environment:
-      DB_HOST: postgres
+      DB_HOST: ${kutt_dbhost:-postgres}
-      DB_NAME: ${kutt_dbname}
+      DB_NAME: ${kutt_dbname:-kutt}
-      DB_USER: ${kutt_dbuser}
+      DB_USER: ${kutt_dbuser:-kutt}
       DB_PASSWORD: ${kutt_dbpass}
-      REDIS_HOST: redis
+      REDIS_HOST: ${kutt_redis:-redis}
 
   redis:
-    image: redis:${kutt_redis_version}
+    image: redis:${redis_version:-6.0-alpine}
     volumes:
-      - {{ kutt_redis_volume }}:/data
+      - {{ redis_volume }}:/data
 
   postgres:
-    image: postgres:${kutt_postgres_version}
+    image: postgres:${postgres_version:-12-alpine}
     environment:
-      POSTGRES_USER: ${kutt_dbuser}
+      POSTGRES_USER: ${kutt_dbuser:-kutt}
       POSTGRES_PASSWORD: ${kutt_dbpass}
-      POSTGRES_DB: ${kutt_dbname}
+      POSTGRES_DB: ${kutt_dbhost:-postgres}
     volumes:
-      - {{ kutt_postgres_volume }}:/var/lib/postgresql/data
+      - {{ postgres_volume }}:/var/lib/postgresql/data
 
 volumes:
-  {{ kutt_redis_volume }}:
+  {{ redis_volume }}:
-  {{ kutt_postgres_volume }}:
+  {{ postgres_volume }}: