Corrected docker-compose.yml for mprofiag environment
Petr Šnobl
6 years ago
parent
2c76d3e74f
commit
b90dd00590
@ -1,6 +1,5 @@
|
||||
*.pyc
|
||||
*.pyo
|
||||
/.env
|
||||
/data
|
||||
/static_collected
|
||||
/docker
|
||||
/node_modules
|
||||
|
||||
@ -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-*
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
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
|
||||
HTTPS_PORT=4047
|
||||
POSTGRES_PASSWORD=MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX
|
||||
POSTGRES_USER=django
|
||||
@ -0,0 +1,29 @@
|
||||
# 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]
|
||||
- HTTPS_PORT=4047 [.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.
|
||||
@ -1,61 +0,0 @@
|
||||
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;
|
||||
gzip_http_version 1.1;
|
||||
gzip_disable "MSIE [1-6]\.";
|
||||
gzip_min_length 256;
|
||||
gzip_vary on;
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
gzip_comp_level 9;
|
||||
|
||||
location /static/ {
|
||||
sendfile on;
|
||||
alias /app/static_collected/;
|
||||
}
|
||||
|
||||
location /media/ {
|
||||
sendfile on;
|
||||
alias /app/data/media/;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_hide_header X-Frame-Options;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Host $host;
|
||||
proxy_redirect off;
|
||||
proxy_pass http://gunicorn;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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'),
|
||||
),
|
||||
]
|
||||
@ -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'),
|
||||
),
|
||||
]
|
||||
Loading…
Reference in New Issue