updated docker runsv script

updated install.sh
updated setup.py
This commit is contained in:
Matthew Scragg 2014-09-18 23:12:57 -05:00
parent 88134dbdce
commit 813d7cfc51
4 changed files with 9 additions and 6 deletions

View file

@ -1,7 +1,9 @@
#!/bin/sh #!/bin/sh
chdir /home/deploy/realms-wiki
if [ "${REALMS_WIKI_CONFIG}" != "" ]; then if [ "${REALMS_WIKI_CONFIG}" != "" ]; then
realms-wiki configure ${REALMS_WIKI_CONFIG} realms-wiki configure ${REALMS_WIKI_CONFIG}
fi fi
exec /sbin/setuser deploy realms-wiki run >>/var/log/realms-wiki/realms-wiki.log 2>&1 exec /sbin/setuser deploy /home/deploy/realms-wiki/.venv/bin/python realms-wiki run >>/var/log/realms-wiki/realms-wiki.log 2>&1

View file

@ -53,7 +53,11 @@ sudo -iu ${APP_USER} virtualenv ${APP_DIR}/.venv
sudo -iu ${APP_USER} ${APP_DIR}/.venv/bin/pip install ${APP_DIR} sudo -iu ${APP_USER} ${APP_DIR}/.venv/bin/pip install ${APP_DIR}
echo "Installing start scripts" echo "Installing start scripts"
sudo ln -s ${APP_DIR}/.venv/bin/realms-wiki /usr/local/bin/realms-wiki cat << EOF > /usr/local/bin/realms-wiki
#!/bin/bash
${APP_DIR}/.venv/bin/python ${APP_DIR}/manage.py "\$@"
EOF
sudo chmod +x /usr/local/bin/realms-wiki sudo chmod +x /usr/local/bin/realms-wiki
cat << EOF > /etc/init/realms-wiki.conf cat << EOF > /etc/init/realms-wiki.conf

View file

@ -1,5 +1,3 @@
#!/usr/bin/env python
from gevent import wsgi from gevent import wsgi
from realms import config, app, cli, db from realms import config, app, cli, db
from realms.lib.util import random_string from realms.lib.util import random_string

View file

@ -8,7 +8,7 @@ with open('README.md') as f:
with open('requirements.txt') as f: with open('requirements.txt') as f:
required = f.read().splitlines() required = f.read().splitlines()
VERSION = '0.1.8' VERSION = '0.1.9'
CLASSIFIERS = [ CLASSIFIERS = [
'Intended Audience :: Developers', 'Intended Audience :: Developers',
@ -21,7 +21,6 @@ setup(name='realms-wiki',
version=VERSION, version=VERSION,
packages=find_packages(), packages=find_packages(),
install_requires=required, install_requires=required,
scripts=['realms-wiki'],
author='Matthew Scragg', author='Matthew Scragg',
author_email='scragg@gmail.com', author_email='scragg@gmail.com',
maintainer='Matthew Scragg', maintainer='Matthew Scragg',