Merge branch 'standalone' into mprofiag

.dockerignore

@@ -1,6 +1,6 @@
 *.pyc
 *.pyo
 /.env
-/data
-/static_collected
+/docker
 /node_modules
+.git

.env-local

@@ -1,2 +1,2 @@
-DATABASE_URL=postgres://postgres@postgres:5432/db
-DEFAULT_HAYSTACK_URL=es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/test-*
+DATABASE_URL=postgres://django@MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX:5432/db
+DEFAULT_HAYSTACK_URL=es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/test-*

.env.example

@@ -1,5 +1,13 @@
 SECRET_KEY=TEST---asdg4hr63453452542h4sdf25g42s3df54hj38rd4sg3f2d54h3sd5f4g53
-DEBUG=False
+DEBUG=True
 SENTRY_DSN=https://460e310d034c49a794941e087c4fcc6e@sentry.io/1196285
 DEFAULT_HAYSTACK_URL=es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/index-*
-DATABASE_URL=postgres://django:MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX@postgres:5432/db
+DATABASE_URL=postgres://django:MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX@postgres:5432/db
+HTTP_PORT=8009
+POSTGRES_PASSWORD=MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX
+POSTGRES_USER=django
+POSTGRES_DB=db
+POSTGRES_DATA_DIR=./docker/pgdata
+MEDIA_DIR=./docker/data/media
+DATA_DIR=./docker/data
+STATIC_DIR=./docker/static_collected

.gitignore

@@ -15,9 +15,8 @@ Thumbs.db
 
 # Aldryn
 .aldryn
-/data
 /data.tar.gz
-/static_collected
+/docker/static_collected
 /node_modules
 # </DEFAULT>
 /static/css/
@@ -27,4 +26,9 @@ Thumbs.db
 /static/animation/
 /.idea
 /requirements.txt
-/conf/certbot/
+/docker/conf/certbot/
+/docker/pgdata/**
+/docker/data
+.env-nginx
+.env-db
+.env

Dockerfile

@@ -55,7 +55,7 @@ COPY . /app
 # </SOURCE>
 
 RUN mkdir /app/static_collected
-RUN mkdir /app/data/media
+RUN mkdir -p /app/data/media
 
 # <GULP>
 ENV GULP_MODE=production

README.md

@@ -0,0 +1,43 @@
+# Tagesschule elementa
+
+
+## Docker
+
+1. Copy environment files `.env*.example` to `.env*` and make the configuration changes.
+Configure database user and ports for docker.
+    - HTTP_PORT=8009 [.env] ...
+          
+      
+2. Main app has several mountpoints / volumes. Point them into the appropriate location on 
+your filesystem  
+    - ./docker/static_collected 
+    - ./docker/data/media
+    - ./docker/data
+    
+3. To start
+
+        docker-compose up
+          
+4. Restore DB   
+
+        docker exec -i tagesschule_db_1 pg_restore -U django --no-owner -d db < 41ebf901-4607-4653-9b00-54a42d877b38.dump       
+
+3. Migrate
+
+        docker-compose exec web manage.py migrate
+
+5. Add admin user
+
+In docker container `docker-compose exec web bash` run
+
+    python manage.py shell
+    
+In that shell create admin user (https://stackoverflow.com/questions/18503770/how-to-create-user-from-django-shell)     
+
+    user@host> manage.py shell
+    >>> from django.contrib.auth.models import User
+    >>> user=User.objects.create_user('foo', password='bar')
+    >>> user.is_superuser=True
+    >>> user.is_staff=True
+    >>> user.save()
+

docker-compose.yml

@@ -5,50 +5,39 @@ services:
     image: nginx:1.16-alpine
     restart: unless-stopped
     volumes:
-      - ./conf/nginx:/etc/nginx/conf.d
-      - ./conf/certbot/conf:/etc/letsencrypt
-      - ./conf/certbot/www:/var/www/certbot
-      - ./static_collected:/app/static_collected
-      - ./data/media:/app/data/media
+      - ./docker/conf/nginx:/etc/nginx/conf.d
+      - ./docker/static_collected:/app/static_collected
+      - ${MEDIA_DIR}:/app/data/media
     ports:
-      - "80:80"
-      - "443:443"
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
+      - ${HTTP_PORT}:80
+    #command: "/bin/sh -c 'while :; do sleep 1m & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
     depends_on:
       - web
     networks:
       - nginx_network
-
-  certbot:
-    image: certbot/certbot
-    restart: unless-stopped
-    volumes:
-      - ./conf/certbot/conf:/etc/letsencrypt
-      - ./conf/certbot/www:/var/www/certbot
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
-
   web:
+    restart: unless-stopped
     build: "."
     links:
       - "db:postgres"
     volumes:
-      - ".:/app:rw"
-      - "./data:/data:rw"
-      - ./static_collected:/app/static_collected
-      - ./data/media:/app/data/media
+      - .:/app:rw
+      - ${DATA_DIR}:/data:rw
+      - ${STATIC_DIR}:/app/static_collected
+      - ${MEDIA_DIR}:/app/data/media
     networks:
-      - nginx_network
       - db_network
+      - nginx_network
     command: "/bin/sh -c '/app/wait-for-postgres.sh postgres /app/run.sh'"
     env_file:
       - ./.env
   db:
+    restart: unless-stopped
     image: postgres:9.6-alpine
     env_file:
       - ./.env-db
     volumes:
-      - ".:/app:rw"
-      - "./pgdata:/var/lib/postgresql/data:rw"
+      - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/data:rw
     networks:
       - db_network
 
@@ -56,4 +45,5 @@ networks:
   nginx_network:
     driver: bridge
   db_network:
-    driver: bridge
+    driver: bridge
+

docker/conf/nginx/app.conf

@@ -2,32 +2,12 @@ upstream gunicorn {
     server web:80;
 }
 
-
 server {
     listen 80;
     server_name tagesschule.mprofiag.ch;
     server_tokens off;
-
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name tagesschule.mprofiag.ch;
-    server_tokens off;
     sendfile on;
 
-    ssl_certificate /etc/letsencrypt/live/tagesschule.mprofiag.ch/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/tagesschule.mprofiag.ch/privkey.pem;
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
     add_header X-Frame-Options "";
 
     gzip on;

requirements.in

@@ -20,4 +20,5 @@ mailchimp3==2.1.0
 django-image-cropping==1.2.0
 django-anymail[mailgun]==1.4
 django-admin-view-permission==1.9
-gunicorn==19.9.0
+gunicorn==19.9.0
+django-storages<1.9 # https://stackoverflow.com/questions/60297619/divio-importerror-cannot-import-name-s3boto

settings.py

@@ -242,6 +242,7 @@ if not DEBUG:
         'tagesschule-elementa.ch',
         'www.tagesschule-elementa.ch',
         'tagesschule.mprofiag.ch',
+        'docker.mprofiag.de'
     ]
 
 DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 1024

src/portal/migrations/0005_auto_20200325_1611.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2020-03-25 16:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+import django.db.models.deletion
+import parler.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0004_auto_20180718_1754'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='announcement',
+            options={'ordering': ['-updated'], 'verbose_name': 'Neuigkeit', 'verbose_name_plural': 'Aktuell'},
+        ),
+        migrations.AlterField(
+            model_name='announcementtranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.Announcement'),
+        ),
+        migrations.AlterField(
+            model_name='downloadfiletranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.DownloadFile'),
+        ),
+        migrations.AlterField(
+            model_name='downloadsectiontranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.DownloadSection'),
+        ),
+        migrations.AlterField(
+            model_name='informationsectiontranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.InformationSection'),
+        ),
+        migrations.AlterField(
+            model_name='informationtranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.Information'),
+        ),
+    ]

src/project/migrations/0010_auto_20200325_1611.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2020-03-25 16:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+import django.db.models.deletion
+import parler.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0009_auto_20190214_1250'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notificationtranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='project.Notification'),
+        ),
+        migrations.AlterField(
+            model_name='slideritemqualificationtranslation',
+            name='master',
+            field=parler.fields.TranslationsForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='project.SliderItemQualification'),
+        ),
+    ]

wait-for-postgres.sh

@@ -7,10 +7,10 @@ host="$1"
 shift
 cmd="$@"
 
-until PGPASSWORD=$POSTGRES_PASSWORD psql -h "$host" -U "postgres" -c '\q'; do
+until PGPASSWORD=$POSTGRES_PASSWORD psql -h "$host" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c '\q'; do
   >&2 echo "Postgres is unavailable - sleeping"
   sleep 1
 done
 
 >&2 echo "Postgres is up - executing command"
-exec $cmd
+exec $cmd