Dev branch: Inversion Latitude Longitude #144

.gitignore

@@ -81,11 +81,9 @@ celerybeat-schedule
 *.sage.py
 
 # dotenv
-deployment/django/django.env
 openrepairplatform/.env
-deployment/postgres/postgres.env
-deployment/nginx/nginx.env
 .env
+deployment/.env
 
 # virtualenv
 .venv

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "restructuredtext.confPath": "",
-    "python.pythonPath": "/Users/clementpoudret/env/ateliersoude/bin/python"
+    "python.pythonPath": "/Users/clementpoudret/env/ateliersoude/bin/python",
+    "git.ignoreLimitWarning": true
 }

deployment/django/Dockerfile

@@ -1,8 +1,8 @@
-FROM debian:buster
+FROM python:3.9-slim-buster
 
-RUN apt update && apt upgrade -y && apt install -y --force-yes python3-pip libpq-dev locales locales-all cron make ruby ruby-dev
-RUN gem install sass
+RUN apt update && apt upgrade -y && apt install -y --force-yes python3-pip libpq-dev locales locales-all cron make nodejs npm sassc binutils libproj-dev gdal-bin
 RUN pip3 install uwsgi
+RUN ln /usr/bin/sassc /usr/bin/sass
 
 COPY requirements.txt /
 RUN pip3 install -r /requirements.txt && rm /requirements.txt
@@ -25,10 +25,12 @@ COPY deployment/django/start.sh /
 COPY openrepairplatform ./openrepairplatform
 COPY deployment/django/openrepairplatform.cron /etc/cron.d/openrepairplatform
 
+RUN cd openrepairplatform/static/ && npm i && cd -
+
 RUN chmod 0644 /etc/cron.d/openrepairplatform
 RUN cron
 RUN useradd openrepairplatform
 
 EXPOSE 8000
 
-CMD /start.sh
+CMD /start.sh

deployment/django/openrepairplatform.cron

@@ -1,3 +1,4 @@
-5 * * * * openrepairplatform cd /srv/app && LANG=fr_FR.UTF-8 EMAIL_PASSWORD={{EMAIL_PASSWORD}} SECRET_KEY={{SECRET_KEY}} DJANGO_SETTINGS_MODULE=openrepairplatform.settings.prod python3 manage.py publish_events > /tmp/log_publish_events 2>&1
-0 16 * * * openrepairplatform cd /srv/app && LANG=fr_FR.UTF-8 EMAIL_PASSWORD={{EMAIL_PASSWORD}} SECRET_KEY={{SECRET_KEY}} DJANGO_SETTINGS_MODULE=openrepairplatform.settings.prod python3 manage.py notify_next_day_events https://dev.atelier-soude.fr > /tmp/log_publish_events 2>&1
+* * * * * openrepairplatform cd /srv/app && LANG=fr_FR.UTF-8 EMAIL_PASSWORD={{EMAIL_PASSWORD}} SECRET_KEY={{SECRET_KEY}} DJANGO_SETTINGS_MODULE=openrepairplatform.settings.prod /usr/local/bin/python3 manage.py publish_events > /tmp/log_publish_events 2>&1
+0 16 * * * openrepairplatform cd /srv/app && LANG=fr_FR.UTF-8 EMAIL_PASSWORD={{EMAIL_PASSWORD}} SECRET_KEY={{SECRET_KEY}} DJANGO_SETTINGS_MODULE=openrepairplatform.settings.prod /usr/local/bin/python3 manage.py notify_next_day_events https://reparons.org > /tmp/log_nextday_events 2>&1
+# 0 22 * * * openrepairplatform cd /srv/app && LANG=fr_FR.UTF-8 EMAIL_PASSWORD={{EMAIL_PASSWORD}} SECRET_KEY={{SECRET_KEY}} DJANGO_SETTINGS_MODULE=openrepairplatform.settings.prod /usr/local/bin/python3  manage.py clean_inactive_users > /tmp/clean_users 2>&1
 # empty line

deployment/django/start.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-rm /start.sh
 sed -i "s/{{SECRET_KEY}}/${SECRET_KEY}/" /etc/cron.d/openrepairplatform
 sed -i "s/{{EMAIL_PASSWORD}}/${EMAIL_PASSWORD}/" /etc/cron.d/openrepairplatform
 service cron start

deployment/docker-compose-no-certificat.yml

@@ -0,0 +1,49 @@
+version: '3'
+
+services:
+  db:
+    image: postgis/postgis
+    container_name: postgres
+    env_file:
+      - ../openrepairplatform/.env
+    volumes:
+      - ./openrepairplatform_data/postgres_data:/var/lib/postgresql/data
+    networks:
+      - openrepairplatform-net
+
+  django:
+    build:
+      context: ../
+      dockerfile: deployment/django/Dockerfile
+    image: openrepairplatform_python
+    container_name: openrepairplatform_python
+    ports:
+      - "8000:8000"
+    env_file:
+      - ../openrepairplatform/.env
+    volumes:
+      - ./openrepairplatform_data/openrepairplatform_static:/srv/static
+      - ./openrepairplatform_data/openrepairplatform_media:/srv/media
+    depends_on:
+      - db
+    networks:
+      - openrepairplatform-net
+
+  nginx:
+    image: nginx
+    container_name: openrepairplatform_nginx
+    ports:
+      - "80:80"
+    env_file:
+      - ../openrepairplatform/.env
+    volumes:
+      - ./openrepairplatform_data/openrepairplatform_static:/srv/static:ro
+      - ./openrepairplatform_data/openrepairplatform_media:/srv/media:ro
+      - ./nginx/nginx-no-certificat.conf:/etc/nginx/conf.d/default.conf
+    networks:
+      - openrepairplatform-net
+    depends_on:
+      - django 
+
+networks:
+  openrepairplatform-net:

deployment/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres:11
+    image: postgis/postgis
     container_name: postgres
     env_file:
       - ../openrepairplatform/.env
@@ -13,8 +13,8 @@ services:
 
   django:
     build:
-      context: .
-      dockerfile: django
+      context: ../
+      dockerfile: deployment/django/Dockerfile
     image: openrepairplatform_python
     container_name: openrepairplatform_python
     env_file:
@@ -29,8 +29,8 @@ services:
 
   nginx:
     build:
-      context: .
-      dockerfile: nginx
+      context: ../
+      dockerfile: deployment/nginx/Dockerfile
     image: openrepairplatform_nginx
     container_name: openrepairplatform_nginx
     ports:
@@ -44,6 +44,8 @@ services:
       - ./openrepairplatform_data/openrepairplatform_letsencrypt:/etc/letsencrypt/:rw
     networks:
       - openrepairplatform-net
+    depends_on:
+      - django 
 
 networks:
   openrepairplatform-net:

deployment/nginx/Dockerfile

@@ -1,9 +1,10 @@
+
 FROM debian:buster
 
 RUN apt update -y && apt upgrade -y
 RUN apt install -y nginx certbot
 
-CMD sed -i "s/{{DOMAINE_NAME}}/${DOMAINE_NAME}/" /deployment/nginx/nginx.conf
+CMD sed -i "s/{{DOMAINE_NAME}}/${DOMAINE_NAME}/g" /deployment/nginx/nginx.conf
 COPY deployment/nginx/nginx.conf /etc/nginx/sites-enabled/default
 COPY deployment/nginx/nginx-snippet.conf /etc/nginx/snippets/ssl-params.conf
 
@@ -12,6 +13,7 @@ RUN mkdir /var/www/letsencrypt/.well-known
 RUN mkdir /var/www/letsencrypt/.well-known/acme-challenge
 
 #command to run on first exec to generate diffie helman cert use to secure tls handshake
-#CMD openssl dhparam -out /etc/ssl/certsdhparam.pem 4096
+CMD openssl dhparam -out /etc/ssl/certsdhparam.pem 4096
+
+CMD while :; do sleep 12h & wait ${!}; certbot renew; nginx -s reload; done & nginx -g "daemon off;"
 
-CMD while :; do sleep 12h & wait ${!}; certbot renew; nginx -s reload; done & nginx -g "daemon off;"

deployment/nginx/nginx-no-certificat.conf

@@ -0,0 +1,33 @@
+upstream openrepairplatform_uwsgi {
+    server openrepairplatform_python:8000;
+}
+
+server {
+    listen 80;
+    server_name ${DOMAINE_NAME};
+    location ~ /\. { deny all; access_log off; log_not_found off; }
+
+    access_log  /dev/stdout;
+    error_log   /dev/stderr;
+
+    location /static/ {
+        alias /srv/static/;
+        expires 100d;
+        add_header Cache-Control public;
+        access_log off;
+    }
+
+    location /media/ {
+        alias /srv/media/;
+        expires 100d;
+        add_header Cache-Control public;
+        access_log off;
+    }
+
+    location / {
+        uwsgi_pass openrepairplatform_uwsgi;
+        include uwsgi_params;
+
+        client_max_body_size 20m;
+    }
+}

deployment/nginx/nginx.conf

@@ -6,12 +6,10 @@ server {
     listen 80;
     listen [::]:80 default_server;
     server_tokens off; #hide nginx version (security best practice)
-    server_name {{DOMAINE_NAME}};
+    server_name ${DOMAINE_NAME};
     add_header  Strict-Transport-Security "max-age=31536000";
 
-    access_log  /dev/stdout;
-    error_log   /dev/stderr;
-
+
     location ~ /\.well-known/acme-challenge {
         allow all;
         root /var/www/letsencrypt;
@@ -38,8 +36,8 @@ server {
     access_log  /dev/stdout;
     error_log   /dev/stderr;
 
-    ssl_certificate /etc/letsencrypt/live/{{DOMAINE_NAME}}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/{{DOMAINE_NAME}}/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/reparons.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/reparons.org/privkey.pem;
 
     location /static/ {
         alias /srv/static/;
@@ -61,4 +59,4 @@ server {
 
         client_max_body_size 20m;
     }
-}
+}

manage.py

@@ -3,8 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE", "openrepairplatform.settings.dev"
-    )
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "openrepairplatform.settings.dev")
     from django.core.management import execute_from_command_line
+
     execute_from_command_line(sys.argv)

openrepairplatform/.env

@@ -1,12 +1,12 @@
 POSTGRES_USER=CHANGE_ME
 POSTGRES_PASSWORD=CHANGE_ME
-POSTGRES_DB_NAME=CHANGE_ME
+POSTGRES_DBNAME=CHANGE_ME
 
-DJANGO_SETTINGS_MODULE=openrepairplatform.settings.dev
+DJANGO_SETTINGS_MODULE=openrepairplatform.settings.prod
 SECRET_KEY=CHANGE_ME
 
 EMAIL_PASSWORD=CHANGE_ME
 EMAIL_HOST_USER=CHANGE_ME
 EMAIL_HOST=CHANGE_ME
 
-DOMAIN_NAME=CHANGE_ME
+DOMAIN_NAME=localhost