diff --git a/README.md b/README.md new file mode 100644 index 0000000..71f2e0d --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +### Useful intel + +Nginx reverse proxy installed on the remote server + - forwards requests to docker-compose powered python app + - serves static content found in /var/www/sciodog.fr/ + +SSL is setup using certbot + +Docker-compose app is in /home/Zoe/sciodog + +Quick restart: `docker compose down; docker compose up -d` +Project update: `docker compose down; docker rmi sciodog-sciodog; docker compose up -d` + diff --git a/docker-compose.yaml b/docker-compose.yaml index 785c600..534d59c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,7 +6,11 @@ services: environment: WSGI_FILE: "sciodog.wsgi" HOSTNAME: "sciodog.fr" - PORT: 80 + PORT: 8000 + volumes: + - /var/www/sciodog.fr/:/var/www/sciodog.fr:rw + ports: + - "8000:8000" restart: always healthcheck: test: "wget -O/dev/null -q http://127.0.0.1/" diff --git a/nginx/default b/nginx/default new file mode 100644 index 0000000..7fc8096 --- /dev/null +++ b/nginx/default @@ -0,0 +1,42 @@ +server { + + root /var/www/sciodog.fr; + + index index.html index.htm index.nginx-debian.html; + + server_name sciodog.fr; + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_pass http://localhost:8000; + } + + location /static/ { + root /var/www/sciodog.fr/blog/; + } + + listen [::]:443 ssl ipv6only=on; # managed by Certbot + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/sciodog.fr/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/sciodog.fr/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + +} +server { + if ($host = sciodog.fr) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + listen 80 default_server; + listen [::]:80 default_server; + + server_name sciodog.fr; + return 404; # managed by Certbot + + +} \ No newline at end of file diff --git a/sciodog-app/Dockerfile b/sciodog-app/Dockerfile index 8db743b..ac1f94e 100644 --- a/sciodog-app/Dockerfile +++ b/sciodog-app/Dockerfile @@ -7,7 +7,7 @@ FROM alpine:latest # UWSGI Configuration COPY configuration/ /etc/uwsgi/ RUN mkdir -p /etc/uwsgi ; \ - adduser uwsgi -S -D -H -s /usr/sbin/nologin ; \ + adduser uwsgi -S -D -H -s /usr/sbin/nologin -u 33; \ apk add python3 python3-dev py3-pip gcc musl-dev linux-headers ; \ pip install --break-system-packages uwsgi django diff --git a/sciodog-app/app/blog/static/blog/images/carousel/logo-jmt-quimper.png b/sciodog-app/app/blog/static/blog/images/carousel/logo-jmt-quimper.png new file mode 100644 index 0000000..9ebe14c Binary files /dev/null and b/sciodog-app/app/blog/static/blog/images/carousel/logo-jmt-quimper.png differ diff --git a/sciodog-app/app/blog/static/blog/images/carousel/logo-radio-flam.png b/sciodog-app/app/blog/static/blog/images/carousel/logo-radio-flam.png old mode 100755 new mode 100644 diff --git a/sciodog-app/app/blog/templates/blog/index.html b/sciodog-app/app/blog/templates/blog/index.html index d1a461b..2344e6a 100644 --- a/sciodog-app/app/blog/templates/blog/index.html +++ b/sciodog-app/app/blog/templates/blog/index.html @@ -72,60 +72,69 @@

Ils font confiance à Sciodog

-
-
-
+
+ +
+
+
diff --git a/sciodog-app/app/blog/views/index.py b/sciodog-app/app/blog/views/index.py index b819c49..c1fb623 100644 --- a/sciodog-app/app/blog/views/index.py +++ b/sciodog-app/app/blog/views/index.py @@ -26,7 +26,7 @@ class IndexView(View): params = { 'access_token': access_token } - url = 'https://graph.facebook.com/v13.0/102786409210660/feed?fields=attachments,message,permalink_url&limit=10' + url = 'https://graph.facebook.com/v13.0/102786409210660/posts?fields=attachments,message,permalink_url&limit=10' response = requests.get(url, params=params) posts = [] if response.status_code == 200: