Use example.tld so a single search and replace works

diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index f5ecf9d26a970b009077fa0180ac946669ef47a1..305f2aa793360dae585928b9e038ab573d001095 100644 (file)
--- 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
 

diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index 10918ed1fa2fcb19798eee0856ac135aa6e959ef..fb777983ef53eb9604da6d7ffcc1c6d12213e1e6 100644 (file)
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -4,12 +4,12 @@
 #
 # Simple installation instructions:
 # 1. Install your TLS certificate, possibly using Let's Encrypt.
-# 2. Replace 'pleroma.example.tld' with your instance's domain wherever it appears.
+# 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.
 
-Define servername pleroma.example.tld
+Define servername example.tld
 
 ServerName ${servername}
 ServerTokens Prod

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 202e4a6206ac90db8234ef4ef8499dd1793784bb..6dc2c97609f5b68a000acc14e97df70c0da23b84 100644 (file)
--- 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 'pleroma.example.tld' with your instance's domain wherever it appears.
+# 2. Replace '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,7 +10,7 @@ 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;
+    server_name    example.tld;
     listen         80;
     return         301 https://$server_name$request_uri;
 
@@ -31,9 +31,9 @@ server {
     listen 443 ssl http2;
     ssl_session_timeout 5m;
 
-    ssl_trusted_certificate   /etc/letsencrypt/live/$server_name/fullchain.pem;
-    ssl_certificate           /etc/letsencrypt/live/$server_name/fullchain.pem;
-    ssl_certificate_key       /etc/letsencrypt/live/$server_name/privkey.pem;
+    ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/fullchain.pem;
+    ssl_certificate           /etc/letsencrypt/live/example.tld/fullchain.pem;
+    ssl_certificate_key       /etc/letsencrypt/live/example.tld/privkey.pem;
 
     # Add TLSv1.0 to support older devices
     ssl_protocols TLSv1.2;
@@ -47,7 +47,7 @@ server {
     ssl_stapling on;
     ssl_stapling_verify on;
 
-    server_name pleroma.example.tld;
+    server_name example.tld;
 
     gzip_vary on;
     gzip_proxied any;