From 7109b03fe1f543fa61242827350b86dd93ba51f8 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Fri, 22 Aug 2014 14:21:06 -0300 Subject: adding config files and certs to setup.py install --- service/config/pixelated_ua.cfg | 6 ---- service/leap/example.wazokazi.is.ca.crt | 32 ---------------------- service/pixelated/adapter/mail_service.py | 2 +- service/pixelated/certificates/__init__.py | 0 .../certificates/example.wazokazi.is.ca.crt | 32 ++++++++++++++++++++++ service/pixelated/config/__init__.py | 0 service/pixelated/config/pixelated_ua.cfg | 6 ++++ service/pixelated/user_agent.py | 2 +- service/setup.py | 3 +- 9 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 service/config/pixelated_ua.cfg delete mode 100644 service/leap/example.wazokazi.is.ca.crt create mode 100644 service/pixelated/certificates/__init__.py create mode 100644 service/pixelated/certificates/example.wazokazi.is.ca.crt create mode 100644 service/pixelated/config/__init__.py create mode 100644 service/pixelated/config/pixelated_ua.cfg (limited to 'service') diff --git a/service/config/pixelated_ua.cfg b/service/config/pixelated_ua.cfg deleted file mode 100644 index 083e1dd4..00000000 --- a/service/config/pixelated_ua.cfg +++ /dev/null @@ -1,6 +0,0 @@ -DEBUG=True -HOST="0.0.0.0" -ACCOUNT="pixelatedinboxapp@gmail.com" -PROVIDER="inboxapp" -PORT=3333 - diff --git a/service/leap/example.wazokazi.is.ca.crt b/service/leap/example.wazokazi.is.ca.crt deleted file mode 100644 index eaecc122..00000000 --- a/service/leap/example.wazokazi.is.ca.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFkzCCA3ugAwIBAgIBATANBgkqhkiG9w0BAQ0FADBcMRUwEwYDVQQKDAxMRUFQ -X0V4YW1wbGUxJDAiBgNVBAsMG2h0dHBzOi8vZXhhbXBsZS53YXpva2F6aS5pczEd -MBsGA1UEAwwUTEVBUF9FeGFtcGxlIFJvb3QgQ0EwHhcNMTQwNzIxMDAwMDAwWhcN -MjQwNzIxMDAwMDAwWjBcMRUwEwYDVQQKDAxMRUFQX0V4YW1wbGUxJDAiBgNVBAsM -G2h0dHBzOi8vZXhhbXBsZS53YXpva2F6aS5pczEdMBsGA1UEAwwUTEVBUF9FeGFt -cGxlIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDHurEo -O4oOMS/a2GFrH+scx9XfIO5RIF2IaEWqSA2I6H6JA9AC4I1t+eFbnmVfrqTgFV4G -RG6Mo4Txuiy9ZpYoFBSjtW1OkUPtoz47rW2+0UWJnd/ewIMBWeU3DcyuTe1zYWRW -NcnjKnw98tN7Bp1xWv3e1IRsrYaIyX+24db2poO9SPXheVRxBmH5aTEMpPgNhyFF -LBQ/x2ZZV7kXa7VgpJneMB4DXtgEQiEymvuI1IaeCyIRJauJ2csX6Hj1tJq6QHHj -II2xMhBVifMJNwgxlK/m1lgZHa+hNUYcpmX4w3HhB3T5OSlx0CswBIjxKbwJDmCL -77XTWnwLIUFv2XsVsSPOgz7Uj20WQaz7T7tcR/HuCS0bI8zgsWIenkVyQMKDfy5O -A9ROMyVuCmlpHRZm/j73dL5C7RfXFwV47pkuky3Xnni4JzyfafG0KdwJWnj+mSW2 -2RdCODfjSIlKhXv3CY0NhIvHQCrk9DLbeBzNKfbEzdeqNNQcakr4oEC5tbise8S4 -KJelH6dw087sCx/iXzHFKDC+zv3Cuec7PRJTYCUXX1/4wT4+14roTG80wnlGnTPG -qVs8ue/xyhLmaDSb9lx7qZkmF9QpXAGhTCN/qgJd1fZZCnpUPcMTkUWsA+4i1M2t -bo3SyVLKldRK+9WEZsnjNddRseFlRWGALtJcVQIDAQABo2AwXjAdBgNVHQ4EFgQU -3NdnpmaqlZ0/MznKHSFwe7yXW5swDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMB -Af8wHwYDVR0jBBgwFoAU3NdnpmaqlZ0/MznKHSFwe7yXW5swDQYJKoZIhvcNAQEN -BQADggIBADTrANpNMiYcoD0M7LHo8DWOdXJlFX223OO+Ev3N0wrAC8RRGs5pPVLw -GaCdOVeC/7eI7JSdwpD6ff/YUOg1K9w/w0398c2MXiaqj07PSGRBWVs7vQRNb7HQ -Pe0sU5HlZ/3mGMu1A/JJ+K1JjrBgkWxCYXjqR/70qeK/0H1A+OZOMnuDnATB4fjT -fOPOwb5ih2Gc+bt84KS19HVRM3TJ9L34K65zrXRxejTSgO+TT1DQdK7pHP7mPz+k -jMZFITsdS5RLYcw7fvaryhfDTabHEkt20gXWuYRZqMmZ3w42fBMRUziPVLKNj3+Z -ga1ZlMaBtfAzEQi2DwxjSR5PFQlWKaAXrHBqqfY1LOAyX623J5B1PzrxzBG78waI -VeofkM6ypkYVYTBP5wUXdJkhkEPubSfo5lPNdp8UJT8YpTEC0IMaHv+snalJ371n -z/x5kDBsnvVZrCxKfDiqoIF5r9ROGdk+XTgLJyXSxBmrgZWIYP6Y4MxYeY8wcM0Z -HDe8pPy9wTz6CSU8SF0hDTDiiuqIPu8mivKHmQMW5Wcn9St9hdG0ABMpPeFlNZ2b -2WIXgQzGG2d2eNFBE4FxnDLbGr4C2Eypj+LMU8/G33mF23pmg/jjxSC5lzM9ptgJ -CuTsn/EDBENx5Vxgem1dCaSvYEk6OktBSR6TrzjXmC0472HXDQJi ------END CERTIFICATE----- diff --git a/service/pixelated/adapter/mail_service.py b/service/pixelated/adapter/mail_service.py index fc8002a1..782d2dfe 100644 --- a/service/pixelated/adapter/mail_service.py +++ b/service/pixelated/adapter/mail_service.py @@ -18,7 +18,7 @@ class MailService: self.password = 'testpassword' self.server_name = 'example.wazokazi.is' self.mailbox_name = 'INBOX' - self.certs_home = os.path.join(os.path.abspath("."), "leap") + self.certs_home = os.path.join(os.path.abspath("."), "pixelated", "certificates") self.tags = Tags() self._open_leap_session() except: diff --git a/service/pixelated/certificates/__init__.py b/service/pixelated/certificates/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/service/pixelated/certificates/example.wazokazi.is.ca.crt b/service/pixelated/certificates/example.wazokazi.is.ca.crt new file mode 100644 index 00000000..eaecc122 --- /dev/null +++ b/service/pixelated/certificates/example.wazokazi.is.ca.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFkzCCA3ugAwIBAgIBATANBgkqhkiG9w0BAQ0FADBcMRUwEwYDVQQKDAxMRUFQ +X0V4YW1wbGUxJDAiBgNVBAsMG2h0dHBzOi8vZXhhbXBsZS53YXpva2F6aS5pczEd +MBsGA1UEAwwUTEVBUF9FeGFtcGxlIFJvb3QgQ0EwHhcNMTQwNzIxMDAwMDAwWhcN +MjQwNzIxMDAwMDAwWjBcMRUwEwYDVQQKDAxMRUFQX0V4YW1wbGUxJDAiBgNVBAsM +G2h0dHBzOi8vZXhhbXBsZS53YXpva2F6aS5pczEdMBsGA1UEAwwUTEVBUF9FeGFt +cGxlIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDHurEo +O4oOMS/a2GFrH+scx9XfIO5RIF2IaEWqSA2I6H6JA9AC4I1t+eFbnmVfrqTgFV4G +RG6Mo4Txuiy9ZpYoFBSjtW1OkUPtoz47rW2+0UWJnd/ewIMBWeU3DcyuTe1zYWRW +NcnjKnw98tN7Bp1xWv3e1IRsrYaIyX+24db2poO9SPXheVRxBmH5aTEMpPgNhyFF +LBQ/x2ZZV7kXa7VgpJneMB4DXtgEQiEymvuI1IaeCyIRJauJ2csX6Hj1tJq6QHHj +II2xMhBVifMJNwgxlK/m1lgZHa+hNUYcpmX4w3HhB3T5OSlx0CswBIjxKbwJDmCL +77XTWnwLIUFv2XsVsSPOgz7Uj20WQaz7T7tcR/HuCS0bI8zgsWIenkVyQMKDfy5O +A9ROMyVuCmlpHRZm/j73dL5C7RfXFwV47pkuky3Xnni4JzyfafG0KdwJWnj+mSW2 +2RdCODfjSIlKhXv3CY0NhIvHQCrk9DLbeBzNKfbEzdeqNNQcakr4oEC5tbise8S4 +KJelH6dw087sCx/iXzHFKDC+zv3Cuec7PRJTYCUXX1/4wT4+14roTG80wnlGnTPG +qVs8ue/xyhLmaDSb9lx7qZkmF9QpXAGhTCN/qgJd1fZZCnpUPcMTkUWsA+4i1M2t +bo3SyVLKldRK+9WEZsnjNddRseFlRWGALtJcVQIDAQABo2AwXjAdBgNVHQ4EFgQU +3NdnpmaqlZ0/MznKHSFwe7yXW5swDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMB +Af8wHwYDVR0jBBgwFoAU3NdnpmaqlZ0/MznKHSFwe7yXW5swDQYJKoZIhvcNAQEN +BQADggIBADTrANpNMiYcoD0M7LHo8DWOdXJlFX223OO+Ev3N0wrAC8RRGs5pPVLw +GaCdOVeC/7eI7JSdwpD6ff/YUOg1K9w/w0398c2MXiaqj07PSGRBWVs7vQRNb7HQ +Pe0sU5HlZ/3mGMu1A/JJ+K1JjrBgkWxCYXjqR/70qeK/0H1A+OZOMnuDnATB4fjT +fOPOwb5ih2Gc+bt84KS19HVRM3TJ9L34K65zrXRxejTSgO+TT1DQdK7pHP7mPz+k +jMZFITsdS5RLYcw7fvaryhfDTabHEkt20gXWuYRZqMmZ3w42fBMRUziPVLKNj3+Z +ga1ZlMaBtfAzEQi2DwxjSR5PFQlWKaAXrHBqqfY1LOAyX623J5B1PzrxzBG78waI +VeofkM6ypkYVYTBP5wUXdJkhkEPubSfo5lPNdp8UJT8YpTEC0IMaHv+snalJ371n +z/x5kDBsnvVZrCxKfDiqoIF5r9ROGdk+XTgLJyXSxBmrgZWIYP6Y4MxYeY8wcM0Z +HDe8pPy9wTz6CSU8SF0hDTDiiuqIPu8mivKHmQMW5Wcn9St9hdG0ABMpPeFlNZ2b +2WIXgQzGG2d2eNFBE4FxnDLbGr4C2Eypj+LMU8/G33mF23pmg/jjxSC5lzM9ptgJ +CuTsn/EDBENx5Vxgem1dCaSvYEk6OktBSR6TrzjXmC0472HXDQJi +-----END CERTIFICATE----- diff --git a/service/pixelated/config/__init__.py b/service/pixelated/config/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/service/pixelated/config/pixelated_ua.cfg b/service/pixelated/config/pixelated_ua.cfg new file mode 100644 index 00000000..083e1dd4 --- /dev/null +++ b/service/pixelated/config/pixelated_ua.cfg @@ -0,0 +1,6 @@ +DEBUG=True +HOST="0.0.0.0" +ACCOUNT="pixelatedinboxapp@gmail.com" +PROVIDER="inboxapp" +PORT=3333 + diff --git a/service/pixelated/user_agent.py b/service/pixelated/user_agent.py index 8737d8c6..9a87863f 100644 --- a/service/pixelated/user_agent.py +++ b/service/pixelated/user_agent.py @@ -134,7 +134,7 @@ def index(): def setup(): debug_enabled = os.environ.get('DEBUG', False) reactor_manager.start_reactor(logging=debug_enabled) - app.config.from_pyfile('../config/pixelated_ua.cfg') + app.config.from_pyfile('config/pixelated_ua.cfg') account = app.config['ACCOUNT'] app.config['DEBUG'] = debug_enabled app.run(host=app.config['HOST'], debug=debug_enabled, port=app.config['PORT']) diff --git a/service/setup.py b/service/setup.py index ca471117..ab00fb65 100644 --- a/service/setup.py +++ b/service/setup.py @@ -17,7 +17,7 @@ setup(name='Pixelated User Agent Service', author='Thoughtworks', author_email='pixelated-team@thoughtworks.com', url='http://pixelated-project.github.io', - packages=['pixelated', 'pixelated.adapter', 'pixelated.bitmask_libraries'], + packages=['pixelated', 'pixelated.adapter', 'pixelated.bitmask_libraries', 'pixelated.config', 'pixelated.certificates'], test_suite='nose.collector', install_requires=[ 'Twisted', @@ -36,7 +36,6 @@ setup(name='Pixelated User Agent Service', 'httmock', 'gunicorn' ], - package_data={'': ['config/*']}, entry_points={ 'console_scripts': [ 'pixelated-user-agent = pixelated.user_agent:setup' -- cgit v1.2.3