Skip to content

Commit

Permalink
Settings: remove old settings (#10504)
Browse files Browse the repository at this point in the history
It seems we are not using them anywhere.
  • Loading branch information
humitos authored Jul 5, 2023
1 parent d7abacc commit f7d390c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 27 deletions.
8 changes: 0 additions & 8 deletions readthedocs/doc_builder/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@
DOCKER_IMAGE = settings.DOCKER_IMAGE
DOCKER_IMAGE_SETTINGS = settings.DOCKER_IMAGE_SETTINGS
DOCKER_LIMITS = settings.DOCKER_LIMITS

old_config = settings.DOCKER_BUILD_IMAGES
if old_config:
log.warning(
'Old config detected, DOCKER_BUILD_IMAGES->DOCKER_IMAGE_SETTINGS',
)
DOCKER_IMAGE_SETTINGS.update(old_config)

DOCKER_TIMEOUT_EXIT_CODE = 42
DOCKER_OOM_EXIT_CODE = 137

Expand Down
17 changes: 0 additions & 17 deletions readthedocs/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -539,16 +539,12 @@ def TEMPLATES(self):
},
}

MULTIPLE_BUILD_SERVERS = [CELERY_DEFAULT_QUEUE]

# Sentry
SENTRY_CELERY_IGNORE_EXPECTED = True

# Docker
DOCKER_ENABLE = False
DOCKER_SOCKET = 'unix:///var/run/docker.sock'
# This settings has been deprecated in favor of DOCKER_IMAGE_SETTINGS
DOCKER_BUILD_IMAGES = None

# User used to create the container.
# In production we use the same user than the one defined by the
Expand Down Expand Up @@ -923,19 +919,6 @@ def DOCKER_LIMITS(self):
GRAVATAR_DEFAULT_IMAGE = 'https://assets.readthedocs.org/static/images/silhouette.png' # NOQA
OAUTH_AVATAR_USER_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
OAUTH_AVATAR_ORG_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
RESTRUCTUREDTEXT_FILTER_SETTINGS = {
'cloak_email_addresses': True,
'file_insertion_enabled': False,
'raw_enabled': False,
'strip_comments': True,
'doctitle_xform': True,
'sectsubtitle_xform': True,
'initial_header_level': 2,
'report_level': 5,
'syntax_highlight': 'none',
'math_output': 'latex',
'field_name_limit': 50,
}
REST_FRAMEWORK = {
'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',),
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', # NOQA
Expand Down
2 changes: 0 additions & 2 deletions readthedocs/settings/docker_compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ class DockerBaseSettings(CommunityBaseSettings):
# In the local docker environment, nginx should be trusted to set the host correctly
USE_X_FORWARDED_HOST = True

MULTIPLE_BUILD_SERVERS = ['build']

# https://docs.docker.com/engine/reference/commandline/run/#add-entries-to-container-hosts-file---add-host
# export HOSTIP=`ip -4 addr show scope global dev wlp4s0 | grep inet | awk '{print \$2}' | cut -d / -f 1`
HOSTIP = os.environ.get('HOSTIP')
Expand Down

0 comments on commit f7d390c

Please sign in to comment.