testing

dev/host_vars/proxy.yml

@@ -18,8 +18,6 @@ proxy:
       proxy_pass: "http://127.0.0.1:8080"
     - domain: "{{ gitea_domain }}"
       proxy_pass: "http://127.0.0.1:3000"
-    - domain: "{{ kutt_domain }}"
-      proxy_pass: "http://127.0.0.1:3030"
 
 # docker
 docker_users:
@@ -37,16 +35,3 @@ bitwarden_install_key: 1yB3Z2gRI0KnnH90C6p
 gitea_domain: "git.{{ base_domain }}"
 gitea_version: 1
 gitea_dbpass: password
-
-# kutt
-kutt_version: latest
-kutt_redis_version: 6
-kutt_postgres_version: 12
-kutt_domain: "kutt.{{ base_domain }}"
-kutt_dbpass: password
-kutt_jwt_secret: long&random
-kutt_mail_user: kutt-noreply@example.com
-kutt_mail_host: smtp.example.com
-kutt_mail_password: realpassword
-kutt_report_email: realemail@example.com
-kutt_admin_emails: realemail@example.com

roles/kutt/defaults/main.yml

@@ -1,16 +0,0 @@
-# container settings
-kutt_name: kutt
-kutt_default_domain: "{{ kutt_domain }}"
-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/handlers/main.yml

@@ -1,5 +0,0 @@
-- name: Restart Kutt
-  service:
-    name: "{{ docker_compose_service }}@{{ kutt_name }}"
-    state: restarted
-  listen: restart_kutt

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,17 +0,0 @@
-# {{ ansible_managed }}
-kutt_version={{ kutt_version }}
-kutt_web={{ kutt_web }}
-kutt_domain={{ kutt_domain }}
-kutt_default_domain={{ kutt_default_domain }}
-kutt_jwt_secret={{ kutt_jwt_secret }}
-kutt_dbname={{ kutt_dbname }}
-kutt_dbuser={{ kutt_dbuser }}
-kutt_dbpass={{ kutt_dbpass }}
-kutt_mail_user={{ kutt_mail_user }}
-kutt_mail_host={{ kutt_mail_host }}
-kutt_mail_password={{ kutt_mail_password }}
-kutt_report_email={{ kutt_report_email }}
-kutt_admin_emails={{ kutt_admin_emails }}
-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,45 +2,35 @@ version: "3.7"
 
 services:
   kutt:
-    image: kutt/kutt:${kutt_version}
+    image: kutt/kutt:${kutt_version:-latest}
+    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:
-      SITE_NAME: ${kutt_domain}
-      DEFAULT_DOMAIN: ${kutt_default_domain}
-      JWT_SECRET: ${kutt_jwt_secret}
-
-      DB_HOST: postgres
-      DB_NAME: ${kutt_dbname}
-      DB_USER: ${kutt_dbuser}
+      DB_HOST: ${kutt_dbhost:-postgres}
+      DB_NAME: ${kutt_dbname:-kutt}
+      DB_USER: ${kutt_dbuser:-kutt}
       DB_PASSWORD: ${kutt_dbpass}
-      REDIS_HOST: redis
-
-      MAIL_USER: ${kutt_mail_user}
-      MAIL_HOST: ${kutt_mail_host}
-      MAIL_PORT: ${kutt_mail_port}
-      MAIL_PASSWORD: ${kutt_mail_password}
-      REPORT_EMAIL: ${kutt_report_email}
-      ADMIN_EMAILS: ${kutt_admin_emails}
+      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 }}:
-  {{ kutt_postgres_volume }}:
+  {{ redis_volume }}:
+  {{ postgres_volume }}:

update-hosts.sh

@@ -14,7 +14,6 @@ HOST[8]="wordpress.${DOMAIN}"
 HOST[9]="site1.wordpress.${DOMAIN}"
 HOST[10]="site2.wordpress.${DOMAIN}"
 HOST[11]="unifi.${DOMAIN}"
-HOST[11]="kutt.${DOMAIN}"
 
 # Get Vagrantbox guest IP
 VAGRANT_OUTPUT=$(vagrant ssh -c "hostname -I | cut -d' ' -f2" 2>/dev/null)