Revert "python3: adapt debian packaging (#40372)"
This reverts commit 4e3c28e08e.
This commit is contained in:
parent
1b6a8561ee
commit
acfe661ec6
|
|
@ -16,7 +16,7 @@
|
|||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC=authentic2
|
||||
NAME=authentic2-multitenant
|
||||
DAEMON=/usr/bin/gunicorn3
|
||||
DAEMON=/usr/bin/gunicorn
|
||||
PID_DIR=/var/run/$NAME
|
||||
CACHE_DIR=/var/cache/$NAME
|
||||
LOG_DIR=/var/log/$NAME
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ User=authentic-multitenant
|
|||
Group=authentic-multitenant
|
||||
ExecStartPre=/usr/bin/authentic2-multitenant-manage migrate_schemas --noinput
|
||||
ExecStartPre=/usr/bin/authentic2-multitenant-manage collectstatic --noinput
|
||||
ExecStart=/usr/bin/gunicorn3 \
|
||||
ExecStart=/usr/bin/gunicorn \
|
||||
--bind unix:/run/%p/%p.sock \
|
||||
--worker-class=sync \
|
||||
--workers 5 \
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC=authentic2
|
||||
NAME=authentic2
|
||||
DAEMON=/usr/bin/gunicorn3
|
||||
DAEMON=/usr/bin/gunicorn
|
||||
PID_DIR=/var/run/$NAME
|
||||
CACHE_DIR=/var/cache/$NAME
|
||||
LOG_DIR=/var/log/$NAME
|
||||
|
|
@ -129,7 +129,12 @@ do_reload() {
|
|||
|
||||
do_migrate() {
|
||||
log_action_msg "Applying new migrations .."
|
||||
su $USER -p -c "$MANAGE_SCRIPT migrate --noinput"
|
||||
VERSION=`dpkg-query --show --showformat '${Version}' python-django`
|
||||
if dpkg --compare-versions $VERSION lt 1.7; then
|
||||
su $USER -p -c "$MANAGE_SCRIPT syncdb --migrate --noinput"
|
||||
else
|
||||
su $USER -p -c "$MANAGE_SCRIPT migrate --noinput"
|
||||
fi
|
||||
log_action_msg ".. done"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,39 +2,45 @@ Source: authentic2
|
|||
Section: python
|
||||
Priority: optional
|
||||
Maintainer: Jerome Schneider <jschneider@entrouvert.com>
|
||||
Build-Depends-Indep: python3-all-dev
|
||||
Build-Depends: debhelper (>= 9), dh-python, dh-systemd, python3-setuptools, python3-django
|
||||
Standards-Version: 3.9.6
|
||||
Build-Depends-Indep: python-all-dev (>= 2.6)
|
||||
Build-Depends: debhelper (>= 9.0), python-setuptools, python-django (>= 1.5), dh-python, dh-systemd
|
||||
Standards-Version: 3.8.3
|
||||
Homepage: http://authentic.labs.libre-entreprise.org
|
||||
X-Python-Version: >= 2.7
|
||||
|
||||
Package: python3-authentic2
|
||||
Package: python-authentic2
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, ${python3:Depends},
|
||||
python3-django (>= 1:1.11),
|
||||
Depends: ${misc:Depends}, ${python:Depends},
|
||||
python-django (>= 1:1.11),
|
||||
openssl,
|
||||
python3-requests (>=2.3),
|
||||
python3-django-model-utils (>= 2.4),
|
||||
python3-lasso (>= 2.4.1.100),
|
||||
python3-dnspython (>= 1.10),
|
||||
python3-django-select2 (>= 5),
|
||||
python3-gadjo (>= 0.53),
|
||||
python3-django-tables2 (>= 1),
|
||||
python3-django-import-export (>= 1),
|
||||
python3-django-import-export (< 2),
|
||||
python3-djangorestframework (>= 3.3),
|
||||
python3-markdown (>= 2.1),
|
||||
python3-ldap (>= 2.4),
|
||||
python3-six (>= 1.0),
|
||||
python3-jwcrypto (>= 0.3.1),
|
||||
python3-cryptography (>= 1.3.4),
|
||||
python3-django-filters (>= 1),
|
||||
python3-django-filters (<< 2),
|
||||
python3-pil,
|
||||
python3-tablib,
|
||||
python3-chardet,
|
||||
python3-attr (>=17),
|
||||
python3-pycryptodome,
|
||||
python3-atomicwrites
|
||||
python-requests (>=2.3),
|
||||
python-django-model-utils (>= 2.4),
|
||||
python-lasso (>= 2.4.1.100),
|
||||
python-dnspython (>= 1.10),
|
||||
python-django-select2 (>= 5),
|
||||
python-gadjo (>= 0.53),
|
||||
python-django-tables2 (>= 1),
|
||||
python-django-import-export (>= 1),
|
||||
python-django-import-export (< 2),
|
||||
python-djangorestframework (>= 3.3),
|
||||
python-markdown (>= 2.1),
|
||||
python-ldap (>= 2.4),
|
||||
python-six (>= 1.0),
|
||||
python-jwcrypto (>= 0.3.1),
|
||||
python-cryptography (>= 1.3.4),
|
||||
python-django-filters (>= 1),
|
||||
python-django-filters (<< 2),
|
||||
python-pil,
|
||||
python-tablib,
|
||||
python-chardet,
|
||||
python-attr (>=17),
|
||||
python-pycryptodome,
|
||||
python-atomicwrites
|
||||
Breaks: python-authentic2-auth-fc (<< 0.26)
|
||||
Replaces: python-authentic2-auth-fc (<< 0.26)
|
||||
Provides: ${python:Provides}, python-authentic2-auth-fc
|
||||
Recommends: python-ldap
|
||||
Suggests: python-raven
|
||||
Description: Versatile identity server
|
||||
Authentic is a versatile identity provider aiming to address a broad
|
||||
range of needs, from simple to complex setups; it has support for many
|
||||
|
|
@ -46,9 +52,9 @@ Description: Versatile identity server
|
|||
Package: authentic2
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, adduser,
|
||||
python3-authentic2 (= ${binary:Version}),
|
||||
python3-psycopg2,
|
||||
gunicorn3, dbconfig-common,
|
||||
python-authentic2 (= ${binary:Version}),
|
||||
python-psycopg2,
|
||||
gunicorn, dbconfig-common,
|
||||
debconf | debconf-2.0, ucf
|
||||
Recommends: postgresql-client
|
||||
Suggests: nginx, postgresql
|
||||
|
|
@ -63,12 +69,12 @@ Description: Versatile identity server Python module
|
|||
Package: authentic2-multitenant
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, adduser,
|
||||
python3-authentic2 (= ${binary:Version}),
|
||||
python3-psycopg2,
|
||||
python3-django-tenant-schemas (>= 1.5.2.1),
|
||||
python3-hobo,
|
||||
python3-jwcrypto (>= 0.4.2),
|
||||
gunicorn3, dbconfig-common,
|
||||
python-authentic2 (= ${binary:Version}),
|
||||
python-psycopg2,
|
||||
python-django-tenant-schemas (>= 1.5.2.1),
|
||||
python-hobo,
|
||||
python-jwcrypto (>= 0.4.2),
|
||||
gunicorn, dbconfig-common,
|
||||
debconf | debconf-2.0, ucf
|
||||
Recommends: postgresql-client
|
||||
Suggests: nginx, postgresql
|
||||
|
|
|
|||
|
|
@ -296,6 +296,6 @@ if os.path.exists(CONFIG_FILE):
|
|||
with open(CONFIG_FILE) as fd:
|
||||
exec(fd.read())
|
||||
|
||||
# Warn if DEFAULT_FROM_EMAIL is not set
|
||||
if not locals().get('DEFAULT_FROM_EMAIL'):
|
||||
warnings.warn('DEFAULT_FROM_EMAIL must be set')
|
||||
# Warn if DEFAULT_FROM_EMAIL is the default value
|
||||
if DEFAULT_FROM_EMAIL == 'webmaster@localhost':
|
||||
warnings.warn('DEFAULT_FROM_EMAIL must be customized')
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ if [ "$(whoami)" != "authentic-multitenant" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
python3 ${MANAGE} "$@"
|
||||
python ${MANAGE} "$@"
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
django python3-django
|
||||
requests python3-requests
|
||||
django-model-utils python3-django-model-utils
|
||||
dnspython python3-dnspython
|
||||
django-select2 python3-django-select2
|
||||
django-tables python3-django-tables2
|
||||
gadjo python3-gadjo
|
||||
XStatic_jQuery python3-xstatic-jquery
|
||||
XStatic_jquery_ui python3-xstatic-jquery-ui
|
||||
django-import-export python3-django-import-export
|
||||
django-sekizai python3-django-sekizai
|
||||
six python3-six
|
||||
pycryptodome python3-pycryptodome
|
||||
ldaptools python3-ldaptools
|
||||
django-mellon python3-django-mellon
|
||||
django-ratelimit python3-django-ratelimit
|
||||
requests-oauthlib python3-requests-oauthlib
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
django python-django
|
||||
requests python-requests
|
||||
django-model-utils python-django-model-utils
|
||||
dnspython python-dnspython
|
||||
django-select2 python-django-select2
|
||||
django-tables python-django-tables2
|
||||
gadjo python-gadjo
|
||||
XStatic_jQuery python-xstatic-jquery
|
||||
XStatic_jquery_ui python-xstatic-jquery-ui
|
||||
django-import-export python-django-import-export
|
||||
six python-six
|
||||
pycryptodome python-pycryptodome
|
||||
ldaptools python-ldaptools
|
||||
django-mellon python-django-mellon
|
||||
|
|
@ -1,14 +1,12 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
export PYBUILD_DISABLE=test
|
||||
|
||||
authentic2=$(CURDIR)/debian/authentic2
|
||||
python3authentic2=$(CURDIR)/debian/python3-authentic2
|
||||
pythonauthentic2=$(CURDIR)/debian/python-authentic2
|
||||
|
||||
%:
|
||||
dh $@ --with python3,systemd --buildsystem=pybuild
|
||||
dh $@ --with python2,systemd
|
||||
|
||||
override_dh_install:
|
||||
dh_install
|
||||
mv $(CURDIR)/debian/tmp/usr/bin/authentic2-ctl $(python3authentic2)/usr/lib/authentic2/manage.py
|
||||
mv $(CURDIR)/debian/tmp/usr/bin/authentic2-ctl $(pythonauthentic2)/usr/lib/authentic2/manage.py
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue