From e3de8e72503fb1a936486488b18a0aa3f8cb6ec5 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sat, 24 Aug 2024 11:07:03 -0500
Subject: [PATCH] Make awfullall deploy work on debian 11.

Big annoyance with nginx here, because all my past decisions are terrible.
---
 ansible/roles/awfulAll/tasks/main.yml         | 21 +------------------
 .../awfulAll/templates/awful-compose.yml      |  7 +++++--
 ansible/roles/awfulAll/vars/main.yml          |  2 +-
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/ansible/roles/awfulAll/tasks/main.yml b/ansible/roles/awfulAll/tasks/main.yml
index 147efad..6fd5f6f 100644
--- a/ansible/roles/awfulAll/tasks/main.yml
+++ b/ansible/roles/awfulAll/tasks/main.yml
@@ -37,31 +37,12 @@
 
 - name: Init a new swarm with default parameters
   docker_swarm:
-    state: present    
+    state: present 
 
 - name: ensure the app folders exist
   file: state=directory path={{ item }} owner=josiah group=josiah mode=0700
   loop: [ '/home/josiah/apps/mojo/', '/home/josiah/apps/arke/', '/home/josiah/apps/znc/', '/home/josiah/apps/awful/' ]
 
-# Update the app git repos
-- name: update the mojo git repo
-  git:
-    repo: 'https://git.awful.club/hosted/mojojojo-bot.git'
-    dest: /home/josiah/apps/mojo/
-    version: master
-
-- name: update the arke git repo
-  git:
-    repo: 'https://git.awful.club/hosted/arke.git'
-    dest: /home/josiah/apps/arke/
-    version: master
-
-- name: update the znc git repo
-  git:
-    repo: 'https://git.awful.club/hosted/znc-docker.git'
-    dest: /home/josiah/apps/znc/
-    version: master
-
 - name: copy over awful-All config files
   template:
     src: "{{ item.src }}"
diff --git a/ansible/roles/awfulAll/templates/awful-compose.yml b/ansible/roles/awfulAll/templates/awful-compose.yml
index 74ab5ec..502eb16 100644
--- a/ansible/roles/awfulAll/templates/awful-compose.yml
+++ b/ansible/roles/awfulAll/templates/awful-compose.yml
@@ -49,9 +49,12 @@ services:
       pubnet:      
       
   nginx: 
-    image: nginx:1.17.10
+    image: nginx:1.18
     volumes:
-      - /etc/nginx/:/etc/nginx/
+      - /etc/nginx/sites-available:/etc/nginx/sites-available
+      - /etc/nginx/sites-enabled:/etc/nginx/sites-enabled
+      - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - /etc/nginx/conf.d:/etc/nginx/conf.d
       - /etc/letsencrypt/:/etc/letsencrypt/
       - /home/josiah/apps/awful/awful.club.html:/var/www/awful.club/html/index.html
       - nginx_logs:/log
diff --git a/ansible/roles/awfulAll/vars/main.yml b/ansible/roles/awfulAll/vars/main.yml
index ef86eef..c47efd6 100644
--- a/ansible/roles/awfulAll/vars/main.yml
+++ b/ansible/roles/awfulAll/vars/main.yml
@@ -1 +1 @@
-sys_packages: [ 'curl', 'vim', 'git', 'emacs', 'build-essential', 'mosh', 'python', 'python3-pip' ]
+sys_packages: [ 'curl', 'vim', 'git', 'emacs', 'build-essential', 'mosh', 'python3', 'python3-pip' ]