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

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,6 +1,5 @@
 # container settings
 kutt_name: kutt
-kutt_default_domain: "{{ kutt_domain }}"
 kutt_webport: 3030
 kutt_web: "127.0.0.1:{{ kutt_webport }}"
 

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/templates/compose-env.j2

@@ -1,17 +1,11 @@
 # {{ ansible_managed }}
+
 kutt_version={{ kutt_version }}
+kutt_name={{ kutt_name }}
 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

@@ -3,6 +3,7 @@ version: "3.7"
 services:
   kutt:
     image: kutt/kutt:${kutt_version}
+    container_name: ${kutt_name}
     depends_on:
       - postgres
       - redis
@@ -10,23 +11,12 @@ services:
     ports:
       - ${kutt_web}: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_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:
     image: redis:${kutt_redis_version}
     volumes:

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)