diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-08-22 14:21:06 -0300 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-08-22 14:22:27 -0300 |
| commit | 7109b03fe1f543fa61242827350b86dd93ba51f8 (patch) | |
| tree | 86869c3742e552cb0dc205e54ca9752045bf34c0 | |
| parent | 4685e3d8e6188951a897c25a4772ef227eb27683 (diff) | |
adding config files and certs to setup.py install
| -rw-r--r-- | service/pixelated/adapter/mail_service.py | 2 | ||||
| -rw-r--r-- | service/pixelated/certificates/__init__.py | 0 | ||||
| -rw-r--r-- | service/pixelated/certificates/example.wazokazi.is.ca.crt (renamed from service/leap/example.wazokazi.is.ca.crt) | 0 | ||||
| -rw-r--r-- | service/pixelated/config/__init__.py | 0 | ||||
| -rw-r--r-- | service/pixelated/config/pixelated_ua.cfg (renamed from service/config/pixelated_ua.cfg) | 0 | ||||
| -rw-r--r-- | service/pixelated/user_agent.py | 2 | ||||
| -rw-r--r-- | service/setup.py | 3 |
7 files changed, 3 insertions, 4 deletions
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 --- /dev/null +++ b/service/pixelated/certificates/__init__.py diff --git a/service/leap/example.wazokazi.is.ca.crt b/service/pixelated/certificates/example.wazokazi.is.ca.crt index eaecc122..eaecc122 100644 --- a/service/leap/example.wazokazi.is.ca.crt +++ b/service/pixelated/certificates/example.wazokazi.is.ca.crt diff --git a/service/pixelated/config/__init__.py b/service/pixelated/config/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/service/pixelated/config/__init__.py diff --git a/service/config/pixelated_ua.cfg b/service/pixelated/config/pixelated_ua.cfg index 083e1dd4..083e1dd4 100644 --- a/service/config/pixelated_ua.cfg +++ b/service/pixelated/config/pixelated_ua.cfg 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' |