diff --git a/README.md b/README.md deleted file mode 100644 index 71f2e0d..0000000 --- a/README.md +++ /dev/null @@ -1,13 +0,0 @@ -### 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 534d59c..785c600 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,11 +6,7 @@ services: environment: WSGI_FILE: "sciodog.wsgi" HOSTNAME: "sciodog.fr" - PORT: 8000 - volumes: - - /var/www/sciodog.fr/:/var/www/sciodog.fr:rw - ports: - - "8000:8000" + PORT: 80 restart: always healthcheck: test: "wget -O/dev/null -q http://127.0.0.1/" diff --git a/nginx/default b/nginx/default deleted file mode 100644 index 7fc8096..0000000 --- a/nginx/default +++ /dev/null @@ -1,42 +0,0 @@ -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 ac1f94e..8db743b 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 -u 33; \ + adduser uwsgi -S -D -H -s /usr/sbin/nologin ; \ 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 deleted file mode 100644 index 9ebe14c..0000000 Binary files a/sciodog-app/app/blog/static/blog/images/carousel/logo-jmt-quimper.png and /dev/null 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 100644 new mode 100755 diff --git a/sciodog-app/app/blog/templates/blog/index.html b/sciodog-app/app/blog/templates/blog/index.html index 2344e6a..d1a461b 100644 --- a/sciodog-app/app/blog/templates/blog/index.html +++ b/sciodog-app/app/blog/templates/blog/index.html @@ -72,69 +72,60 @@

Ils font confiance à Sciodog

-
-
-
+
+
+
diff --git a/sciodog-app/app/blog/views/index.py b/sciodog-app/app/blog/views/index.py index c1fb623..b819c49 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/posts?fields=attachments,message,permalink_url&limit=10' + url = 'https://graph.facebook.com/v13.0/102786409210660/feed?fields=attachments,message,permalink_url&limit=10' response = requests.get(url, params=params) posts = [] if response.status_code == 200: