Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402380 )
Change subject: servermon: Update settings.py.erb
......................................................................
servermon: Update settings.py.erb
Bring it up to par with the current settings.py
Change-Id: Iabe0a7bbb1747ba1e433803d63165690098bd012
---
M modules/servermon/templates/settings.py.erb
1 file changed, 25 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/402380/1
diff --git a/modules/servermon/templates/settings.py.erb
b/modules/servermon/templates/settings.py.erb
index aeb1c2f..d3b31da 100644
--- a/modules/servermon/templates/settings.py.erb
+++ b/modules/servermon/templates/settings.py.erb
@@ -11,9 +11,8 @@
<%- end -%>
TEMPLATE_DEBUG = DEBUG
-# We are behind an apache httpd server, so use X-Forwarded_Host header
-USE_X_FORWARDED_HOST = True
-ALLOWED_HOSTS = ['servermon.wikimedia.org']
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '<%= @secret_key %>'
ADMINS = (
<%- if @admins -%>
@@ -35,6 +34,12 @@
'PORT' : '<%= @db_port %>', # Set to empty string for
default. Not used with sqlite3.
}
}
+
+# Hosts/domain names that are valid for this site; required if DEBUG is False
+# See https://docs.djangoproject.com/en/1.4/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['servermon.wikimedia.org']
+# We are behind an apache httpd server, so use X-Forwarded_Host header
+USE_X_FORWARDED_HOST = True
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -60,31 +65,26 @@
# If you set this to False, Django will not use timezone-aware datetimes.
USE_TZ = True
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = here('static')
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = here('staticfiles')
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com";, "http://example.com/media/";
-MEDIA_URL = '/static/'
-
-# Abuse STATIC_URL for now without having collectstatic and by having already
-# provisioned an admin directory under static
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/";
STATIC_URL = '/static/'
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/";, "/media/".
-#
-# Important: make sure to have django.contrib.admin in your INSTALLED_APPS
-#
-# serve this with e.g.
-# Alias /media /usr/share/pyshared/django/contrib/admin/media
-ADMIN_MEDIA_PREFIX = '/media/'
+# Additional locations of static files
+STATICFILES_DIRS = (here('static'), )
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '<%= @secret_key %>'
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
@@ -133,6 +133,7 @@
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
+ 'django.contrib.staticfiles',
'projectwide',
'updates',
'puppet',
--
To view, visit https://gerrit.wikimedia.org/r/402380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabe0a7bbb1747ba1e433803d63165690098bd012
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
