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/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/tasks/main.yml

@@ -1,16 +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

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

@@ -1,36 +0,0 @@
-version: "3.7"
-
-services:
-  kutt:
-    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}:3000
-    environment:
-      DB_HOST: ${kutt_dbhost:-postgres}
-      DB_NAME: ${kutt_dbname:-kutt}
-      DB_USER: ${kutt_dbuser:-kutt}
-      DB_PASSWORD: ${kutt_dbpass}
-      REDIS_HOST: ${kutt_redis:-redis}
-
-  redis:
-    image: redis:${redis_version:-6.0-alpine}
-    volumes:
-      - {{ redis_volume }}:/data
-
-  postgres:
-    image: postgres:${postgres_version:-12-alpine}
-    environment:
-      POSTGRES_USER: ${kutt_dbuser:-kutt}
-      POSTGRES_PASSWORD: ${kutt_dbpass}
-      POSTGRES_DB: ${kutt_dbhost:-postgres}
-    volumes:
-      - {{ postgres_volume }}:/var/lib/postgresql/data
-
-volumes:
-  {{ redis_volume }}:
-  {{ 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 %}
   }
 }