Updates from clean install

First batch of updates

Makefile

@@ -20,6 +20,12 @@ env:
 	cd deps && hg clone http://hg.mozilla.org/services/server-core
 	cd deps/server-core && ../../$(PYTHON) setup.py install
 
+install: 
+	mkdir -p /etc/notifserver/
+	cp etc/notifserver/* /etc/notifserver/
+	echo "nginx NOT auto-configured."
+	echo "Please see etc/nginx/nginx.conf.diff for changes."
+
 clean-env:
 	rm -rf bin build deps include lib lib64
 

etc/nginx/conf.d/astatic.conf

@@ -0,0 +1,6 @@
+location ^~ /s/ {
+    allow all;
+    alias /home/jconlin/src/moz_push/notifserver/static/;
+}
+
+

etc/nginx/conf.d/notifserver.conf

@@ -0,0 +1,18 @@
+#Admin interface 
+location /__admin__ {
+    allow 10.0.0.0/8;
+    deny all;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+    proxy_pass http://localhost:8000;
+}
+
+# Main handler (for all other URLs)
+location / {
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+    proxy_pass http://localhost:8000;
+}
+

etc/nginx/nginx.conf.diff

@@ -0,0 +1,21 @@
+7c7
+< error_log  /var/logs/nginx/error.log info;
+---
+> #error_log  logs/error.log  info;
+36c36
+<         listen       80 default;
+---
+>         listen       80;
+39,40d38
+<         include /etc/nginx/conf.d/*.conf;
+< 
+45,48c43,46
+<        # location / {
+<        #     root   html;
+<        #     index  index.html index.htm;
+<        # }
+---
+>         location / {
+>             root   html;
+>             index  index.html index.htm;
+>         }

notifserver/auth/browserid.py

@@ -21,7 +21,11 @@ def __init__(self, *args, **kw):
     def authenticate_user(self, user_name, password, request = None):
         """ Return a validated user id """
         if password is None:
-            return None
+            # Perhaps the UI folks messed up. Try to get the 
+            # assertion from the arguments.
+            if request.params.get('assertion', None) is None:
+               return None
+            password = request.params.get('assertion')
         try:
             if request:
                 self.environ = request.environ

notifserver/controllers/uiagent.py

@@ -112,7 +112,8 @@ def index(self, request, **kw):
             # display login page
            template = self.get_template("not_logged_in")
         else:
-            self.client_agent.new_queue(request)
+            # Create the user queue if necessary.
+            self.client_agent.user_queue(request)
             template = self.get_template("logged_in")
             response['user_info'] = self.msg_backend.user_info(username)
             response['subscriptions'] = self.msg_backend.get_queues(username)

start.sh

@@ -1,2 +1,2 @@
-#bin/gunicorn -w1 notifserver.run -t 3000 --log-file - --log-level info
-bin/paster serve etc/notifserver/production.ini
+bin/gunicorn -w1 notifserver.run -t 3000 --log-file - --log-level info
+#bin/paster serve etc/notifserver/production.ini