[Commits] idmgr branch master updated.

[Martin Langhoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/projects/idmgr".

The branch, master has been updated
       via  908d2d14ea5b0177053ffe09ea1f312e0739ac77 (commit)
       via  f0859ba2d082c65d820471c116283a3e454d636c (commit)
       via  26deefe9d4da501e06b95e59aa8dadc5d14def8c (commit)
      from  017a4ef1458c2d745cee8e4ce919651847765472 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 conf.schoolserver/idmgr.conf |    3 +++
 idmanager.py                 |    3 +++
 idmgr.spec.in                |    3 +++
 registration-server          |    2 +-
 4 files changed, 10 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 908d2d14ea5b0177053ffe09ea1f312e0739ac77
Merge: f0859ba... 017a4ef...
Author: Martin Langhoff <martin at laptop.org>
Date:   Thu Dec 11 15:58:12 2008 -0200

    Merge branch 'master' of git+ssh://dev.laptop.org/home/olpc-code/git/projects/idmgr
    
    Conflicts:
    
    	idmgr.spec.in

commit f0859ba2d082c65d820471c116283a3e454d636c
Author: Martin Langhoff <martin at laptop.org>
Date:   Fri Nov 14 16:07:31 2008 -0500

    rpm: make ~idmgr readable by apache and others

diff --git a/idmgr.spec.in b/idmgr.spec.in
index 08f14df..fdeb3d1 100644
--- a/idmgr.spec.in
+++ b/idmgr.spec.in
@@ -64,6 +64,9 @@ if [ ! -r /home/idmgr/storage_format_version ] || \
    echo 2 > /home/idmgr/storage_format_version
 fi
 
+# Make readable by apache and others
+chmod ugo+rx /home/idmgr
+
 /sbin/chkconfig --add idmgr
 /sbin/service idmgr condrestart
 

commit 26deefe9d4da501e06b95e59aa8dadc5d14def8c
Author: Martin Langhoff <martin at laptop.org>
Date:   Wed Oct 15 19:30:14 2008 +1300

    network: ensure we bind to a single, explicitly defined network address
    
    and make it configurable...

diff --git a/conf.schoolserver/idmgr.conf b/conf.schoolserver/idmgr.conf
index 2a1bcdc..09a55b2 100644
--- a/conf.schoolserver/idmgr.conf
+++ b/conf.schoolserver/idmgr.conf
@@ -22,5 +22,8 @@
 ## Port on which to listen
 #PORT = 8080
 
+## the network address we listen on
+# BIND_ADDRESS = 172.18.0.1
+
 ## Default working directory for the daemon.
 #WORKDIR = '/home/idmgr'
diff --git a/idmanager.py b/idmanager.py
index 7bc962c..468e0d7 100644
--- a/idmanager.py
+++ b/idmanager.py
@@ -91,6 +91,9 @@ class Config:
     ## Port on which to listen
     PORT = 8080
 
+    # should bind to only one internal address
+    BIND_ADDRESS = '172.18.0.1'
+
     ## Default working directory for the daemon.
     #WORKDIR = '/home/idmgr'
     WORKDIR = '/'
diff --git a/registration-server b/registration-server
index e4770cb..731177a 100755
--- a/registration-server
+++ b/registration-server
@@ -183,6 +183,6 @@ else:
 database = idmanager.Database(config.SQLITE3_FILE)
 
 log(syslog.LOG_NOTICE, 'Starting OLPC ID Manager')
-server = SimpleXMLRPCServer(("", config.PORT))
+server = SimpleXMLRPCServer((config.BIND_ADDRESS, config.PORT))
 server.register_function(register)
 server.serve_forever()
-----------------------------------------------------------------------


--
/home/olpc-code/git/projects/idmgr