From c938a1491884f57f91c5a9b96f5175de4737cf67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= Date: Mon, 12 Oct 2020 16:19:47 +0200 Subject: [PATCH 1/5] Created pixel.subdomain.conf.sample for PIXELFED For Pixelfed - Fededared image sharing --- pixel.subdomain.conf.sample | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pixel.subdomain.conf.sample diff --git a/pixel.subdomain.conf.sample b/pixel.subdomain.conf.sample new file mode 100644 index 0000000..7a88bd9 --- /dev/null +++ b/pixel.subdomain.conf.sample @@ -0,0 +1,38 @@ +# make sure that your dns has a cname set for pixel + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name pixel.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + # enable for Authelia + #include /config/nginx/authelia-server.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf + #auth_request /auth; + #error_page 401 =200 /ldaplogin; + + # enable for Authelia + #include /config/nginx/authelia-location.conf; + + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_app pixel; + set $upstream_port 80; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + } +} From 644284f44675c0064e133f214e7c6febbef17382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= Date: Mon, 19 Oct 2020 23:37:42 +0200 Subject: [PATCH 2/5] Update pixel.subdomain.conf.sample --- pixel.subdomain.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixel.subdomain.conf.sample b/pixel.subdomain.conf.sample index 7a88bd9..ce7f2ee 100644 --- a/pixel.subdomain.conf.sample +++ b/pixel.subdomain.conf.sample @@ -4,7 +4,7 @@ server { listen 443 ssl; listen [::]:443 ssl; - server_name pixel.*; + server_name pixelfed.*; include /config/nginx/ssl.conf; @@ -30,7 +30,7 @@ server { include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; - set $upstream_app pixel; + set $upstream_app pixelfed; set $upstream_port 80; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; From 6c51b1329f81afa81cb7f37ceece99d988c93233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= Date: Mon, 19 Oct 2020 23:41:34 +0200 Subject: [PATCH 3/5] Create pixelfed.subdomain.conf.sample --- pixelfed.subdomain.conf.sample | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pixelfed.subdomain.conf.sample diff --git a/pixelfed.subdomain.conf.sample b/pixelfed.subdomain.conf.sample new file mode 100644 index 0000000..90bb8c6 --- /dev/null +++ b/pixelfed.subdomain.conf.sample @@ -0,0 +1,38 @@ +# make sure that your dns has a cname set for pixelfed + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name pixelfed.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + # enable for Authelia + #include /config/nginx/authelia-server.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf + #auth_request /auth; + #error_page 401 =200 /ldaplogin; + + # enable for Authelia + #include /config/nginx/authelia-location.conf; + + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_app pixelfed; + set $upstream_port 80; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + } +} From 4cf4ddfefd13d790631f835e7e0fc44b39d84a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= Date: Mon, 19 Oct 2020 23:41:56 +0200 Subject: [PATCH 4/5] Delete pixel.subdomain.conf.sample --- pixel.subdomain.conf.sample | 38 ------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 pixel.subdomain.conf.sample diff --git a/pixel.subdomain.conf.sample b/pixel.subdomain.conf.sample deleted file mode 100644 index ce7f2ee..0000000 --- a/pixel.subdomain.conf.sample +++ /dev/null @@ -1,38 +0,0 @@ -# make sure that your dns has a cname set for pixel - -server { - listen 443 ssl; - listen [::]:443 ssl; - - server_name pixelfed.*; - - include /config/nginx/ssl.conf; - - client_max_body_size 0; - - # enable for ldap auth, fill in ldap details in ldap.conf - #include /config/nginx/ldap.conf; - - # enable for Authelia - #include /config/nginx/authelia-server.conf; - - location / { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf - #auth_request /auth; - #error_page 401 =200 /ldaplogin; - - # enable for Authelia - #include /config/nginx/authelia-location.conf; - - include /config/nginx/proxy.conf; - resolver 127.0.0.11 valid=30s; - set $upstream_app pixelfed; - set $upstream_port 80; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - } -} From 8a042c26aebd7c9be754a62c5addfc2eb81e6db9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 19 Oct 2020 18:28:47 -0400 Subject: [PATCH 5/5] pixelfed: add note about container name --- pixelfed.subdomain.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixelfed.subdomain.conf.sample b/pixelfed.subdomain.conf.sample index 90bb8c6..0284921 100644 --- a/pixelfed.subdomain.conf.sample +++ b/pixelfed.subdomain.conf.sample @@ -1,4 +1,4 @@ -# make sure that your dns has a cname set for pixelfed +# make sure that your dns has a cname set for pixelfed and the container is named pixelfed server { listen 443 ssl;