testing

.gitignore

@@ -1,13 +1,3 @@
 .vagrant
 .playbook
-/*.yml
-/*.yaml
-!backup.yml
-!moxie.yml
-!docker.yml
-!dockerbox.yml
-!hypervisor.yml
-!minecraft.yml
-!proxy.yml
-!unifi.yml
 /environments/

dev/dockerbox.yml

@@ -8,7 +8,6 @@
     - docker
     - traefik
     - nextcloud
-    - gitea
     - jenkins
     - prometheus
     - nginx

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

@@ -10,4 +10,3 @@
     - docker
     - gitea
     - bitwarden
-    - kutt

dockerbox.yml

@@ -1,17 +1,3 @@
-# Copyright (C) 2020  Kris Lamoureux
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 - name: Install Docker Box Server
   hosts: dockerhosts
   become: true

roles/.gitignore

@@ -1,14 +1,11 @@
-# Sort roles: tail -n +6 roles/.gitignore | sort
 /*
 !.gitignore
 !requirements.yml
-# roles
 !base*/
 !bitwarden*/
 !docker*/
 !gitea*/
 !jenkins*/
-!kutt*/
 !libvirt*/
 !mariadb*/
 !minecraft*/

roles/base/handlers/main.yml

@@ -1,5 +1,5 @@
 - name: Reboot host
-  reboot:
+  ansible.builtin.reboot:
     msg: "Reboot initiated by Ansible"
     connect_timeout: 5
   listen: reboot_host

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

@@ -1,22 +0,0 @@
-- name: Create Kutt directory
-  file:
-    path: "{{ kutt_root }}"
-    state: directory
-
-- name: Install Kutt's docker-compose file
-  template:
-    src: docker-compose.yml.j2
-    dest: "{{ kutt_root }}/docker-compose.yml"
-  notify: restart_kutt
-
-- name: Install Kutt's docker-compose variables
-  template:
-    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

@@ -1,46 +0,0 @@
-version: "3.7"
-
-services:
-  kutt:
-    image: kutt/kutt:${kutt_version}
-    depends_on:
-      - postgres
-      - redis
-    command: ["./wait-for-it.sh", "postgres:5432", "--", "npm", "start"]
-    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:
-      - {{ kutt_redis_volume }}:/data
-
-  postgres:
-    image: postgres:${kutt_postgres_version}
-    environment:
-      POSTGRES_USER: ${kutt_dbuser}
-      POSTGRES_PASSWORD: ${kutt_dbpass}
-      POSTGRES_DB: ${kutt_dbname}
-    volumes:
-      - {{ kutt_postgres_volume }}:/var/lib/postgresql/data
-
-volumes:
-  {{ kutt_redis_volume }}:
-  {{ kutt_postgres_volume }}:

roles/proxy/templates/server-nginx.conf.j2

@@ -46,6 +46,12 @@ server {
     proxy_pass {{ item.proxy_pass }};
 {% if item.proxy_ssl_verify is defined and item.proxy_ssl_verify is false %}
     proxy_ssl_verify off;
+{% endif %}
+{% if item.websockets is defined and item.websockets %}
+    proxy_http_version 1.1;
+    proxy_set_header Connection $http_connection;
+    proxy_set_header Origin http://$host;
+    proxy_set_header Upgrade $http_upgrade;
 {% endif %}
   }
 }

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)