Commit 9e7b701c authored by Christophe Siraut's avatar Christophe Siraut

fix settings, dependencies for wheezy, and bypass pbuilder tests

parent 3e625d2e
...@@ -6,7 +6,8 @@ Build-Depends: debhelper (>= 9), ...@@ -6,7 +6,8 @@ Build-Depends: debhelper (>= 9),
dh-python, dh-python,
python-all (>= 2.6.6-3~), python-all (>= 2.6.6-3~),
python-sphinx, python-sphinx,
python-django (>= 1.6) python-django (>= 1.6),
python-django-debug-toolbar
Homepage: https://nuages.domainepublic.net Homepage: https://nuages.domainepublic.net
Vcs-Git: http://git.domainepublic.net/git/nuages.git/ Vcs-Git: http://git.domainepublic.net/git/nuages.git/
Vcs-Browser: http://git.domainepublic.net/?p=nuages.git Vcs-Browser: http://git.domainepublic.net/?p=nuages.git
...@@ -18,7 +19,7 @@ Depends: python, ...@@ -18,7 +19,7 @@ Depends: python,
nginx | apache2 | httpd, nginx | apache2 | httpd,
gunicorn | libapache2-mod-wsgi, gunicorn | libapache2-mod-wsgi,
python-django-registration, python-django-registration,
${python:Depends}, python-all (>= 2.6.6-3~),
${misc:Depends} ${misc:Depends}
Description: publish online polls Description: publish online polls
Nuages aims to provide a collaborative meeting poll system. Nuages aims to provide a collaborative meeting poll system.
...@@ -28,7 +29,7 @@ Description: publish online polls ...@@ -28,7 +29,7 @@ Description: publish online polls
Package: python-nuages Package: python-nuages
Section: python Section: python
Architecture: all Architecture: all
Depends: ${python:Depends}, Depends: python-all (>= 2.6.6-3~),
${misc:Depends} ${misc:Depends}
Recommends: python-ldap Recommends: python-ldap
Description: Python libraries of Nuages Description: Python libraries of Nuages
......
...@@ -19,7 +19,7 @@ case "$1" in ...@@ -19,7 +19,7 @@ case "$1" in
export DOMAIN=`hostname -d` export DOMAIN=`hostname -d`
sed "s/localdomain/${DOMAIN}/g" -i /etc/apache2/sites-available/nuages.conf sed "s/localdomain/${DOMAIN}/g" -i /etc/apache2/sites-available/nuages.conf
sed "s/localdomain/${DOMAIN}/g" -i /etc/apache2/sites-available/nuages-ssl.conf sed "s/localdomain/${DOMAIN}/g" -i /etc/apache2/sites-available/nuages-ssl.conf
[ -z "`grep -r nuages /etc/apache2/sites-enabled`" ] && ln -sf /etc/apache2/sites-available/nuages.conf /etc/apache2/sites-enabled/nuages.conf [ -z "`grep -r nuages /etc/apache2/sites-enabled/*`" ] && ln -sf /etc/apache2/sites-available/nuages.conf /etc/apache2/sites-enabled/nuages.conf
echo "You may need to configure apache." echo "You may need to configure apache."
;; ;;
esac esac
......
...@@ -27,4 +27,6 @@ override_dh_auto_install: ...@@ -27,4 +27,6 @@ override_dh_auto_install:
done done
override_dh_auto_test: override_dh_auto_test:
./manage.py test nuages meetingpoll #./manage.py test nuages meetingpoll
echo 'django-bootstrap-staticfiles not in debian repo yet'
...@@ -7,7 +7,7 @@ import socket ...@@ -7,7 +7,7 @@ import socket
DEBUG = False DEBUG = False
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
ALLOWED_HOSTS = ['.%s' % ''.join(socket.getfqdn().split('.')[1:])] ALLOWED_HOSTS = ['.%s' % '.'.join(socket.getfqdn().split('.')[1:])]
ADMINS = ( ADMINS = (
('Nuages', 'nuages@domainepublic.net'), ('Nuages', 'nuages@domainepublic.net'),
...@@ -15,12 +15,12 @@ ADMINS = ( ...@@ -15,12 +15,12 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net' DEFAULT_FROM_EMAIL = 'nuages@domainepublic.net'
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
PROJECT_DIR = os.path.dirname(os.path.dirname(__file__)) PROJECT_DIR = '/var/lib/nuages/'
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
'NAME': '/var/lib/nuages/db.sqlite', 'NAME': os.path.join(PROJECT_DIR, 'db.sqlite'),
'USER': '', 'USER': '',
'PASSWORD': '', 'PASSWORD': '',
'HOST': '', 'HOST': '',
...@@ -56,7 +56,7 @@ USE_I18N = True ...@@ -56,7 +56,7 @@ USE_I18N = True
# Absolute filesystem path to the directory that will hold user-uploaded files. # Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/" # Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = '/var/lib/nuages/www/media' MEDIA_ROOT = os.path.join(PROJECT_DIR, 'www', 'media')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a # URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash. # trailing slash.
...@@ -67,7 +67,7 @@ MEDIA_URL = '/media/' ...@@ -67,7 +67,7 @@ MEDIA_URL = '/media/'
# Don't put anything in this directory yourself; store your static files # Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS. # in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/" # Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = '/var/lib/nuages/www/staticroot' STATIC_ROOT = os.path.join(PROJECT_DIR, 'www', 'staticroot')
# URL prefix for static files. # URL prefix for static files.
# Example: "http://media.lawrence.com/static/" # Example: "http://media.lawrence.com/static/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment