From 276a6dee9306253ef419730a12ef032c8219cb13 Mon Sep 17 00:00:00 2001 From: Aeron R <99763-bigugly@users.noreply.framagit.org> Date: Thu, 8 Jul 2021 15:56:09 +0000 Subject: [PATCH 1/4] Update docs/install/docker.md --- docs/install/docker.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/install/docker.md b/docs/install/docker.md index 3dd7ecab..ed6755fa 100644 --- a/docs/install/docker.md +++ b/docs/install/docker.md @@ -19,8 +19,15 @@ mkdir -p /opt/gancio cd /opt/gancio ``` +- __You must have the following installed: Docker, Docker Compose and Nginx __ +1. https://docs.docker.com/engine/install/ +1. https://docs.docker.com/compose/install/ +1. https://nginx.org/en/docs/install.html + + ## Use sqlite
+ 1. **Download docker-compose.yml and Dockerfile** ```bash wget {{site.url}}{% link /docker/Dockerfile %} @@ -66,6 +73,12 @@ docker-compose up -d tail -f data/logs/gancio.log ``` +1. Navigate away from Gancio directory & into Nginx Directory +```bash +cd ~ +cd /etc/nginx +``` + 1. [Setup nginx as a proxy]({% link install/nginx.md %} 1. Point your web browser to [http://localhost:13120](http://localhost:13120) or where you specified during setup and enjoy :tada: @@ -96,4 +109,4 @@ tail -f data/logs/gancio.log ```bash cd /opt/gancio docker-compose up -d --no-deps --build -``` \ No newline at end of file +``` From 37a73149d4215f295075ea1a2305f1bdaab71fa8 Mon Sep 17 00:00:00 2001 From: Aeron R <99763-bigugly@users.noreply.framagit.org> Date: Thu, 8 Jul 2021 16:00:01 +0000 Subject: [PATCH 2/4] Update docker.md --- docs/install/docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/docker.md b/docs/install/docker.md index ed6755fa..9d168c7f 100644 --- a/docs/install/docker.md +++ b/docs/install/docker.md @@ -76,7 +76,7 @@ tail -f data/logs/gancio.log 1. Navigate away from Gancio directory & into Nginx Directory ```bash cd ~ -cd /etc/nginx +cd /etc/nginx/sites-available ``` 1. [Setup nginx as a proxy]({% link install/nginx.md %} From f68e4952c96a6d307d1f4ccebd3a0b7bea896f17 Mon Sep 17 00:00:00 2001 From: Aeron R <99763-bigugly@users.noreply.framagit.org> Date: Thu, 8 Jul 2021 16:02:57 +0000 Subject: [PATCH 3/4] Update nginx.md --- docs/install/nginx.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/install/nginx.md b/docs/install/nginx.md index 862b386d..61f38c60 100644 --- a/docs/install/nginx.md +++ b/docs/install/nginx.md @@ -13,6 +13,9 @@ Note that this does not include a cache configuration and that gancio does not use a cache control at all, if you can help with this task you're welcome. +- __You should be in the correct directory__ +`/etc/nginx/sites-available` + ```nginx server { listen 80; @@ -74,3 +77,8 @@ server { } ``` + +- __Following this, you should create a link to the file in sites-enabled:__ +```bash +ln -s /etc/nginx/sites-available/ /etc/nginx/sites-enabled/ +``` From 5bef73fbda0debdf9ee22b9d6463e21547f3c917 Mon Sep 17 00:00:00 2001 From: Aeron R <99763-bigugly@users.noreply.framagit.org> Date: Thu, 8 Jul 2021 16:04:05 +0000 Subject: [PATCH 4/4] Update nginx.md --- docs/install/nginx.md | 48 +++---------------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/docs/install/nginx.md b/docs/install/nginx.md index 61f38c60..b3847578 100644 --- a/docs/install/nginx.md +++ b/docs/install/nginx.md @@ -8,10 +8,7 @@ parent: Install ## Nginx proxy configuration -This is the default nginx configuration for gancio, please modify at least the **server_name** and **ssl_certificate**'s path. -Note that this does not include a cache configuration and that gancio does -not use a cache control at all, if you can help with this task you're -welcome. +This is the default nginx configuration for gancio, please modify at least «YOUR_DOMAIN». Note that it does not include HTTPS setup but you can easily use [certbot](https://certbot.eff.org/) for that. - __You should be in the correct directory__ `/etc/nginx/sites-available` @@ -20,62 +17,23 @@ welcome. server { listen 80; listen [::]:80; - server_name gancio.cisti.org; - root /var/www/letsencrypt; - location /.well-known/acme-challenge/ { allow all; } - location / { return 301 https://$host$request_uri; } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name gancio.cisti.org; - - ssl_protocols TLSv1.2; - ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # Uncomment these lines once you acquire a certificate: - # ssl_certificate /etc/letsencrypt/live/gancio.cisti.org/fullchain.pem; - # ssl_certificate_key /etc/letsencrypt/live/gancio.cisti.org/privkey.pem; + server_name <>; keepalive_timeout 70; sendfile on; client_max_body_size 80m; - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 6; - gzip_buffers 16 8k; - gzip_http_version 1.1; - gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; - - add_header Strict-Transport-Security "max-age=31536000"; - location / { try_files $uri @proxy; } location @proxy { proxy_set_header Host $host; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header Proxy ""; - proxy_pass_header Server; - proxy_pass http://127.0.0.1:13120; - proxy_buffering on; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - tcp_nodelay on; } } + ``` - __Following this, you should create a link to the file in sites-enabled:__