Merge branch 'master' of github.com:ASKBOT/askbot-devel

4 files changed, 14 insertions, 1 deletions

diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index d055bf5e..d75cf00b 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,8 @@ Changes in Askbot
 
 Development version
 -------------------
+* Added setting `ASKBOT_INTERNAL_IPS` - to allow anonymous access to 
+  closed sites from dedicated IP addresses (Evgeny)
 * Moved default skin from `askbot/skins/default` to simply `askbot` (Evgeny)
 * Repost comment as answer (Adolfo)
 * Question list widget (Adolfo)
diff --git a/askbot/doc/source/intranet-setup.rst b/askbot/doc/source/intranet-setup.rst
index 224ffb89..2711b376 100644
--- a/askbot/doc/source/intranet-setup.rst
+++ b/askbot/doc/source/intranet-setup.rst
@@ -12,3 +12,10 @@ Please change the following settings in your ``settings.py`` file::
 
 In addition, in the "live settings":
 * disable gravatar in "settings->User settings"
+
+If you would like to password/protect your site 
+(achievable via "access control settings" -> "allow only registered users..."),
+and at the same time be able to have some dedicated service 
+to read your site without authentication, add
+IP addresses of that service to a tuple ``ASKBOT_INTERNAL_IPS``
+in your ``settings.py`` file.
diff --git a/askbot/middleware/forum_mode.py b/askbot/middleware/forum_mode.py
index 7f1e29b1..d593a6f2 100644
--- a/askbot/middleware/forum_mode.py
+++ b/askbot/middleware/forum_mode.py
@@ -45,6 +45,10 @@ class ForumModeMiddleware(object):
                 and request.user.is_anonymous()):
             resolver_match = ResolverMatch(resolve(request.path))
 
+            internal_ips = getattr(settings, 'ASKBOT_INTERNAL_IPS', None)
+            if internal_ips and request.META['REMOTE_ADDR'] in internal_ips:
+                return None
+
             if is_view_allowed(resolver_match.func):
                 return
             
diff --git a/askbot/migrations/0137_create_groups_from_relevant_tags.py b/askbot/migrations/0137_create_groups_from_relevant_tags.py
index 8d9a55d2..0150fcbc 100644
--- a/askbot/migrations/0137_create_groups_from_relevant_tags.py
+++ b/askbot/migrations/0137_create_groups_from_relevant_tags.py
@@ -54,7 +54,7 @@ class Migration(DataMigration):
             from django.db import connection
             cursor = connection.cursor()
             cursor.execute(
-                'DROP TRIGGER group_membership_tsv_update_trigger '
+                'DROP TRIGGER IF EXISTS group_membership_tsv_update_trigger '
                 'ON askbot_groupmembership'
             )