Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'
Use the same example domain and use it as variable See merge request pleroma/pleroma!423
This commit is contained in:
commit
0f6c4635a6
|
@ -1,4 +1,10 @@
|
||||||
social.domain.tld {
|
# default Caddyfile config for Pleroma
|
||||||
|
#
|
||||||
|
# Simple installation instructions:
|
||||||
|
# 1. Replace 'example.tld' with your instance's domain wherever it appears.
|
||||||
|
# 2. Copy this section into your Caddyfile and restart Caddy.
|
||||||
|
|
||||||
|
example.tld {
|
||||||
log /var/log/caddy/pleroma_access.log
|
log /var/log/caddy/pleroma_access.log
|
||||||
errors /var/log/caddy/pleroma_error.log
|
errors /var/log/caddy/pleroma_error.log
|
||||||
|
|
||||||
|
@ -9,7 +15,7 @@ social.domain.tld {
|
||||||
transparent
|
transparent
|
||||||
}
|
}
|
||||||
|
|
||||||
tls user@domain.tld {
|
tls {
|
||||||
# Remove the rest of the lines in here, if you want to support older devices
|
# Remove the rest of the lines in here, if you want to support older devices
|
||||||
key_type p256
|
key_type p256
|
||||||
ciphers ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256
|
ciphers ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256
|
||||||
|
@ -22,15 +28,15 @@ social.domain.tld {
|
||||||
Referrer-Policy "same-origin"
|
Referrer-Policy "same-origin"
|
||||||
Strict-Transport-Security "max-age=31536000; includeSubDomains;"
|
Strict-Transport-Security "max-age=31536000; includeSubDomains;"
|
||||||
Expect-CT "enforce, max-age=2592000"
|
Expect-CT "enforce, max-age=2592000"
|
||||||
Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://social.domain.tld; upgrade-insecure-requests;"
|
Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://{host}; upgrade-insecure-requests;"
|
||||||
}
|
}
|
||||||
|
|
||||||
# If you do not want remote frontends to be able to access your Pleroma backend server, remove these lines.
|
# If you do not want remote frontends to be able to access your Pleroma backend server, remove these lines.
|
||||||
# If you want to allow all origins access, remove the origin lines.
|
# If you want to allow all origins access, remove the origin lines.
|
||||||
# To use this directive, you need the http.cors plugin for Caddy.
|
# To use this directive, you need the http.cors plugin for Caddy.
|
||||||
cors / {
|
cors / {
|
||||||
origin https://halcyon.domain.tld
|
origin https://halcyon.example.tld
|
||||||
origin https://pinafore.domain.tld
|
origin https://pinafore.example.tld
|
||||||
methods POST,PUT,DELETE,GET,PATCH,OPTIONS
|
methods POST,PUT,DELETE,GET,PATCH,OPTIONS
|
||||||
allowed_headers Authorization,Content-Type,Idempotency-Key
|
allowed_headers Authorization,Content-Type,Idempotency-Key
|
||||||
exposed_headers Link,X-RateLimit-Reset,X-RateLimit-Limit,X-RateLimit-Remaining,X-Request-Id
|
exposed_headers Link,X-RateLimit-Reset,X-RateLimit-Limit,X-RateLimit-Remaining,X-Request-Id
|
||||||
|
|
|
@ -1,24 +1,31 @@
|
||||||
#Example configuration for when Apache httpd and Pleroma are on the same host.
|
# default Apache site config for Pleroma
|
||||||
#Needed modules: headers proxy proxy_http proxy_wstunnel rewrite ssl
|
#
|
||||||
#This assumes a Debian style Apache config. Put this in /etc/apache2/sites-available
|
# needed modules: define headers proxy proxy_http proxy_wstunnel rewrite ssl
|
||||||
#Install your TLS certificate, possibly using Let's Encrypt.
|
#
|
||||||
#Replace 'pleroma.example.com' with your instance's domain wherever it appears
|
# Simple installation instructions:
|
||||||
|
# 1. Install your TLS certificate, possibly using Let's Encrypt.
|
||||||
|
# 2. Replace 'example.tld' with your instance's domain wherever it appears.
|
||||||
|
# 3. This assumes a Debian style Apache config. Copy this file to
|
||||||
|
# /etc/apache2/sites-available/ and then add a symlink to it in
|
||||||
|
# /etc/apache2/sites-enabled/ by running 'a2ensite pleroma-apache.conf', then restart Apache.
|
||||||
|
|
||||||
ServerName pleroma.example.com
|
Define servername example.tld
|
||||||
|
|
||||||
|
ServerName ${servername}
|
||||||
ServerTokens Prod
|
ServerTokens Prod
|
||||||
|
|
||||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
ErrorLog ${APACHE_LOG_DIR}/error.log
|
||||||
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||||
|
|
||||||
<VirtualHost *:80>
|
<VirtualHost *:80>
|
||||||
Redirect permanent / https://pleroma.example.com
|
Redirect permanent / https://${servername}
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
<VirtualHost *:443>
|
<VirtualHost *:443>
|
||||||
SSLEngine on
|
SSLEngine on
|
||||||
SSLCertificateFile /etc/letsencrypt/live/pleroma.example.com/cert.pem
|
SSLCertificateFile /etc/letsencrypt/live/${servername}/cert.pem
|
||||||
SSLCertificateKeyFile /etc/letsencrypt/live/pleroma.example.com/privkey.pem
|
SSLCertificateKeyFile /etc/letsencrypt/live/${servername}/privkey.pem
|
||||||
SSLCertificateChainFile /etc/letsencrypt/live/pleroma.example.com/fullchain.pem
|
SSLCertificateChainFile /etc/letsencrypt/live/${servername}/fullchain.pem
|
||||||
|
|
||||||
# Mozilla modern configuration, tweak to your needs
|
# Mozilla modern configuration, tweak to your needs
|
||||||
SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
|
SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
|
||||||
|
@ -31,7 +38,7 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||||
Header always set X-Frame-Options "DENY"
|
Header always set X-Frame-Options "DENY"
|
||||||
Header always set X-Content-Type-Options "nosniff"
|
Header always set X-Content-Type-Options "nosniff"
|
||||||
Header always set Referrer-Policy same-origin
|
Header always set Referrer-Policy same-origin
|
||||||
Header always set Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://pleroma.example.tld; upgrade-insecure-requests;"
|
Header always set Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://${servername}; upgrade-insecure-requests;"
|
||||||
|
|
||||||
# Uncomment this only after you get HTTPS working.
|
# Uncomment this only after you get HTTPS working.
|
||||||
# Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"
|
# Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"
|
||||||
|
@ -45,7 +52,7 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||||
ProxyPass / http://localhost:4000/
|
ProxyPass / http://localhost:4000/
|
||||||
ProxyPassReverse / http://localhost:4000/
|
ProxyPassReverse / http://localhost:4000/
|
||||||
|
|
||||||
RequestHeader set Host "pleroma.example.com"
|
RequestHeader set Host ${servername}
|
||||||
ProxyPreserveHost On
|
ProxyPreserveHost On
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
@ -53,4 +60,4 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||||
SSLUseStapling on
|
SSLUseStapling on
|
||||||
SSLStaplingResponderTimeout 5
|
SSLStaplingResponderTimeout 5
|
||||||
SSLStaplingReturnResponderErrors off
|
SSLStaplingReturnResponderErrors off
|
||||||
SSLStaplingCache shmcb:/var/run/ocsp(128000)
|
SSLStaplingCache shmcb:/var/run/ocsp(128000)
|
||||||
|
|
|
@ -10,8 +10,8 @@ proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cac
|
||||||
inactive=720m use_temp_path=off;
|
inactive=720m use_temp_path=off;
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
|
||||||
server_name example.tld;
|
server_name example.tld;
|
||||||
|
listen 80;
|
||||||
return 301 https://$server_name$request_uri;
|
return 301 https://$server_name$request_uri;
|
||||||
|
|
||||||
# Uncomment this if you need to use the 'webroot' method with certbot. Make sure
|
# Uncomment this if you need to use the 'webroot' method with certbot. Make sure
|
||||||
|
@ -46,7 +46,7 @@ server {
|
||||||
ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
|
ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
|
||||||
ssl_stapling on;
|
ssl_stapling on;
|
||||||
ssl_stapling_verify on;
|
ssl_stapling_verify on;
|
||||||
|
|
||||||
server_name example.tld;
|
server_name example.tld;
|
||||||
|
|
||||||
gzip_vary on;
|
gzip_vary on;
|
||||||
|
@ -77,8 +77,8 @@ server {
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
add_header Referrer-Policy "same-origin" always;
|
add_header Referrer-Policy "same-origin" always;
|
||||||
add_header X-Download-Options "noopen" always;
|
add_header X-Download-Options "noopen" always;
|
||||||
add_header Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action *; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://example.tld; upgrade-insecure-requests;" always;
|
add_header Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action *; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://$server_name; upgrade-insecure-requests;" always;
|
||||||
|
|
||||||
# Uncomment this only after you get HTTPS working.
|
# Uncomment this only after you get HTTPS working.
|
||||||
# add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
|
# add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue