-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #70 from MeeGoIntegration/jb41409-packaging-fixes
Jb41409 packaging fixes
- Loading branch information
Showing
14 changed files
with
202 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| Define python_path /usr/lib/python2.7/site-packages/webhook_launcher | ||
| define media_path /var/www/webhook/site_media/ | ||
| Define prefix webhook | ||
|
|
||
| Listen *:8080 | ||
|
|
||
| <VirtualHost *:8080> | ||
| ServerAdmin [email protected] | ||
| ServerName webhook.example.com | ||
|
|
||
| # if not specified, the global error log is used | ||
| ErrorLog /var/log/apache2/webhook-error.log | ||
| CustomLog /var/log/apache2/webhook-access.log combined | ||
|
|
||
| WSGIDaemonProcess webhook | ||
| WSGIProcessGroup webhook | ||
| # Pass Authorisation for use in the API calls | ||
| WSGIPassAuthorization On | ||
|
|
||
| WSGIScriptAlias / ${python_path}/wsgi.py | ||
| <Directory "${python_path}"> | ||
| <Files wsgi.py> | ||
| Require all granted | ||
| </Files> | ||
| </Directory> | ||
|
|
||
| Alias /${prefix}/site_media/ ${media_path} | ||
| <Directory "${media_path}"> | ||
| Require all granted | ||
| </Directory> | ||
|
|
||
| </VirtualHost> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,57 +2,55 @@ | |
| # Copyright (C) 2013 Jolla Ltd. | ||
| # Contact: Islam Amer <[email protected]> | ||
| # All rights reserved. | ||
| # | ||
| # | ||
| # 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 2 | ||
| # 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, write to the Free Software | ||
| # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
|
|
||
| import os, sys | ||
| from distutils.core import setup | ||
|
|
||
| from setuptools import find_packages | ||
|
|
||
| static_files=[('/etc/skynet', ['src/webhook_launcher/webhook.conf']), | ||
| ('/usr/share/webhook_launcher/processes', | ||
| ['src/webhook_launcher/processes/VCSCOMMIT_NOTIFY', | ||
| 'src/webhook_launcher/processes/VCSCOMMIT_BUILD', | ||
| 'src/webhook_launcher/processes/VCSCOMMIT_QUEUE', | ||
| ] | ||
| ) | ||
| ] | ||
| from setuptools import setup | ||
|
|
||
| setup( | ||
| name = "webhook_launcher", | ||
| version = "0.2.0", | ||
| url = '', | ||
| license = 'GPLv2', | ||
| description = "webhook launcher", | ||
| author = 'Islam Amer <[email protected]>', | ||
| packages = ['webhook_launcher', | ||
| 'webhook_launcher.app', | ||
| 'webhook_launcher.app.templatetags', | ||
| 'webhook_launcher.app.migrations', | ||
| 'webhook_launcher.app.management', | ||
| 'webhook_launcher.app.management.commands', | ||
| ], | ||
| package_dir = {'':'src'}, | ||
| package_data = { 'webhook_launcher.app' : ['templates/admin/*.html', | ||
| 'templates/app/*.html', | ||
| 'static/images/*.png', | ||
| 'static/*.gif', | ||
| 'static/*.css', | ||
| 'static/*.js', | ||
| ] | ||
| }, | ||
| data_files = static_files, | ||
| name="webhook_launcher", | ||
| version="0.2.0", | ||
| url='', | ||
| license='GPLv2', | ||
| description="webhook launcher", | ||
| author='Islam Amer <[email protected]>', | ||
| packages=[ | ||
| 'webhook_launcher', | ||
| 'webhook_launcher.app', | ||
| 'webhook_launcher.app.templatetags', | ||
| 'webhook_launcher.app.migrations', | ||
| 'webhook_launcher.app.management', | ||
| 'webhook_launcher.app.management.commands', | ||
| ], | ||
| package_dir={'': 'src'}, | ||
| package_data={ | ||
| 'webhook_launcher.app': [ | ||
| 'templates/admin/*.html', | ||
| 'templates/app/*.html', | ||
| 'static/images/*.png', | ||
| 'static/*.gif', | ||
| 'static/*.css', | ||
| 'static/*.js', | ||
| ] | ||
| }, | ||
| data_files=[ | ||
| ('/etc/skynet', ['src/webhook_launcher/webhook.conf']), | ||
| ('/usr/share/webhook_launcher/processes', [ | ||
| 'src/webhook_launcher/processes/VCSCOMMIT_NOTIFY', | ||
| 'src/webhook_launcher/processes/VCSCOMMIT_BUILD', | ||
| 'src/webhook_launcher/processes/VCSCOMMIT_QUEUE', | ||
| ]), | ||
| ], | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.