diff --git a/doc/nginx/sites-available-haproxy/mandayejs.conf b/doc/nginx/sites-available-haproxy/mandayejs.conf deleted file mode 100644 index 437c3e6..0000000 --- a/doc/nginx/sites-available-haproxy/mandayejs.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name ~^mandayejs.*; - - access_log /var/log/nginx/mandayejs-access.log combined_full; - error_log /var/log/nginx/mandayejs-error.log; - - include snippets/publik-mandayejs.conf; -} diff --git a/doc/nginx/sites-available/mandayejs.conf b/doc/nginx/sites-available/mandayejs.conf deleted file mode 100644 index b4682b7..0000000 --- a/doc/nginx/sites-available/mandayejs.conf +++ /dev/null @@ -1,14 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name ~^mandayejs; - - access_log /var/log/nginx/mandayejs-access.log combined_full; - error_log /var/log/nginx/mandayejs-error.log; - - ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - - include snippets/publik-openssl.conf; - include snippets/publik-mandayejs.conf; -} diff --git a/nginx/snippets/build-publik-snippets.py b/nginx/snippets/build-publik-snippets.py index fc0ff40..3933c71 100755 --- a/nginx/snippets/build-publik-snippets.py +++ b/nginx/snippets/build-publik-snippets.py @@ -12,7 +12,6 @@ MODULES = ( 'combo', 'fargo', 'hobo', - 'mandayejs', 'passerelle', 'welco', ) diff --git a/nginx/snippets/publik-mandayejs.conf b/nginx/snippets/publik-mandayejs.conf deleted file mode 100644 index 8d44798..0000000 --- a/nginx/snippets/publik-mandayejs.conf +++ /dev/null @@ -1,37 +0,0 @@ -# -# This file is provided by publik-common package: DO NOT EDIT. -# - -location ~ ^/static/(.+)$ { - root /; - try_files /var/lib/mandayejs/tenants/$host/static/$1 - /var/lib/mandayejs/tenants/$host/theme/static/$1 - /var/lib/mandayejs/collectstatic/$1 - =404; - add_header 'X-Content-Type-Options' 'nosniff'; - add_header 'X-XSS-Protection' '1; mode=block'; - add_header 'Content-Security-Policy' "default-src 'none'; style-src 'self' 'unsafe-inline'; object-src 'self' 'unsafe-inline'; img-src 'self' data:;"; - add_header 'Access-Control-Allow-Origin' '*'; - include snippets/publik-gzip.conf; -} - -location ~ ^/media/(.+)$ { - alias /var/lib/mandayejs/tenants/$host/media/$1; - add_header 'X-Content-Type-Options' 'nosniff'; - add_header 'X-XSS-Protection' '1; mode=block'; - add_header 'Content-Security-Policy' "default-src 'none'; style-src 'self' 'unsafe-inline'; object-src 'self' 'unsafe-inline'; img-src 'self' data:;"; - include snippets/publik-gzip.conf; -} - -location / { - proxy_pass http://unix:/var/run/mandayejs/mandayejs.sock; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-SSL on; - proxy_set_header X-Forwarded-Protocol ssl; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - add_header 'X-Content-Type-Options' 'nosniff'; - add_header 'X-XSS-Protection' '1; mode=block'; - add_header 'Cache-Control' 'private'; -} \ No newline at end of file diff --git a/publik-cluster-link b/publik-cluster-link index 1c309a8..fa197ef 100755 --- a/publik-cluster-link +++ b/publik-cluster-link @@ -13,7 +13,6 @@ briques = [ 'combo', 'fargo', 'hobo', - 'mandayejs', 'passerelle', 'wcs', 'welco', diff --git a/publik-create-users b/publik-create-users index 1e4de0d..5c937b5 100755 --- a/publik-create-users +++ b/publik-create-users @@ -13,8 +13,8 @@ userlist = { 'fargo': {'uid': '2106'}, 'welco': {'uid': '2107'}, 'chrono': {'uid': '2108'}, - 'bijoe': {'uid': '2110'}, - 'mandayejs': {'uid': '2111'}, + 'bijoe': {'uid': '2110'} + # do not use uid 2111 as it is old mandaye id }