From d770f178335387e8f63815b2e338ff3259a2c9ff Mon Sep 17 00:00:00 2001
From: JavieraMaltas <jmaltas@redsauce.net>
Date: Wed, 4 Oct 2023 10:16:52 +0000
Subject: [PATCH] Changes in docker and config to update version and remove
 unnnecessary things

---
 containers/docker-compose.yml               | 17 ++++++++---------
 containers/fpm/Dockerfile                   |  4 ++--
 containers/nginx/Dockerfile                 |  8 ++++----
 containers/nginx/conf/nginx.vh.default.conf |  2 +-
 containers/nginx/letsencrypt-setup.sh       | 13 +++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml
index e0f2c24..8e4ca05 100644
--- a/containers/docker-compose.yml
+++ b/containers/docker-compose.yml
@@ -1,16 +1,15 @@
-nginx:
+version: '3'
+services:
+  nginx:
     build: nginx
     restart: always
     ports:
-        - "80:80"
-        - "443:443"
+      - "85:80"
     links:
-        - fpm
-    volumes:
-        - ./data/certbot/conf:/etc/letsencrypt
-        - ./data/certbot/www:/var/www/certbot
-fpm:
+      - fpm
+  fpm:
     build: fpm
     restart: always
     expose:
-        - "9000"
+      - "9000"
+
diff --git a/containers/fpm/Dockerfile b/containers/fpm/Dockerfile
index 31f9dfb..2239815 100644
--- a/containers/fpm/Dockerfile
+++ b/containers/fpm/Dockerfile
@@ -1,9 +1,9 @@
-FROM php:7.0-fpm
+FROM php:8.2-fpm
 MAINTAINER Kenan Rhoton
 RUN apt-get update
 
 # Framebuffer to render webpages and some font packages to make them look right
-RUN apt-get install -y xvfb ttf-freefont fontconfig dbus
+RUN apt-get install -y xvfb fontconfig dbus
 
 # Our html to PDF renderer
 RUN apt-get install -y wkhtmltopdf
diff --git a/containers/nginx/Dockerfile b/containers/nginx/Dockerfile
index 2668e0b..65cd12d 100644
--- a/containers/nginx/Dockerfile
+++ b/containers/nginx/Dockerfile
@@ -1,8 +1,8 @@
 FROM nginx:alpine
 MAINTAINER Kenan Rhoton
-RUN apk add --no-cache certbot certbot-nginx git go
-RUN git clone https://gitlab.redsauce.net/cmd/scheduler /scheduler
+RUN apk add --no-cache git go
+# RUN git clone https://gitlab.redsauce.net/cmd/scheduler /scheduler
 COPY conf/nginx.conf /etc/nginx/nginx.conf
 COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf
-COPY letsencrypt-setup.sh /bin/le-setup
-CMD /bin/le-setup
+# COPY letsencrypt-setup.sh /bin/le-setup
+# CMD /bin/le-setup
diff --git a/containers/nginx/conf/nginx.vh.default.conf b/containers/nginx/conf/nginx.vh.default.conf
index bf1440a..81cbce8 100644
--- a/containers/nginx/conf/nginx.vh.default.conf
+++ b/containers/nginx/conf/nginx.vh.default.conf
@@ -1,6 +1,6 @@
 server {
     listen       80;
-    server_name  pdf.redsauce.net;
+    server_name  pdf-two.redsauce.net;
 
     #charset koi8-r;
     #access_log  /var/log/nginx/log/host.access.log  main;
diff --git a/containers/nginx/letsencrypt-setup.sh b/containers/nginx/letsencrypt-setup.sh
index dde8511..c2293d2 100755
--- a/containers/nginx/letsencrypt-setup.sh
+++ b/containers/nginx/letsencrypt-setup.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
 set -xe
 
-nginx && \
-certbot --nginx --non-interactive --agree-tos --email webmaster@redsauce.net --domains pdf.redsauce.net && \
-killall nginx
+nginx
+# && \
+# certbot --nginx --non-interactive --agree-tos --email webmaster@redsauce.net --domains pdf.redsauce.net && \
+# killall nginx
 
-go run /scheduler/scheduler.go 02:30 certbot renew &
-sleep 1
-nginx -g "daemon off;"
+# go run /scheduler/scheduler.go 02:30 certbot renew &
+# sleep 1
+# nginx -g "daemon off;"
 
 # echo "certbot renew" > /etc/periodic/daily/cerbot-renewal && \
 # chmod +x /etc/periodic/daily/certbot-renewal && \