Skip to content

Commit 5726abc

Browse files
giohappygemini-code-assist[bot]mattiagiupponi
authored
Some cleanup to settings (#13723)
* Some cleanup to settings --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Mattia <[email protected]>
1 parent f395969 commit 5726abc

File tree

10 files changed

+285
-900
lines changed

10 files changed

+285
-900
lines changed

.env.sample

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ SITEURL={siteurl}/
4444
ALLOWED_HOSTS="['django', '{hostname}']"
4545

4646
# Data Uploader
47-
DEFAULT_BACKEND_UPLOADER=geonode.importer
4847
TIME_ENABLED=True
4948
MOSAIC_ENABLED=False
5049

@@ -153,7 +152,6 @@ OAUTH2_CLIENT_SECRET={clientsecret}
153152

154153
# GeoNode APIs
155154
API_LOCKDOWN=False
156-
TASTYPIE_APIKEY=
157155

158156
# #################
159157
# Production and
@@ -166,7 +164,6 @@ SECRET_KEY='{secret_key}'
166164
STATIC_ROOT=/mnt/volumes/statics/static/
167165
MEDIA_ROOT=/mnt/volumes/statics/uploaded/
168166
ASSETS_ROOT=/mnt/volumes/statics/assets/
169-
GEOIP_PATH=/mnt/volumes/statics/geoip.db
170167

171168
CACHE_BUSTING_STATIC_ENABLED=False
172169

@@ -189,7 +186,6 @@ GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
189186
MAPBOX_ACCESS_TOKEN=
190187
GOOGLE_API_KEY=
191188

192-
193189
# Other Options/Contribs
194190
MODIFY_TOPICCATEGORY=True
195191
AVATAR_GRAVATAR_SSL=True
@@ -202,15 +198,15 @@ RESOURCE_PUBLISHING=False
202198
ADMIN_MODERATE_UPLOADS=False
203199

204200
# LDAP
205-
LDAP_ENABLED=False
206-
LDAP_SERVER_URL=ldap://<the_ldap_server>
207-
LDAP_BIND_DN=uid=ldapinfo,cn=users,dc=ad,dc=example,dc=org
208-
LDAP_BIND_PASSWORD=<something_secret>
209-
LDAP_USER_SEARCH_DN=dc=ad,dc=example,dc=org
210-
LDAP_USER_SEARCH_FILTERSTR=(&(uid=%(user)s)(objectClass=person))
211-
LDAP_GROUP_SEARCH_DN=cn=groups,dc=ad,dc=example,dc=org
212-
LDAP_GROUP_SEARCH_FILTERSTR=(|(cn=abt1)(cn=abt2)(cn=abt3)(cn=abt4)(cn=abt5)(cn=abt6))
213-
LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
201+
#LDAP_ENABLED=False
202+
#LDAP_SERVER_URL=ldap://<the_ldap_server>
203+
#LDAP_BIND_DN=uid=ldapinfo,cn=users,dc=ad,dc=example,dc=org
204+
#LDAP_BIND_PASSWORD=<something_secret>
205+
#LDAP_USER_SEARCH_DN=dc=ad,dc=example,dc=org
206+
#LDAP_USER_SEARCH_FILTERSTR=(&(uid=%(user)s)(objectClass=person))
207+
#LDAP_GROUP_SEARCH_DN=cn=groups,dc=ad,dc=example,dc=org
208+
#LDAP_GROUP_SEARCH_FILTERSTR=(|(cn=abt1)(cn=abt2)(cn=abt3)(cn=abt4)(cn=abt5)(cn=abt6))
209+
#LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
214210

215211
# CELERY
216212

@@ -238,7 +234,6 @@ LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
238234
HARVESTING_MONITOR_ENABLED=True
239235
HARVESTING_MONITOR_DELAY=60
240236

241-
242237
# PostgreSQL
243238
POSTGRESQL_MAX_CONNECTIONS=200
244239

@@ -250,7 +245,4 @@ RESTART_POLICY_WINDOW=120s
250245

251246
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
252247

253-
# FORCE_READ_ONLY_MODE=False Override the read-only value saved in the configuration
254-
255-
# enable the generation of dynamic models in GeoNode
256-
IMPORTER_ENABLE_DYN_MODELS=False
248+
# FORCE_READ_ONLY_MODE=False Override the read-only value saved in the configuration

.env_dev

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ SITEURL=http://localhost:8000/
4747
ALLOWED_HOSTS="['django', '*']"
4848

4949
# Data Uploader
50-
DEFAULT_BACKEND_UPLOADER=geonode.importer
5150
TIME_ENABLED=True
5251
MOSAIC_ENABLED=False
5352

@@ -155,7 +154,6 @@ OAUTH2_CLIENT_SECRET=rCnp5txobUo83EpQEblM8fVj3QT5zb5qRfxNsuPzCqZaiRyIoxM4jdgMiZK
155154

156155
# GeoNode APIs
157156
API_LOCKDOWN=False
158-
TASTYPIE_APIKEY=
159157

160158
# #################
161159
# Production and
@@ -165,7 +163,6 @@ DEBUG=True
165163

166164
SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
167165

168-
169166
CACHE_BUSTING_STATIC_ENABLED=False
170167

171168
MEMCACHED_ENABLED=False
@@ -209,6 +206,5 @@ RESTART_POLICY_MAX_ATTEMPTS="3"
209206
RESTART_POLICY_WINDOW=120s
210207

211208
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
212-
IMPORTER_ENABLE_DYN_MODELS=True
213209
UPSERT_CHUNK_SIZE= 100
214210
UPSERT_LIMIT_ERROR_LOG=100

.env_local

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ SITEURL=http://localhost:8000/
4747
ALLOWED_HOSTS="['django', '*']"
4848

4949
# Data Uploader
50-
DEFAULT_BACKEND_UPLOADER=geonode.importer
5150
TIME_ENABLED=True
5251
MOSAIC_ENABLED=False
5352

@@ -155,7 +154,6 @@ OAUTH2_CLIENT_SECRET=rCnp5txobUo83EpQEblM8fVj3QT5zb5qRfxNsuPzCqZaiRyIoxM4jdgMiZK
155154

156155
# GeoNode APIs
157156
API_LOCKDOWN=False
158-
TASTYPIE_APIKEY=
159157

160158
# #################
161159
# Production and
@@ -167,7 +165,6 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
167165

168166
# STATIC_ROOT=/mnt/volumes/statics/static/
169167
# MEDIA_ROOT=/mnt/volumes/statics/uploaded/
170-
# GEOIP_PATH=/mnt/volumes/statics/geoip.db
171168

172169
CACHE_BUSTING_STATIC_ENABLED=False
173170

@@ -212,5 +209,3 @@ RESTART_POLICY_MAX_ATTEMPTS="3"
212209
RESTART_POLICY_WINDOW=120s
213210

214211
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
215-
216-
IMPORTER_ENABLE_DYN_MODELS=False

.env_test

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ SITEURL=http://localhost:8000/
4747
ALLOWED_HOSTS="['django', 'localhost', '127.0.0.1']"
4848

4949
# Data Uploader
50-
DEFAULT_BACKEND_UPLOADER=geonode.importer
5150
TIME_ENABLED=True
5251
MOSAIC_ENABLED=False
5352

@@ -164,7 +163,6 @@ SOCIALACCOUNT_PROVIDER=google
164163

165164
# GeoNode APIs
166165
API_LOCKDOWN=False
167-
TASTYPIE_APIKEY=
168166

169167
# #################
170168
# Production and
@@ -176,7 +174,6 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
176174

177175
STATIC_ROOT=/mnt/volumes/statics/static/
178176
MEDIA_ROOT=/mnt/volumes/statics/uploaded/
179-
GEOIP_PATH=/mnt/volumes/statics/geoip.db
180177

181178
CACHE_BUSTING_STATIC_ENABLED=False
182179

@@ -227,4 +224,3 @@ MICROSOFT_TENANT_ID=
227224
AZURE_CLIENT_ID=
228225
AZURE_SECRET_KEY=
229226
AZURE_KEY=
230-
IMPORTER_ENABLE_DYN_MODELS=False

geonode/context_processors.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ def resource_urls(request):
5454
SITEURL=settings.SITEURL,
5555
INSTALLED_APPS=settings.INSTALLED_APPS,
5656
THEME_ACCOUNT_CONTACT_EMAIL=settings.THEME_ACCOUNT_CONTACT_EMAIL,
57-
TINYMCE_DEFAULT_CONFIG=settings.TINYMCE_DEFAULT_CONFIG,
5857
PROXY_URL=getattr(settings, "PROXY_URL", "/proxy/?url="),
59-
DISPLAY_SOCIAL=getattr(settings, "DISPLAY_SOCIAL", False),
6058
DISPLAY_RATINGS=getattr(settings, "DISPLAY_RATINGS", False),
6159
DISPLAY_WMS_LINKS=getattr(settings, "DISPLAY_WMS_LINKS", True),
6260
CREATE_LAYER=getattr(settings, "CREATE_LAYER", True),
@@ -82,7 +80,6 @@ def resource_urls(request):
8280
DEFAULT_ANONYMOUS_DOWNLOAD_PERMISSION=getattr(settings, "DEFAULT_ANONYMOUS_DOWNLOAD_PERMISSION", False),
8381
EXIF_ENABLED=getattr(settings, "EXIF_ENABLED", False),
8482
FAVORITE_ENABLED=getattr(settings, "FAVORITE_ENABLED", False),
85-
SEARCH_FILTERS=getattr(settings, "SEARCH_FILTERS", False),
8683
THESAURI_FILTERS=(
8784
[
8885
t["name"]

0 commit comments

Comments
 (0)