From 732d3fce73122536beaddff0d97adc650655c1fe Mon Sep 17 00:00:00 2001
From: shibayashi <shibayashi@cypherpunk.observer>
Date: Sat, 3 Nov 2018 23:44:26 +0100
Subject: [PATCH] Use the same example domain in all config examples

---
 installation/caddyfile-pleroma.example | 8 ++++----
 installation/pleroma-apache.conf       | 4 ++--
 installation/pleroma.nginx             | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

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
diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index 6174c85c0..5fc04d69f 100644
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -2,9 +2,9 @@
 #Needed modules: define headers proxy proxy_http proxy_wstunnel rewrite ssl
 #This assumes a Debian style Apache config. Put this in /etc/apache2/sites-available
 #Install your TLS certificate, possibly using Let's Encrypt.
-#Replace 'pleroma.example.com' with your instance's domain wherever it appears
+#Replace 'pleroma.example.tld' with your instance's domain wherever it appears
 
-Define servername pleroma.example.com
+Define servername pleroma.example.tld
 
 ServerName ${servername}
 ServerTokens Prod
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 94db8d685..202e4a620 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -2,7 +2,7 @@
 #
 # 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.
+# 2. Replace 'pleroma.example.tld' with your instance's domain wherever it appears.
 # 3. Copy this file to /etc/nginx/sites-available/ and then add a symlink to it
 #    in /etc/nginx/sites-enabled/ and run 'nginx -s reload' or restart nginx.
 
@@ -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;
 
 server {
+    server_name    pleroma.example.tld;
     listen         80;
-    server_name    example.tld;
     return         301 https://$server_name$request_uri;
 
     # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
@@ -47,7 +47,7 @@ server {
     ssl_stapling on;
     ssl_stapling_verify on;
 
-    server_name example.tld;
+    server_name pleroma.example.tld;
 
     gzip_vary on;
     gzip_proxied any;
-- 
2.45.2