From: Simo Sorce <simo@redhat.com>
Date: Fri, 24 Jan 2014 20:44:04 +0000 (-0500)
Subject: Rename the main executable to idpserver.py
X-Git-Tag: v0.2.2~129
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=85149c0bc0b528d92583301119211370205e3395

Rename the main executable to idpserver.py

Based on a patch from Petr Voborni

Signed-off-by: Simo Sorce <simo@redhat.com>
---

diff --git a/ipsilon/idpserver.py b/ipsilon/idpserver.py
new file mode 100755
index 0000000..7a782d6
--- /dev/null
+++ b/ipsilon/idpserver.py
@@ -0,0 +1,65 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2013  Simo Sorce <simo@redhat.com>
+#
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+sys.stdout = sys.stderr
+
+import os
+import atexit
+import threading
+import cherrypy
+from util import plugin
+from util import data
+from util import page
+from jinja2 import Environment, FileSystemLoader
+import root
+
+cherrypy.config.update('ipsilon.conf')
+
+plugins = plugin.Plugins(path=cherrypy.config['base.dir'])
+idp_providers = plugins.get_providers()
+if idp_providers:
+    cherrypy.config['idp_providers'] = idp_providers
+
+datastore = data.Store()
+admin_config = datastore.get_admin_config()
+for option in admin_config:
+    cherrypy.config[option] = admin_config[option]
+
+templates = os.path.join(cherrypy.config['base.dir'], 'templates')
+env = Environment(loader=FileSystemLoader(templates))
+
+cherrypy.tools.protect = cherrypy.Tool('before_handler', page.protect)
+
+if __name__ == "__main__":
+    conf = { '/': {'tools.staticdir.root': os.getcwd()},
+             '/ui': { 'tools.staticdir.on': True,
+                      'tools.staticdir.dir': 'ui' }
+           }
+    cherrypy.quickstart(root.Root(env), '/', conf)
+
+else:
+    cherrypy.config['environment'] = 'embedded'
+
+    if cherrypy.__version__.startswith('3.0') and cherrypy.engine.state == 0:
+        cherrypy.engine.start(blocking=False)
+        atexit.register(cherrypy.engine.stop)
+
+    application = cherrypy.Application(root.Root(env),
+                                       script_name=None, config=None)
diff --git a/ipsilon/ipsilon.py b/ipsilon/ipsilon.py
deleted file mode 100755
index 7a782d6..0000000
--- a/ipsilon/ipsilon.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2013  Simo Sorce <simo@redhat.com>
-#
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-sys.stdout = sys.stderr
-
-import os
-import atexit
-import threading
-import cherrypy
-from util import plugin
-from util import data
-from util import page
-from jinja2 import Environment, FileSystemLoader
-import root
-
-cherrypy.config.update('ipsilon.conf')
-
-plugins = plugin.Plugins(path=cherrypy.config['base.dir'])
-idp_providers = plugins.get_providers()
-if idp_providers:
-    cherrypy.config['idp_providers'] = idp_providers
-
-datastore = data.Store()
-admin_config = datastore.get_admin_config()
-for option in admin_config:
-    cherrypy.config[option] = admin_config[option]
-
-templates = os.path.join(cherrypy.config['base.dir'], 'templates')
-env = Environment(loader=FileSystemLoader(templates))
-
-cherrypy.tools.protect = cherrypy.Tool('before_handler', page.protect)
-
-if __name__ == "__main__":
-    conf = { '/': {'tools.staticdir.root': os.getcwd()},
-             '/ui': { 'tools.staticdir.on': True,
-                      'tools.staticdir.dir': 'ui' }
-           }
-    cherrypy.quickstart(root.Root(env), '/', conf)
-
-else:
-    cherrypy.config['environment'] = 'embedded'
-
-    if cherrypy.__version__.startswith('3.0') and cherrypy.engine.state == 0:
-        cherrypy.engine.start(blocking=False)
-        atexit.register(cherrypy.engine.stop)
-
-    application = cherrypy.Application(root.Root(env),
-                                       script_name=None, config=None)