offen/website
2
0
Fork 0
mirror of https://github.com/offen/website.git synced 2024-11-22 17:10:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from offen/env-update

Browse Source 
fix duplicate headers in dev, use updated env schema, develop against sqlite
This commit is contained in:
Frederik Ring 2019-10-24 12:39:34 +02:00 committed by GitHub
commit 3c0e5dfa20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerrun.aws.json.production
View File

@ -30,7 +30,7 @@
}, },
{ {
"name": "server", "name": "server",
"image": "offen/offen:stable@sha256:87b77a8db3a3d09007e3fe01771b0c459873c7716426bc8746b5477045d38447", "image": "offen/offen@sha256:fe55ba1c183eb8bb4dd19143e6fe1133d6d3b9115c94cc2150620b27adef18fc",
"essential": true, "essential": true,
"memory": 256, "memory": 256,
"command": ["serve"] "command": ["serve"]

2
Dockerrun.aws.json.staging
View File

@ -23,7 +23,7 @@
}, },
{ {
"name": "server", "name": "server",
"image": "offen/offen:latest@sha256:e14297bb6c6e03e282b0ce9d38ba2b987ef2a5de16e8943aaae3c3ca75260427", "image": "offen/offen@sha256:fe55ba1c183eb8bb4dd19143e6fe1133d6d3b9115c94cc2150620b27adef18fc",
"essential": true, "essential": true,
"memory": 256, "memory": 256,
"command": ["serve"] "command": ["serve"]

3
Makefile
View File

@ -14,6 +14,9 @@ setup: dev-build update howto
dev-build: dev-build:
@docker-compose build @docker-compose build
up:
@docker-compose up
howto: howto:
@echo "Successfully built containers and installed dependencies." @echo "Successfully built containers and installed dependencies."
@echo "If this is your initial setup, you can run 'make bootstrap' next" @echo "If this is your initial setup, you can run 'make bootstrap' next"

2
README.md
View File

@ -26,7 +26,7 @@ $ make bootstrap
You can test your setup by starting the application: You can test your setup by starting the application:
```sh ```sh
$ docker-compose up $ make up
``` ```
which should enable you to access the homepage at <http://localhost:8000/> and use the wrapped `auditorium` at <http://localhost:8000/auditorium> which should enable you to access the homepage at <http://localhost:8000/> and use the wrapped `auditorium` at <http://localhost:8000/auditorium>

18
docker-compose.yml
View File

@ -12,18 +12,19 @@ services:
- server - server
server: server:
image: offen/offen:latest@sha256:e14297bb6c6e03e282b0ce9d38ba2b987ef2a5de16e8943aaae3c3ca75260427 image: offen/offen@sha256:fe55ba1c183eb8bb4dd19143e6fe1133d6d3b9115c94cc2150620b27adef18fc
command: serve command: serve
volumes: volumes:
- ./bootstrap.yml:/bootstrap.yml - ./bootstrap.yml:/bootstrap.yml
- database:/data
environment: environment:
POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable OFFEN_APP_EVENTRETENTIONPERIOD: 4464h
DEVELOPMENT: '1' OFFEN_APP_DEVELOPMENT: '1'
PORT: 8080 OFFEN_APP_DISABLESECURECOOKIE: '1'
COOKIE_EXCHANGE_SECRET: 8jeKYbbnywoYIZznu4HffQ== OFFEN_DATABASE_CONNECTIONSTRING: /data/offen.db
EVENT_RETENTION_PERIOD: 4464h OFFEN_SERVER_PORT: 8080
ACCOUNT_USER_EMAIL_SALT: eypctS7SVKM1Ureb61db5Q== OFFEN_SECRETS_COOKIEEXCHANGE: 8jeKYbbnywoYIZznu4HffQ==
SECURE_COOKIE: 'off' OFFEN_SECRETS_EMAILSALT: eypctS7SVKM1Ureb61db5Q==
depends_on: depends_on:
- server_database - server_database
@ -46,3 +47,4 @@ services:
volumes: volumes:
homepagedeps: homepagedeps:
database:

7
nginx.conf
View File

@ -25,11 +25,18 @@ http {
server { server {
listen 80; listen 80;
expires $expires; expires $expires;
proxy_hide_header Content-Security-Policy;
add_header Content-Security-Policy $csp; add_header Content-Security-Policy $csp;
proxy_hide_header Strict-Transport-Security;
add_header Strict-Transport-Security 'max-age=604800; includeSubDomains';
proxy_hide_header Referrer-Policy;
add_header Referrer-Policy 'origin-when-cross-origin'; add_header Referrer-Policy 'origin-when-cross-origin';
proxy_hide_header X-Content-Type-Options;
add_header X-Content-Type-Options 'nosniff'; add_header X-Content-Type-Options 'nosniff';
proxy_hide_header X-XSS-Protection;
add_header X-XSS-Protection '1; mode=block'; add_header X-XSS-Protection '1; mode=block';
location /api/ { location /api/ {
proxy_pass http://server; proxy_pass http://server;
proxy_redirect off; proxy_redirect off;