Merge lp:~ricardokirkner/isd-sentry/small-tweaks into lp:isd-sentry

[Ricardo Kirkner]

some tweaks to the urls and config

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2012-09-18 13:43:29 +0000
+++ django_project/config/main.cfg	2012-09-19 19:47:21 +0000
@@ -1,16 +1,20 @@
 [__noschema__]
-basedir = /srv/%(hostname)s/sentry
+basedir = /srv/%(hostname)s/%(environment)s/sentry
 db_name = sentry
 db_user = postgres
 db_password =
 db_host = localhost
 db_port =
+environment = default
 hostname = localhost
 
 [django]
 authentication_backends =
     django_openid_auth.auth.OpenIDBackend
     django.contrib.auth.backends.ModelBackend
+debug = false
+email_subject_prefix = [Sentry] 
+internal_ips = 127.0.0.1
 installed_apps =
     django.contrib.auth
     django.contrib.admin
@@ -24,15 +28,24 @@
     sentry.plugins.sentry_servers
     sentry.plugins.sentry_urls
     sentry.plugins.sentry_sites
-    sentry.plugins.sentry_mail
     south
     django_openid_auth
     django_configglue
     isd_sentry
+middleware_classes =
+    django.middleware.common.CommonMiddleware
+    django.contrib.sessions.middleware.SessionMiddleware
+    django.middleware.locale.LocaleMiddleware
+    django.middleware.csrf.CsrfViewMiddleware
+    django.contrib.auth.middleware.AuthenticationMiddleware
+    sentry.middleware.SentryMiddleware
+template_debug = true
 template_dirs =
+    %(basedir)s/isd_sentry/templates
     /usr/share/pyshared/sentry/templates
-    %(basedir)s/isd_sentry/templates
-root_urlconf = urls
+time_zone = UTC
+use_l10n = true
+root_urlconf = isd_sentry.urls
 databases = {"default": {"ENGINE": "django.db.backends.postgresql_psycopg2", "NAME": "%(db_name)s", "USER": "%(db_user)s", "PASSWORD": "%(db_password)s", "HOST": "%(db_host)s", "PORT": "%(db_port)s"}}
 
 [sentry]
@@ -46,8 +59,10 @@
 sentry_public = false
 sentry_web_host = 0.0.0.0
 sentry_web_port = 9000
+sentry_web_options = {"worker_class": "sync"}
 sentry_udp_host = 0.0.0.0
 sentry_udp_port = 9001
+sentry_sample_data = false
 
 [openid]
 openid_create_users = true

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2012-09-17 18:01:44 +0000
+++ django_project/urls.py	2012-09-19 19:47:21 +0000
@@ -1,5 +1,5 @@
 from django.contrib.auth.views import logout
-from django.conf.urls.defaults import include, patterns
+from django.conf.urls.defaults import *
 
 
 urlpatterns = patterns('',

=== modified file 'isd_sentry/urls.py'
--- isd_sentry/urls.py	2012-04-13 19:58:51 +0000
+++ isd_sentry/urls.py	2012-09-19 19:47:21 +0000
@@ -1,9 +1,17 @@
 from django.contrib.auth.views import logout
-from sentry.conf.urls import *
-
-
-urlpatterns += patterns('',
+from django.conf.urls.defaults import *
+
+
+urlpatterns = patterns('',
     # OpenID views
     (r'^openid/', include('django_openid_auth.urls')),
     (r'^logout/$', logout, {'next_page': '/'}),
 )
+
+# monkey patch sentry so login requires team membership
+import sentry.web.decorators
+from isd_sentry.decorators import requires_team
+sentry.web.decorators.login_required = requires_team
+
+from sentry.conf.urls import urlpatterns as sentry_patterns
+urlpatterns += sentry_patterns