diff --git a/config.yaml b/config.yaml index 25b4e55..7df82ea 100644 --- a/config.yaml +++ b/config.yaml @@ -1,4 +1,4 @@ -baseURL: https://about.sobersupport.group/ +baseURL: https://about.sober.page/ title: Sober Page languageCode: en-us diff --git a/content/_index.md b/content/_index.md index 04d072d..55efe61 100644 --- a/content/_index.md +++ b/content/_index.md @@ -46,16 +46,6 @@ Potential uses: - Use it as your own website address (ideal with static sites) - Use sober.page as a "short url" service -Short URL ---------- - -All ``sobersupport.group`` URLs are also available via ``sober.page``. This -serves as a convenient "Short URL" which should be easier for both memory and -document spacing. - -Example: https://aaX.sober.page/meetings -redirects to https://aaX.sobersupport.group/meetings - Our Commitment -------------- diff --git a/nginx.conf b/nginx.conf index 74f9d35..1ffa688 100644 --- a/nginx.conf +++ b/nginx.conf @@ -7,11 +7,11 @@ server { } ## -# Canonical Domain: sobersupport.group -# Note: Only external redirects should be hanlded by this server block. +# Canonical Domain: sober.page +# Note: Only external redirects should be handled by this server block. ## map $host $canonical_redirect { - default https://about.sobersupport.group/unconfigured/; + default https://about.sober.page/unconfigured/; include canonical_redirects.map; } server { @@ -24,7 +24,7 @@ server { add_header Vary "Accept-Encoding"; # Forward to external domain - server_name *.sobersupport.group; + server_name *.sober.page; return 302 $canonical_redirect; # Increase cache lifetime @@ -35,7 +35,7 @@ server { } ## -# Alias: sober.page +# Backup/Alias: sobersupport.group # Note: Nearly all requests to this domain will use this server block. ## map $http_cf_visitor $cf_scheme { @@ -53,8 +53,8 @@ server { add_header Vary "Accept-Encoding"; # Forward .sober.page/ to .sobersupport.group/ - server_name ~^(?.+)\.sober\.page$; - return 301 $cf_scheme://$fwd.sobersupport.group$request_uri; + server_name ~^(?.+)\.sobersupport\.group$; + return 301 $cf_scheme://$fwd.sober.page$request_uri; # Increase cache lifetime add_header Cloudflare-CDN-Cache-Control max-age=86400; @@ -77,7 +77,7 @@ server { # Forward apex and www to about page server_name sober.page www.sober.page sobersupport.group www.sobersupport.group; - return 301 https://about.sobersupport.group$request_uri; + return 301 https://about.sober.page$request_uri; # Increase cache lifetime add_header Cloudflare-CDN-Cache-Control max-age=86400; diff --git a/sync/cloudflare.py b/sync/cloudflare.py index 0e5976a..f740ad7 100755 --- a/sync/cloudflare.py +++ b/sync/cloudflare.py @@ -60,7 +60,7 @@ def push_dns(source_data, zone=None): logging.info(f'Creating record for {subdomain}') cf.zones.dns_records.post(zone, data={ 'type': record['type'].upper(), - 'name': f'{subdomain}.sobersupport.group', + 'name': f'{subdomain}.sober.page', 'content': record['target'], 'proxied': record.get('cache', False), 'comment': 'sync-managed', @@ -73,7 +73,7 @@ def push_dns(source_data, zone=None): cf.zones.dns_records.put( zone, current_records[subdomain]['id'], data={ 'type': record['type'].upper(), - 'name': f'{subdomain}.sobersupport.group', + 'name': f'{subdomain}.sober.page', 'content': record['target'], 'proxied': record.get('cache', False), 'comment': 'sync-managed', diff --git a/sync/nginx.py b/sync/nginx.py index b99ff86..3fdc5c1 100755 --- a/sync/nginx.py +++ b/sync/nginx.py @@ -14,4 +14,4 @@ def make_map(data, path='/etc/nginx/canonical_redirects.map'): if meta['type'].lower() != 'forward': continue # Append line for external redirect - fh.write(f'{subdomain}.sobersupport.group\t{meta["target"]};\n') + fh.write(f'{subdomain}.sober.page\t{meta["target"]};\n')