Skip to content

Commit 142e6b6

Browse files
authored
Update dev domain to devthedocs.org (#9442)
* Update dev domain to `devthedocs.org` Refs #9310 * Use short prod domain * Fix domains * Remove the www
1 parent 0c44e6f commit 142e6b6

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

docker-compose.override.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# DO NOT USE DOCKER-COMPOSE SETUP FOR PRODUCTION OR CUSTOM INSTALLATION.
66

77
# We create this network here to be able to use a static IP for NGINX.
8-
# This is needed because hitting `community.dev.readthedocs.io` from
8+
# This is needed because hitting `devthedocs.org` from
99
# any service will fail since it will resolve to 127.0.0.1, but
1010
# instead we need to hit NGINX's IP (this is used on Embed API from
1111
# -ext for example) Setting a static IP for NGINX, allow us to
@@ -35,8 +35,8 @@ services:
3535
readthedocs:
3636
ipv4_address: 10.10.0.100
3737
environment:
38-
- NGINX_WEB_SERVER_NAME=${NGINX_WEB_SERVER_NAME:-community.dev.readthedocs.io}
39-
- NGINX_PROXITO_SERVER_NAME=${NGINX_PROXITO_SERVER_NAME:-*.community.dev.readthedocs.io *.org.dev.readthedocs.build}
38+
- NGINX_WEB_SERVER_NAME=${NGINX_WEB_SERVER_NAME:-devthedocs.org}
39+
- NGINX_PROXITO_SERVER_NAME=${NGINX_PROXITO_SERVER_NAME:-*.devthedocs.org *.build.devthedocs.org}
4040

4141
proxito:
4242
image: community_server:latest
@@ -55,7 +55,7 @@ services:
5555
- DJANGO_SETTINGS_MODULE=readthedocs.settings.web_docker
5656
- HOSTIP=${HOSTIP:-}
5757
extra_hosts:
58-
- "${NGINX_WEB_SERVER_NAME:-community.dev.readthedocs.io}:10.10.0.100"
58+
- "${NGINX_WEB_SERVER_NAME:-devthedocs.org}:10.10.0.100"
5959

6060
celery:
6161
image: community_server:latest

dockerfiles/settings/celery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CeleryDevSettings(DockerBaseSettings):
77

88
# Since we can't properly set CORS on storage container
99
# trying to fetch ``objects.inv`` from celery container fails because the
10-
# URL is like http://community.dev.readthedocs.io/... and it should be
10+
# URL is like http://devthedocs.org/... and it should be
1111
# http://storage:9000/... This setting fixes that.
1212
# Once we can use CORS, we should define this setting in the
1313
# ``docker_compose.py`` file instead.

docs/dev/install.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,13 @@ Set up your environment
6565

6666
inv docker.up --init # --init is only needed the first time
6767

68-
#. Go to http://community.dev.readthedocs.io to access your local instance of Read the Docs.
69-
Because HSTS is enabled on ``*.readthedocs.io`` and because some browsers have HTTPS-only modes enabled, you should potentially use a fresh private/incognito session.
68+
#. Go to http://devthedocs.org to access your local instance of Read the Docs.
7069

7170

7271
Check that everything works
7372
---------------------------
7473

75-
#. Visit http://community.dev.readthedocs.io
76-
(if your browser automatically redirect to ``https://``, use a private/incognito session)
74+
#. Visit http://devthedocs.org
7775

7876
#. Login as ``admin`` / ``admin`` and verify that the project list appears.
7977

@@ -213,11 +211,11 @@ For others, the webhook will simply fail to connect when there are new commits t
213211
Configuring an OAuth consumer for local development on Bitbucket
214212

215213
* Configure the applications on GitHub, Bitbucket, and GitLab.
216-
For each of these, the callback URI is ``http://community.dev.readthedocs.io/accounts/<provider>/login/callback/``
214+
For each of these, the callback URI is ``http://devthedocs.org/accounts/<provider>/login/callback/``
217215
where ``<provider>`` is one of ``github``, ``gitlab``, or ``bitbucket_oauth2``.
218216
When setup, you will be given a "Client ID" (also called an "Application ID" or just "Key") and a "Secret".
219217
* Take the "Client ID" and "Secret" for each service and enter it in your local Django admin at:
220-
``http://community.dev.readthedocs.io/admin/socialaccount/socialapp/``.
218+
``http://devthedocs.org/admin/socialaccount/socialapp/``.
221219
Make sure to apply it to the "Site".
222220

223221

readthedocs/core/static-src/core/js/doc-embed/rtd-data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var configMethods = {
3838
return (
3939
(
4040
this.api_host === 'https://readthedocs.org' ||
41-
this.api_host === 'http://community.dev.readthedocs.io' ||
41+
this.api_host === 'http://devthedocs.org' ||
4242
this.api_host === 'http://127.0.0.1:8000'
4343
)
4444
&& this.ad_free !== true

readthedocs/core/static/core/js/readthedocs-doc-embed.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readthedocs/settings/docker_compose.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ class DockerBaseSettings(CommunityDevSettings):
1515
DOCKER_LIMITS = {'memory': '1g', 'time': 900}
1616
USE_SUBDOMAIN = True
1717

18-
PRODUCTION_DOMAIN = os.environ.get('RTD_PRODUCTION_DOMAIN', 'community.dev.readthedocs.io')
19-
PUBLIC_DOMAIN = PRODUCTION_DOMAIN
18+
PRODUCTION_DOMAIN = os.environ.get('RTD_PRODUCTION_DOMAIN', 'devthedocs.org')
19+
PUBLIC_DOMAIN = os.environ.get('RTD_PUBLIC_DOMAIN', 'devthedocs.org')
2020
PUBLIC_API_URL = f'http://{PRODUCTION_DOMAIN}'
2121

2222
SLUMBER_API_HOST = 'http://web:8000'
2323
SLUMBER_USERNAME = 'admin'
2424
SLUMBER_PASSWORD = 'admin'
2525

26-
RTD_EXTERNAL_VERSION_DOMAIN = 'org.dev.readthedocs.build'
26+
RTD_EXTERNAL_VERSION_DOMAIN = 'build.devthedocs.org'
2727

2828
STATIC_URL = '/static/'
2929

@@ -63,7 +63,7 @@ def RTD_EXT_THEME_DEV_SERVER_ENABLED(self):
6363
@property
6464
def RTD_EXT_THEME_DEV_SERVER(self):
6565
if self.RTD_EXT_THEME_DEV_SERVER_ENABLED:
66-
return "http://assets.community.dev.readthedocs.io:10001"
66+
return "http://assets.devthedocs.org:10001"
6767

6868
# Enable auto syncing elasticsearch documents
6969
ELASTICSEARCH_DSL_AUTOSYNC = 'SEARCH' in os.environ

0 commit comments

Comments
 (0)