From 4afbbb288782d2cf49a77362ed69eb8ccb370f97 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 21:49:59 -0600 Subject: [PATCH 01/37] nginx research results, no way this works --- Dockerfile | 32 ++++++++++++++++++++++++-------- ecs-task.json | 18 ++++++++++++++++++ flask.conf | 9 +++++++++ gunicorn.conf | 3 +++ supervisord.conf | 5 +++++ 5 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 ecs-task.json create mode 100644 flask.conf create mode 100644 gunicorn.conf create mode 100644 supervisord.conf diff --git a/Dockerfile b/Dockerfile index 1b45ca9..1e0a10b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,29 @@ -FROM docker.io/python:3.8-buster +# nginx-gunicorn-flask + +FROM ubuntu:12.04 LABEL maintainer="Andrew Simonson " -WORKDIR /app -ADD ./src /app +ENV DEBIAN_FRONTEND noninteractive -COPY . . +RUN apt-get update +RUN apt-get install -y python python-pip python-virtualenv nginx gunicorn supervisor +# do we really need venv? -RUN apt-get -yq update && \ - pip install --no-cache-dir -r ./src/requirements.txt -WORKDIR /app/src +# Setup flask application +RUN mkdir /deploy/app +COPY src /deploy/app +RUN pip install -r /deploy/app/requirements.txt -CMD [ "gunicorn", "--bind", "0.0.0.0:8080", "app:app"] \ No newline at end of file +# Setup nginx +RUN rm /etc/nginx/sites-enabled/default +COPY flask.conf /etc/nginx/sites-available/ +RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.conf +RUN echo "daemon off;" >> /etc/nginx/nginx.conf + +# Setup supervisord +RUN mkdir -p /var/log/supervisor +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf + +# Start processes (Lol idk how this works) +CMD ["/usr/bin/supervisord"] diff --git a/ecs-task.json b/ecs-task.json new file mode 100644 index 0000000..fc59689 --- /dev/null +++ b/ecs-task.json @@ -0,0 +1,18 @@ +{ + "containerDefinitions": [ + { + "name": "app", + "image": "asimonson1125/asimonson1125.github.io", + "essential": true, + "memory": 500, + "cpu": 10, + "portMappings": [ + { + "containerPort": 80, + "hostPort": 80 + } + ] + } + ], + "family": "Portfolio" +} diff --git a/flask.conf b/flask.conf new file mode 100644 index 0000000..0c1a651 --- /dev/null +++ b/flask.conf @@ -0,0 +1,9 @@ +server { + listen 80; + + location / { + proxy_pass http://localhost:5000/; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} diff --git a/gunicorn.conf b/gunicorn.conf new file mode 100644 index 0000000..6412df9 --- /dev/null +++ b/gunicorn.conf @@ -0,0 +1,3 @@ +[program:gunicorn] +command=/usr/bin/gunicorn app:app -b localhost:5000 +directory=/deploy/app diff --git a/supervisord.conf b/supervisord.conf new file mode 100644 index 0000000..8d520a8 --- /dev/null +++ b/supervisord.conf @@ -0,0 +1,5 @@ +[supervisord] +nodaemon=true + +[program:nginx] +command=/usr/sbin/nginx From 3974ce57d3e53135a48dd4c894e8640707b5d4c7 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 21:58:46 -0600 Subject: [PATCH 02/37] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e0a10b..a57a803 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,16 @@ # nginx-gunicorn-flask -FROM ubuntu:12.04 +FROM ubuntu:lunar LABEL maintainer="Andrew Simonson " ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python python-pip python-virtualenv nginx gunicorn supervisor +RUN apt-get install -y python3-pip nginx gunicorn supervisor # do we really need venv? # Setup flask application +RUN mkdir /deploy RUN mkdir /deploy/app COPY src /deploy/app RUN pip install -r /deploy/app/requirements.txt From 9aecf28d7b55f00bce1cc991bee8ec77da1c65af Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 22:22:08 -0600 Subject: [PATCH 03/37] try to make supervisord stop writing things --- supervisord.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/supervisord.conf b/supervisord.conf index 8d520a8..5748a6b 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,5 +1,7 @@ [supervisord] nodaemon=true +logfile=/dev/null +loglevel=critical [program:nginx] command=/usr/sbin/nginx From b767d2fbe873d7cdf74e44891f657a784223b5e5 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 22:32:44 -0600 Subject: [PATCH 04/37] cut out supervisor --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a57a803..db15973 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,8 @@ LABEL maintainer="Andrew Simonson " ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3-pip nginx gunicorn supervisor +RUN apt-get install -y python3-pip nginx gunicorn +# supervisor # do we really need venv? # Setup flask application @@ -22,9 +23,9 @@ RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.c RUN echo "daemon off;" >> /etc/nginx/nginx.conf # Setup supervisord -RUN mkdir -p /var/log/supervisor -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf -COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf +# RUN mkdir -p /var/log/supervisor +# COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +# COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Start processes (Lol idk how this works) -CMD ["/usr/bin/supervisord"] +CMD ["/usr/sbin/nginx"] From 74bdbaa49851de4fdec8b670aaf797deac7d0d13 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:14:47 -0600 Subject: [PATCH 05/37] create log folder via docker --- Dockerfile | 11 +++++------ supervisord.conf | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index db15973..27799bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,7 @@ LABEL maintainer="Andrew Simonson " ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -RUN apt-get install -y python3-pip nginx gunicorn -# supervisor +RUN apt-get install -y python3-pip nginx gunicorn supervisor # do we really need venv? # Setup flask application @@ -23,9 +22,9 @@ RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.c RUN echo "daemon off;" >> /etc/nginx/nginx.conf # Setup supervisord -# RUN mkdir -p /var/log/supervisor -# COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf -# COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf +RUN mkdir -p /log/supervisor +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf -# Start processes (Lol idk how this works) +# Start processes CMD ["/usr/sbin/nginx"] diff --git a/supervisord.conf b/supervisord.conf index 5748a6b..cdea172 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -5,3 +5,5 @@ loglevel=critical [program:nginx] command=/usr/sbin/nginx +logfile=/dev/null +loglevel=critical \ No newline at end of file From b482b38a359831179ae222357f541809dc9a99c7 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:18:11 -0600 Subject: [PATCH 06/37] placing my faith in history --- Dockerfile | 9 ++++++++- supervisord.conf | 6 +----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27799bd..0447c31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,16 @@ RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.c RUN echo "daemon off;" >> /etc/nginx/nginx.conf # Setup supervisord -RUN mkdir -p /log/supervisor +RUN mkdir -p /var/log/supervisor COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf +# Permissions +RUN chmod -R 775 . && \ + chgrp -R node . + +# Entrypoint +USER root:node + # Start processes CMD ["/usr/sbin/nginx"] diff --git a/supervisord.conf b/supervisord.conf index cdea172..3dbc3ec 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,9 +1,5 @@ [supervisord] nodaemon=true -logfile=/dev/null -loglevel=critical [program:nginx] -command=/usr/sbin/nginx -logfile=/dev/null -loglevel=critical \ No newline at end of file +command=/usr/sbin/nginx \ No newline at end of file From b7a205d9e0df46c593106db940a9a889497c0f95 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:25:02 -0600 Subject: [PATCH 07/37] remove host paths from chmod --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0447c31..4810f34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions -RUN chmod -R 775 . && \ - chgrp -R node . +RUN chmod -R 775 /var # Entrypoint USER root:node From e65ca46ac85107ba9755c27a99725c9653eeeb6f Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:30:20 -0600 Subject: [PATCH 08/37] chmod specificity --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4810f34..e06bf68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,8 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions -RUN chmod -R 775 /var +RUN chmod -R 775 /var/log/supervisor && \ + chmod -R 775 /var/log/nginx # Entrypoint USER root:node From d563cfbf828819e4303e5c5c66bf87bc67ab3ee9 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:35:10 -0600 Subject: [PATCH 09/37] remove user specificity --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e06bf68..df1b476 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN chmod -R 775 /var/log/supervisor && \ chmod -R 775 /var/log/nginx # Entrypoint -USER root:node +# USER root:node # Start processes CMD ["/usr/sbin/nginx"] From 5867b0831de1ef9f5ef765cbe99008181ea77d89 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:38:18 -0600 Subject: [PATCH 10/37] last chmod -R try --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index df1b476..96cf2d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions -RUN chmod -R 775 /var/log/supervisor && \ - chmod -R 775 /var/log/nginx +RUN chmod -R 775 /var/ # Entrypoint # USER root:node From a75e425cdcbf35fb3ba2384b93167b97e84f84af Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:42:00 -0600 Subject: [PATCH 11/37] wildcard --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96cf2d8..a745633 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions -RUN chmod -R 775 /var/ +RUN chmod -R 775 /var/* # Entrypoint # USER root:node From 67e9f6d4ab1b41a547fc5a85daf92741d2bc9ec8 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:48:06 -0600 Subject: [PATCH 12/37] chowned --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a745633..e05a284 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,9 +28,10 @@ COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions RUN chmod -R 775 /var/* +RUN chown -R root /var/* # Entrypoint -# USER root:node +USER root # Start processes CMD ["/usr/sbin/nginx"] From 5e856882e2701b9bd8a84dba8e59a6e4b8b903b2 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sat, 28 Jan 2023 23:58:08 -0600 Subject: [PATCH 13/37] I forgot to re-add supervisor :( --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e05a284..3f527a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,4 @@ RUN chown -R root /var/* USER root # Start processes -CMD ["/usr/sbin/nginx"] +CMD ["/usr/bin/supervisord"] From bda2e6aff533163a2cbf4d6f4025c049e6b9a45b Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 00:08:45 -0600 Subject: [PATCH 14/37] silence logs --- supervisord.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/supervisord.conf b/supervisord.conf index 3dbc3ec..cdea172 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,5 +1,9 @@ [supervisord] nodaemon=true +logfile=/dev/null +loglevel=critical [program:nginx] -command=/usr/sbin/nginx \ No newline at end of file +command=/usr/sbin/nginx +logfile=/dev/null +loglevel=critical \ No newline at end of file From 4a610023d4e6446f677074692c0e90d6532b6df8 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 09:34:59 -0600 Subject: [PATCH 15/37] idk --- supervisord.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/supervisord.conf b/supervisord.conf index cdea172..d91b92c 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -2,8 +2,16 @@ nodaemon=true logfile=/dev/null loglevel=critical +environment=HOME="/",USER="root" +user=root +redirect_stderr=true +stdout_logfile=/dev/null [program:nginx] command=/usr/sbin/nginx logfile=/dev/null -loglevel=critical \ No newline at end of file +loglevel=critical +environment=HOME="/",USER="root" +user=root +redirect_stderr=true +stdout_logfile=/dev/null \ No newline at end of file From c60023f1850a08c99107a19a7171bf6e8a032ed8 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 09:43:16 -0600 Subject: [PATCH 16/37] idfk, im doing my best --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f527a5..a8b90f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,4 @@ RUN chown -R root /var/* USER root # Start processes -CMD ["/usr/bin/supervisord"] +CMD ["sudo", "/usr/bin/supervisord"] From 1e9b2026ccf3bac8c24558c51f9386a0006b5095 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 09:47:39 -0600 Subject: [PATCH 17/37] last one was stupid. this is less stupid. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8b90f3..e6c0d3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions RUN chmod -R 775 /var/* -RUN chown -R root /var/* +RUN chown -R supervisor:supervisor /var/* # Entrypoint -USER root +USER supervisor:supervisor # Start processes -CMD ["sudo", "/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord"] From d75572c39dfd36def8689c07ca5a976b81bdaaaa Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 09:48:12 -0600 Subject: [PATCH 18/37] if I remembmer to push everything dang --- supervisord.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supervisord.conf b/supervisord.conf index d91b92c..8a58263 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -3,7 +3,7 @@ nodaemon=true logfile=/dev/null loglevel=critical environment=HOME="/",USER="root" -user=root +user=supervisor redirect_stderr=true stdout_logfile=/dev/null @@ -12,6 +12,6 @@ command=/usr/sbin/nginx logfile=/dev/null loglevel=critical environment=HOME="/",USER="root" -user=root +user=supervisor redirect_stderr=true stdout_logfile=/dev/null \ No newline at end of file From acea74be616f884d0c8d640e5b2a581c57828452 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 09:51:21 -0600 Subject: [PATCH 19/37] e --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6c0d3e..280bfb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions RUN chmod -R 775 /var/* -RUN chown -R supervisor:supervisor /var/* +RUN chown -R root:supervisor /var/* # Entrypoint -USER supervisor:supervisor +USER root:supervisor # Start processes CMD ["/usr/bin/supervisord"] From 8d9010801b642f3f74e11b2725b8acb25c8d30ea Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 09:59:01 -0600 Subject: [PATCH 20/37] actually create user --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 280bfb8..bb99047 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,11 +27,12 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions +RUN adduser --disabled-password --gecos '' supervisor RUN chmod -R 775 /var/* -RUN chown -R root:supervisor /var/* +RUN chown -R supervisor /var/* # Entrypoint -USER root:supervisor +USER supervisor # Start processes CMD ["/usr/bin/supervisord"] From 2f58e0f734fbc71ca3fc7c8af5d9360cce8e1b19 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:05:07 -0600 Subject: [PATCH 21/37] fixing low-iq moves --- Dockerfile | 13 ++++++------- supervisord.conf | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb99047..3b9c7a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,16 +10,15 @@ RUN apt-get install -y python3-pip nginx gunicorn supervisor # do we really need venv? # Setup flask application -RUN mkdir /deploy -RUN mkdir /deploy/app +RUN mkdir -p /deploy/app COPY src /deploy/app RUN pip install -r /deploy/app/requirements.txt # Setup nginx RUN rm /etc/nginx/sites-enabled/default COPY flask.conf /etc/nginx/sites-available/ -RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.conf -RUN echo "daemon off;" >> /etc/nginx/nginx.conf +RUN ln -s /etc/nginx/sites-available/flask.conf /etc/nginx/sites-enabled/flask.conf && \ + echo "daemon off;" >> /etc/nginx/nginx.conf # Setup supervisord RUN mkdir -p /var/log/supervisor @@ -27,9 +26,9 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions -RUN adduser --disabled-password --gecos '' supervisor -RUN chmod -R 775 /var/* -RUN chown -R supervisor /var/* +RUN adduser --disabled-password --gecos '' supervisor && \ + chmod -R 775 /var/* && \ + chown -R supervisor /var/* # Entrypoint USER supervisor diff --git a/supervisord.conf b/supervisord.conf index 8a58263..bf077dc 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -2,7 +2,7 @@ nodaemon=true logfile=/dev/null loglevel=critical -environment=HOME="/",USER="root" +environment=HOME="/",USER="supervisor" user=supervisor redirect_stderr=true stdout_logfile=/dev/null @@ -11,7 +11,7 @@ stdout_logfile=/dev/null command=/usr/sbin/nginx logfile=/dev/null loglevel=critical -environment=HOME="/",USER="root" +environment=HOME="/",USER="supervisor" user=supervisor redirect_stderr=true stdout_logfile=/dev/null \ No newline at end of file From de64e4e944ff039afe2d76c6a67eb64cc65e84b6 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:17:17 -0600 Subject: [PATCH 22/37] n --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b9c7a7..1a98d9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,12 +26,12 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions -RUN adduser --disabled-password --gecos '' supervisor && \ - chmod -R 775 /var/* && \ - chown -R supervisor /var/* +# RUN adduser --disabled-password --gecos '' supervisor && \ +RUN chmod -R 775 /var/* && \ + chown -R ubuntu:supervisor /var/* # Entrypoint -USER supervisor +USER ubuntu:supervisor # Start processes CMD ["/usr/bin/supervisord"] From a8d22ceb501cd74377ef7d5ecfa4ed8738c0d31b Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:23:00 -0600 Subject: [PATCH 23/37] g --- Dockerfile | 4 ++-- supervisord.conf | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a98d9c..ad41cf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions # RUN adduser --disabled-password --gecos '' supervisor && \ RUN chmod -R 775 /var/* && \ - chown -R ubuntu:supervisor /var/* + chown -R root /var/* # Entrypoint -USER ubuntu:supervisor +USER root # Start processes CMD ["/usr/bin/supervisord"] diff --git a/supervisord.conf b/supervisord.conf index bf077dc..c830495 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -2,8 +2,6 @@ nodaemon=true logfile=/dev/null loglevel=critical -environment=HOME="/",USER="supervisor" -user=supervisor redirect_stderr=true stdout_logfile=/dev/null @@ -11,7 +9,5 @@ stdout_logfile=/dev/null command=/usr/sbin/nginx logfile=/dev/null loglevel=critical -environment=HOME="/",USER="supervisor" -user=supervisor redirect_stderr=true stdout_logfile=/dev/null \ No newline at end of file From 81c52d3758f7e258366333fa9b5e54c0491f369b Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:31:15 -0600 Subject: [PATCH 24/37] i --- supervisord.conf | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/supervisord.conf b/supervisord.conf index c830495..4aaa5fc 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -4,10 +4,20 @@ logfile=/dev/null loglevel=critical redirect_stderr=true stdout_logfile=/dev/null +username = dummy +password = dummy [program:nginx] command=/usr/sbin/nginx logfile=/dev/null loglevel=critical redirect_stderr=true -stdout_logfile=/dev/null \ No newline at end of file +stdout_logfile=/dev/null + +[unix_http_server] +username = dummy +password = dummy + +[supervisorctl] +username = dummy +password = dummy \ No newline at end of file From ead8c365e2adc659b507f08d317f0467ff4f22ef Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:37:06 -0600 Subject: [PATCH 25/37] n --- supervisord.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/supervisord.conf b/supervisord.conf index 4aaa5fc..1ff0908 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,7 +1,5 @@ [supervisord] nodaemon=true -logfile=/dev/null -loglevel=critical redirect_stderr=true stdout_logfile=/dev/null username = dummy @@ -9,8 +7,6 @@ password = dummy [program:nginx] command=/usr/sbin/nginx -logfile=/dev/null -loglevel=critical redirect_stderr=true stdout_logfile=/dev/null From bd757e18edeedc2bb58517dc24618891970b2498 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:45:10 -0600 Subject: [PATCH 26/37] x --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad41cf3..e2b28a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf # Permissions # RUN adduser --disabled-password --gecos '' supervisor && \ -RUN chmod -R 775 /var/* && \ +RUN chmod -R 777 /var/* && \ chown -R root /var/* # Entrypoint From 15c9aef875bf17ac37ac29d609776c1c7ba993e0 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 10:53:58 -0600 Subject: [PATCH 27/37] almost upset that I made progress --- flask.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask.conf b/flask.conf index 0c1a651..449eab3 100644 --- a/flask.conf +++ b/flask.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 8080; location / { proxy_pass http://localhost:5000/; From 0ef8ad597fd5620674be78f2e34d37f7c797a648 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:25:00 -0600 Subject: [PATCH 28/37] sick to my stomach --- Dockerfile | 3 --- flask.conf | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e2b28a6..a9a6b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -# nginx-gunicorn-flask - FROM ubuntu:lunar LABEL maintainer="Andrew Simonson " @@ -7,7 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update RUN apt-get install -y python3-pip nginx gunicorn supervisor -# do we really need venv? # Setup flask application RUN mkdir -p /deploy/app diff --git a/flask.conf b/flask.conf index 449eab3..393c53f 100644 --- a/flask.conf +++ b/flask.conf @@ -1,9 +1,14 @@ server { listen 8080; + server_name _; location / { proxy_pass http://localhost:5000/; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + path https://$server_name$request_uri; + + return 301 https://$host$request_uri; + } From 6996e5ad0f9ab335eba546e0406093676240ed66 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:29:39 -0600 Subject: [PATCH 29/37] pain *and* suffering --- flask.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flask.conf b/flask.conf index 393c53f..84c919a 100644 --- a/flask.conf +++ b/flask.conf @@ -2,12 +2,16 @@ server { listen 8080; server_name _; + add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' *.chesscomfiles.com *.chess.com *.googletagmanager.com cdn.jsdelivr.net www.google-analytics.com ajax.googleapis.com;"; + add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; + add_header X-Content-Type-Options 'nosniff'; + add_header X-Frame-Options 'SAMEORIGIN'; + location / { proxy_pass http://localhost:5000/; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } - path https://$server_name$request_uri; return 301 https://$host$request_uri; From 52b0b48f06451880ef902c16ed2c59323d0192d8 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:35:57 -0600 Subject: [PATCH 30/37] death --- flask.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flask.conf b/flask.conf index 84c919a..bd31f6a 100644 --- a/flask.conf +++ b/flask.conf @@ -1,6 +1,11 @@ server { listen 8080; - server_name _; + server_name www.asimonson.com; + redirect 301 https://asimonson.com$request_uri; +} +server { + listen 8080; + server_name asimonson.com; add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' *.chesscomfiles.com *.chess.com *.googletagmanager.com cdn.jsdelivr.net www.google-analytics.com ajax.googleapis.com;"; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; @@ -13,6 +18,4 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } - return 301 https://$host$request_uri; - } From 97ab6440a8692d61fdb11f9519f9cec9d66fd7f4 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:39:12 -0600 Subject: [PATCH 31/37] aoetrmjhgb --- flask.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask.conf b/flask.conf index bd31f6a..49348f2 100644 --- a/flask.conf +++ b/flask.conf @@ -1,7 +1,7 @@ server { listen 8080; server_name www.asimonson.com; - redirect 301 https://asimonson.com$request_uri; + return 301 https://asimonson.com$request_uri; } server { listen 8080; From dd8b15e6e557247f874cdb6b38a22da382dd10ee Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:49:04 -0600 Subject: [PATCH 32/37] hjbn --- flask.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flask.conf b/flask.conf index 49348f2..03713e3 100644 --- a/flask.conf +++ b/flask.conf @@ -1,10 +1,10 @@ server { - listen 8080; - server_name www.asimonson.com; + listen 80; + server_name asimonson.com www.asimonson.com; return 301 https://asimonson.com$request_uri; } server { - listen 8080; + listen 443; server_name asimonson.com; add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' *.chesscomfiles.com *.chess.com *.googletagmanager.com cdn.jsdelivr.net www.google-analytics.com ajax.googleapis.com;"; From 7731a2bafcc19db33dce739fe0650b913b0af1c1 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:54:07 -0600 Subject: [PATCH 33/37] reverse death --- flask.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flask.conf b/flask.conf index 03713e3..093d5f8 100644 --- a/flask.conf +++ b/flask.conf @@ -1,10 +1,10 @@ server { - listen 80; + listen 8080; server_name asimonson.com www.asimonson.com; return 301 https://asimonson.com$request_uri; } server { - listen 443; + listen 8080; server_name asimonson.com; add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' *.chesscomfiles.com *.chess.com *.googletagmanager.com cdn.jsdelivr.net www.google-analytics.com ajax.googleapis.com;"; From c6e05ed716f8dd5019175babbffe1f0f1521f541 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 13:57:27 -0600 Subject: [PATCH 34/37] lkn j --- flask.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flask.conf b/flask.conf index 093d5f8..3ba23fe 100644 --- a/flask.conf +++ b/flask.conf @@ -1,10 +1,10 @@ server { listen 8080; - server_name asimonson.com www.asimonson.com; + server_name www.asimonson.com; return 301 https://asimonson.com$request_uri; } server { - listen 8080; + listen 8080 ssl; server_name asimonson.com; add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' *.chesscomfiles.com *.chess.com *.googletagmanager.com cdn.jsdelivr.net www.google-analytics.com ajax.googleapis.com;"; From e09bbf19a98dde8603d352aafba3f4ffc8ec7c20 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Sun, 29 Jan 2023 14:00:22 -0600 Subject: [PATCH 35/37] dead --- flask.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask.conf b/flask.conf index 3ba23fe..49348f2 100644 --- a/flask.conf +++ b/flask.conf @@ -4,7 +4,7 @@ server { return 301 https://asimonson.com$request_uri; } server { - listen 8080 ssl; + listen 8080; server_name asimonson.com; add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' *.chesscomfiles.com *.chess.com *.googletagmanager.com cdn.jsdelivr.net www.google-analytics.com ajax.googleapis.com;"; From bdfffb46df862c81d4cfc0473da64b964bff0bc4 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Mon, 30 Jan 2023 13:11:05 -0600 Subject: [PATCH 36/37] test --- src/app.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app.py b/src/app.py index 43c4f1e..78e6ad7 100644 --- a/src/app.py +++ b/src/app.py @@ -40,6 +40,13 @@ def goto(location): output = [location, flask.render_template(pagevars["template"], var=pagevars), pagevars['title']] socketio.emit("goto", output, to=sid) +@socketio.on("socketio/goto") +def goto(location): + sid = flask.request.sid + pagevars = pages[location] + output = [location, flask.render_template(pagevars["template"], var=pagevars), pagevars['title']] + socketio.emit("goto", f"

AAAAAAAAAAAAAA

{output}", to=sid) + @app.route("/") def home(): From 30a9c89f4153f1a22e5c382d3d6c529fe8d1f0fb Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Mon, 30 Jan 2023 13:23:34 -0600 Subject: [PATCH 37/37] durrr --- flask.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask.conf b/flask.conf index c295b1d..179a509 100644 --- a/flask.conf +++ b/flask.conf @@ -25,7 +25,7 @@ server { proxy_buffering off; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_pass http://127.0.0.1:5000/socket.io; + proxy_pass $scheme://asimonson.com/socket.io; } } \ No newline at end of file