diff --git a/debian/manage.py b/debian/manage.py deleted file mode 100755 index b6f8c0c..0000000 --- a/debian/manage.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python -import os -import sys - -if __name__ == "__main__": - sys.path.insert(0, '/usr/lib/wcsinstd') - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "debian_settings") - - from django.core.management import execute_from_command_line - - execute_from_command_line(sys.argv) diff --git a/debian/rules b/debian/rules index 8e4f4eb..4647c9c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --with python2 --buildsystem=python_distutils + dh $@ --with python2 diff --git a/debian/wcsinstd.install b/debian/wcsinstd.install index 49f8f14..cf0269c 100644 --- a/debian/wcsinstd.install +++ b/debian/wcsinstd.install @@ -1,3 +1,2 @@ -debian/manage.py usr/lib/wcsinstd -debian/debian_settings.py usr/lib/wcsinstd -debian/debian_wsgi.py usr/lib/wcsinstd +manage.py usr/lib/wcsinstd +debian/settings.ini etc/wcsinstd diff --git a/debian/wcsinstd.postinst b/debian/wcsinstd.postinst index 9f7f9a7..205e0b1 100644 --- a/debian/wcsinstd.postinst +++ b/debian/wcsinstd.postinst @@ -32,11 +32,6 @@ case "$1" in chown -R $WCSINSTD_USER:$WCSINSTD_GROUP $WCSINSTD_HOME/media $WCSINSTD_HOME/templates # echo -n "Initializing sqlite database.." # $WCSINSTD_INIT manage syncdb --migrate - if [ ! -f /etc/$NAME/secret ]; then - echo -n "Generating secret.." - dd if=/dev/random ibs=1 count=32 2>/dev/null >/etc/$NAME/secret - echo "..done" - fi echo -n "Generating static files.." $WCSINSTD_INIT manage collectstatic --noinput --link echo "..done" diff --git a/debian/wcsinstd.postrm b/debian/wcsinstd.postrm index 3dec606..b48bcce 100644 --- a/debian/wcsinstd.postrm +++ b/debian/wcsinstd.postrm @@ -7,7 +7,6 @@ set -e case "$1" in purge) deluser --quiet --system wcsinstd > /dev/null || true - rm -f /etc/wcsinstd/secret ;; esac