From 56c49513e0f66fe6e40724c6b7f18c29263c77ca Mon Sep 17 00:00:00 2001 From: shibayashi Date: Sat, 3 Nov 2018 23:41:37 +0100 Subject: Use the server name as variable --- installation/caddyfile-pleroma.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installation/caddyfile-pleroma.example') diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example index 2c1efde2d..d74eb82b6 100644 --- a/installation/caddyfile-pleroma.example +++ b/installation/caddyfile-pleroma.example @@ -22,7 +22,7 @@ social.domain.tld { Referrer-Policy "same-origin" Strict-Transport-Security "max-age=31536000; includeSubDomains;" 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. -- cgit v1.2.3 From 732d3fce73122536beaddff0d97adc650655c1fe Mon Sep 17 00:00:00 2001 From: shibayashi Date: Sat, 3 Nov 2018 23:44:26 +0100 Subject: Use the same example domain in all config examples --- installation/caddyfile-pleroma.example | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'installation/caddyfile-pleroma.example') diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example index d74eb82b6..41a7eaa72 100644 --- a/installation/caddyfile-pleroma.example +++ b/installation/caddyfile-pleroma.example @@ -1,4 +1,4 @@ -social.domain.tld { +pleroma.example.tld { log /var/log/caddy/pleroma_access.log errors /var/log/caddy/pleroma_error.log @@ -9,7 +9,7 @@ social.domain.tld { transparent } - tls user@domain.tld { + tls user@example.tld { # Remove the rest of the lines in here, if you want to support older devices 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 @@ -29,8 +29,8 @@ social.domain.tld { # If you want to allow all origins access, remove the origin lines. # To use this directive, you need the http.cors plugin for Caddy. cors / { - origin https://halcyon.domain.tld - origin https://pinafore.domain.tld + origin https://halcyon.example.tld + origin https://pinafore.example.tld methods POST,PUT,DELETE,GET,PATCH,OPTIONS allowed_headers Authorization,Content-Type,Idempotency-Key exposed_headers Link,X-RateLimit-Reset,X-RateLimit-Limit,X-RateLimit-Remaining,X-Request-Id -- cgit v1.2.3 From 941f9a888c1d08e0e5a158956e55439631748764 Mon Sep 17 00:00:00 2001 From: shibayashi Date: Sat, 3 Nov 2018 23:59:52 +0100 Subject: Update instructions --- installation/caddyfile-pleroma.example | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'installation/caddyfile-pleroma.example') diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example index 41a7eaa72..f5ecf9d26 100644 --- a/installation/caddyfile-pleroma.example +++ b/installation/caddyfile-pleroma.example @@ -1,3 +1,9 @@ +# default Caddyfile config for Pleroma +# +# Simple installation instructions: +# 1. Replace 'pleroma.example.tld' with your instance's domain wherever it appears. +# 2. Copy this section into your Caddyfile and restart Caddy. + pleroma.example.tld { log /var/log/caddy/pleroma_access.log errors /var/log/caddy/pleroma_error.log @@ -9,7 +15,7 @@ pleroma.example.tld { transparent } - tls user@example.tld { + tls { # Remove the rest of the lines in here, if you want to support older devices 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 -- cgit v1.2.3 From 800d233631c37f75d17ddc1fbad7ac0e44366b1a Mon Sep 17 00:00:00 2001 From: shibayashi Date: Sun, 4 Nov 2018 14:06:18 +0100 Subject: Use example.tld so a single search and replace works --- installation/caddyfile-pleroma.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installation/caddyfile-pleroma.example') diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example index f5ecf9d26..305f2aa79 100644 --- a/installation/caddyfile-pleroma.example +++ b/installation/caddyfile-pleroma.example @@ -1,10 +1,10 @@ # default Caddyfile config for Pleroma # # Simple installation instructions: -# 1. Replace 'pleroma.example.tld' with your instance's domain wherever it appears. +# 1. Replace 'example.tld' with your instance's domain wherever it appears. # 2. Copy this section into your Caddyfile and restart Caddy. -pleroma.example.tld { +example.tld { log /var/log/caddy/pleroma_access.log errors /var/log/caddy/pleroma_error.log -- cgit v1.2.3