11:09 a.m.
Author: justi9
Date: 2008-02-26 12:09:41 -0500 (Tue, 26 Feb 2008)
New Revision: 1728
Added:
mgmt/cumin-test-0/etc/cumin.crt
mgmt/cumin-test-0/etc/cumin.key
mgmt/cumin/etc/cumin.crt
mgmt/cumin/etc/cumin.key
Modified:
mgmt/cumin/bin/cumin
mgmt/cumin/python/wooly/server.py
Log:
Improves the configuration of ssl certs and keys.
Adds a self-signed dummy cert that's only good for demo and
development purposes.
Modified: mgmt/cumin/bin/cumin
===================================================================
--- mgmt/cumin/bin/cumin 2008-02-26 16:42:17 UTC (rev 1727)
+++ mgmt/cumin/bin/cumin 2008-02-26 17:09:41 UTC (rev 1728)
@@ -35,6 +35,15 @@
host = socket.gethostname()
server = CuminServer(app, host, port)
+ cpath = os.path.join(home, "etc", "cumin.crt")
+ kpath = os.path.join(home, "etc", "cumin.key")
+
+ if os.path.isfile(cpath):
+ server.set_ssl_cert_path(cpath)
+
+ if os.path.isfile(kpath):
+ server.set_ssl_key_path(kpath)
+
try:
server.start()
except:
Added: mgmt/cumin/etc/cumin.crt
===================================================================
--- mgmt/cumin/etc/cumin.crt (rev 0)
+++ mgmt/cumin/etc/cumin.crt 2008-02-26 17:09:41 UTC (rev 1728)
@@ -0,0 +1,40 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC8zL7h6pevyBeme9LMDvCKEBOzKuBMr4QUsnsBdKa+DO21wZWd
+X3h/GKhV7ELgl7j/G4lZVYyy8jbFa7YlEawrTucryIv6VVCI4nKnw6KuclHP0UTm
+niENl6grDqu3s7cEom02nQTjtRAVn/2Tx+VO5b9M6u+4SNm686DdvH/7bwIDAQAB
+AoGBAJv4VVUTVX6dQZSCxLFZQjP8dhnUuPoBIY9rpxybvshQq+w0YaJh5Yyx1Rcu
+mE0samMt33jSqOqIGOFdS1syT1UFwdfN2PjoPCdwlkEefN1yOqlU3IYUs0AcU8Vt
++HZfR5nCZl0lzV8bHVTOhkYBHvsTKT1RTqd6A6gPD2WMkt4xAkEA+SdLRmxigF5i
+1E02C2D3REVgdMG/8/s+y03QD1/eYb0T8H6RsUqdPbz7TfLdjBZSGe2Lqwaluq1E
+sc4ZDEhnlwJBAMH84oKGwO4XWTVQIPqZ0yNwAyi32Wk8FsHH484beJjvexclyysC
+kDoNURq1tP4wLInAs7gYzoBLkw3sHBCCRekCQF3DCtHywdLbMkgA0oDPud3oWdc2
+fp07hLMPkmfmxRJ1DEbp6rwUfz4Xm18HMZahY748Jd5zvvSUdhCPpd94c/sCQGwp
+ES6P7fCSyiWkqM6xh/0BTnGcmLdJTrL7PfREcuhq1qngY7h2dG450Jfg6qqzt5GT
+BWHHSxRTjwm7NSarTEkCQQCzFsf/s6imADbjw17bkIwdcyIO3LC9KZzeXwvX9zjR
+ZkOMh3I9h4EYW9gxx6K3Hdsc59FaFN5bDM63nGTxHEzG
+-----END RSA PRIVATE KEY-----
+
+-----BEGIN CERTIFICATE-----
+MIIEHDCCA4WgAwIBAgIJALFw4Q2OWzQ4MA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
+VQQGEwItLTESMBAGA1UECBMJU29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTEZ
+MBcGA1UEChMQU29tZU9yZ2FuaXphdGlvbjEfMB0GA1UECxMWU29tZU9yZ2FuaXph
+dGlvbmFsVW5pdDEeMBwGA1UEAxMVbG9jYWxob3N0LmxvY2FsZG9tYWluMSkwJwYJ
+KoZIhvcNAQkBFhpyb290QGxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wODAyMjYx
+NjUwMzlaFw0wOTAyMjUxNjUwMzlaMIG7MQswCQYDVQQGEwItLTESMBAGA1UECBMJ
+U29tZVN0YXRlMREwDwYDVQQHEwhTb21lQ2l0eTEZMBcGA1UEChMQU29tZU9yZ2Fu
+aXphdGlvbjEfMB0GA1UECxMWU29tZU9yZ2FuaXphdGlvbmFsVW5pdDEeMBwGA1UE
+AxMVbG9jYWxob3N0LmxvY2FsZG9tYWluMSkwJwYJKoZIhvcNAQkBFhpyb290QGxv
+Y2FsaG9zdC5sb2NhbGRvbWFpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+vMy+4eqXr8gXpnvSzA7wihATsyrgTK+EFLJ7AXSmvgzttcGVnV94fxioVexC4Je4
+/xuJWVWMsvI2xWu2JRGsK07nK8iL+lVQiOJyp8OirnJRz9FE5p4hDZeoKw6rt7O3
+BKJtNp0E47UQFZ/9k8flTuW/TOrvuEjZuvOg3bx/+28CAwEAAaOCASQwggEgMB0G
+A1UdDgQWBBSG2ASHUAYMHesFOdIuwEP2JXLRETCB8AYDVR0jBIHoMIHlgBSG2ASH
+UAYMHesFOdIuwEP2JXLREaGBwaSBvjCBuzELMAkGA1UEBhMCLS0xEjAQBgNVBAgT
+CVNvbWVTdGF0ZTERMA8GA1UEBxMIU29tZUNpdHkxGTAXBgNVBAoTEFNvbWVPcmdh
+bml6YXRpb24xHzAdBgNVBAsTFlNvbWVPcmdhbml6YXRpb25hbFVuaXQxHjAcBgNV
+BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjEpMCcGCSqGSIb3DQEJARYacm9vdEBs
+b2NhbGhvc3QubG9jYWxkb21haW6CCQCxcOENjls0ODAMBgNVHRMEBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4GBABAhLdp86AYqfd7g1ICfeXyQK9rAvg6dAzgND6PFE0mc
+8aBYGT7vkFFv97cxxfjtDlRpjfsxdIlKxeZZ2JpP0pW6DUdn243CUZ+4g0AYSUs6
+OboH5gkG03eJGYT1w8+7F13DQFAEvEwAtf28xItlH3Y4YeXU3Z5U/mpY+Rh6vlxk
+-----END CERTIFICATE-----
Added: mgmt/cumin/etc/cumin.key
===================================================================
--- mgmt/cumin/etc/cumin.key (rev 0)
+++ mgmt/cumin/etc/cumin.key 2008-02-26 17:09:41 UTC (rev 1728)
@@ -0,0 +1 @@
+link cumin.crt
\ No newline at end of file
Property changes on: mgmt/cumin/etc/cumin.key
___________________________________________________________________
Name: svn:special
+ *
Modified: mgmt/cumin/python/wooly/server.py
===================================================================
--- mgmt/cumin/python/wooly/server.py 2008-02-26 16:42:17 UTC (rev 1727)
+++ mgmt/cumin/python/wooly/server.py 2008-02-26 17:09:41 UTC (rev 1728)
@@ -18,9 +18,13 @@
addr = (self.host, self.port)
apps = [("", self.service)]
self.__server = CherryPyWSGIServer(addr, apps)
- self.__server.ssl_certificate = None # "/tmp/localhost.crt"
- self.__server.ssl_private_key = None # "/tmp/localhost.key"
+ def set_ssl_cert_path(self, path):
+ self.__server.ssl_certificate = path
+
+ def set_ssl_key_path(self, path):
+ self.__server.ssl_private_key = path
+
def start(self):
self.__server.start()
Added: mgmt/cumin-test-0/etc/cumin.crt
===================================================================
--- mgmt/cumin-test-0/etc/cumin.crt (rev 0)
+++ mgmt/cumin-test-0/etc/cumin.crt 2008-02-26 17:09:41 UTC (rev 1728)
@@ -0,0 +1 @@
+link ../../cumin/etc/cumin.crt
\ No newline at end of file
Property changes on: mgmt/cumin-test-0/etc/cumin.crt
___________________________________________________________________
Name: svn:special
+ *
Added: mgmt/cumin-test-0/etc/cumin.key
===================================================================
--- mgmt/cumin-test-0/etc/cumin.key (rev 0)
+++ mgmt/cumin-test-0/etc/cumin.key 2008-02-26 17:09:41 UTC (rev 1728)
@@ -0,0 +1 @@
+link ../../cumin/etc/cumin.key
\ No newline at end of file
Property changes on: mgmt/cumin-test-0/etc/cumin.key
___________________________________________________________________
Name: svn:special
+ *