python3: adapt debian packaging (#40372)
This commit is contained in:
parent
95fa3f1af9
commit
7ef148e0c5
|
|
@ -16,7 +16,7 @@
|
|||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC=authentic2
|
||||
NAME=authentic2-multitenant
|
||||
DAEMON=/usr/bin/gunicorn
|
||||
DAEMON=/usr/bin/gunicorn3
|
||||
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/gunicorn \
|
||||
ExecStart=/usr/bin/gunicorn3 \
|
||||
--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/gunicorn
|
||||
DAEMON=/usr/bin/gunicorn3
|
||||
PID_DIR=/var/run/$NAME
|
||||
CACHE_DIR=/var/cache/$NAME
|
||||
LOG_DIR=/var/log/$NAME
|
||||
|
|
|
|||
|
|
@ -1,108 +1,5 @@
|
|||
authentic2 (2.0.2.293.g51cfb00-1) stable; urgency=low
|
||||
authentic2 (2.46) stable; urgency=low
|
||||
|
||||
* Update to last mast commit
|
||||
* Python3 packaging
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Tue, 06 Aug 2013 10:54:59 +0200
|
||||
|
||||
authentic2 (2.0.2.292.ga6ad42e-1) stable; urgency=low
|
||||
|
||||
* Update to last mast commit
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Thu, 01 Aug 2013 18:00:18 +0200
|
||||
|
||||
authentic2 (2.0.2.291.g2b09e18-1) stable; urgency=low
|
||||
|
||||
* Update to last mast commit
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Thu, 01 Aug 2013 17:25:20 +0200
|
||||
|
||||
authentic2 (2.0.2.289.gce06aec-1) stable; urgency=low
|
||||
|
||||
* Update to last mast commit
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Thu, 01 Aug 2013 17:05:50 +0200
|
||||
|
||||
authentic2 (2.0.2.232.g37e9606-1) stable; urgency=low
|
||||
|
||||
* Update to last mast commit
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Fri, 28 Jun 2013 17:24:03 +0200
|
||||
|
||||
authentic2 (2.0.2.220.gcde5387-2) stable; urgency=low
|
||||
|
||||
* complete configuration file
|
||||
* complete apache example
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Wed, 19 Jun 2013 11:20:20 +0200
|
||||
|
||||
authentic2 (2.0.2.220.gcde5387-1) stable; urgency=low
|
||||
|
||||
* update to last master commit
|
||||
* move manage.py to /usr/lib/authentic2 to follow :
|
||||
http://wiki.debian.org/DjangoPackagingDraft
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Tue, 18 Jun 2013 18:02:30 +0200
|
||||
|
||||
authentic2 (2.0.2.214.g4e64a8e-4) stable; urgency=low
|
||||
|
||||
* authentic.conf: replace ENGINE by DATABASE_ENGINE
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Tue, 18 Jun 2013 16:21:52 +0200
|
||||
|
||||
authentic2 (2.0.2.214.g4e64a8e-3) unstable; urgency=low
|
||||
|
||||
* change south dependency
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Tue, 18 Jun 2013 13:42:56 +0200
|
||||
|
||||
authentic2 (2.0.2.214.g4e64a8e-2) unstable; urgency=low
|
||||
|
||||
* Split into two packages : authentic2 and python-authentic2
|
||||
* Add authentic2 postrm to delete authentic user
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Sat, 15 Jun 2013 16:09:37 +0200
|
||||
|
||||
authentic2 (2.0.2.214.g4e64a8e-1) unstable; urgency=low
|
||||
|
||||
* update to last upstream commit
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Sat, 15 Jun 2013 09:57:51 +0200
|
||||
|
||||
authentic2 (2.0.2.212.g41b7e09-3) unstable; urgency=low
|
||||
|
||||
* debian: fix postinst
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Sat, 15 Jun 2013 09:49:30 +0200
|
||||
|
||||
authentic2 (2.0.2.212.g41b7e09-2) unstable; urgency=low
|
||||
|
||||
* debian: add adduser dependency
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Fri, 14 Jun 2013 22:14:38 +0200
|
||||
|
||||
authentic2 (2.0.2.212.g41b7e09-1) stable; urgency=low
|
||||
|
||||
* using environment variables for the configuration
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Fri, 14 Jun 2013 15:49:31 +0200
|
||||
|
||||
authentic2 (2.0.2.199.g5ddda2a-1) unstable; urgency=low
|
||||
|
||||
* debian: add mission local_config.py
|
||||
* fix setup.py
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Thu, 13 Jun 2013 20:33:09 +0200
|
||||
|
||||
authentic2 (2.0.2.196.g8409882-1) unstable; urgency=low
|
||||
|
||||
* debian: port to squeeze
|
||||
* debian: add an init script
|
||||
* debian: add static files
|
||||
|
||||
-- Jérôme Schneider <jschneider@entrouvert.com> Thu, 13 Jun 2013 17:14:30 +0200
|
||||
|
||||
authentic2 (1.9.0-0) unstable; urgency=low
|
||||
|
||||
* Initial packaging.
|
||||
|
||||
-- Frederic Peters <fpeters@debian.org> Tue, 01 Jun 2010 14:28:56 +0200
|
||||
-- Benjamin Dauvergne <bdauvergne@entrouvert.com> Mon, 25 May 2020 10:54:59 +0200
|
||||
|
|
|
|||
|
|
@ -2,44 +2,46 @@ Source: authentic2
|
|||
Section: python
|
||||
Priority: optional
|
||||
Maintainer: Benjamin Dauvergne <bdauvergne@entrouvert.com>
|
||||
Build-Depends-Indep: python-all-dev (>= 2.6)
|
||||
Build-Depends: debhelper (>= 9.0), python-setuptools, python-django (>= 1:1.11), dh-python, dh-systemd
|
||||
Build-Depends-Indep: python3-all-dev
|
||||
Build-Depends: debhelper (>= 9), dh-python, dh-systemd, python3-setuptools, python3-django
|
||||
Standards-Version: 3.9.6
|
||||
Homepage: http://dev.entrouvert.org/projects/authentic/
|
||||
|
||||
Package: python-authentic2
|
||||
Package: python3-authentic2
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, ${python:Depends},
|
||||
python-django (>= 1:1.11),
|
||||
Depends: ${misc:Depends}, ${python3:Depends},
|
||||
python3-django (>= 1:1.11),
|
||||
openssl,
|
||||
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
|
||||
python3-requests (>=2.3),
|
||||
python3-requests-oauthlib,
|
||||
python3-django-model-utils (>= 2.4),
|
||||
python3-django-model-utils (<< 4),
|
||||
python3-lasso (>= 2.4.1.100),
|
||||
python3-dnspython (>= 1.10),
|
||||
python3-django-select2 (>= 5),
|
||||
python3-django-select2 (<< 6),
|
||||
python3-django-ratelimit,
|
||||
python3-gadjo (>= 0.53),
|
||||
python3-django-tables2 (>= 1),
|
||||
python3-django-import-export (>= 1),
|
||||
python3-django-import-export (<< 2),
|
||||
python3-djangorestframework (>= 3.3),
|
||||
python3-djangorestframework (<< 3.10),
|
||||
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.3),
|
||||
python3-pil,
|
||||
python3-tablib,
|
||||
python3-chardet,
|
||||
python3-attr (>=17),
|
||||
python3-pycryptodome,
|
||||
python3-atomicwrites
|
||||
Conflicts: python-authentic2
|
||||
Replaces: python-authentic2
|
||||
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
|
||||
|
|
@ -51,9 +53,9 @@ Description: Versatile identity server
|
|||
Package: authentic2
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, adduser,
|
||||
python-authentic2 (= ${binary:Version}),
|
||||
python-psycopg2,
|
||||
gunicorn, dbconfig-common,
|
||||
python3-authentic2 (= ${binary:Version}),
|
||||
python3-psycopg2,
|
||||
gunicorn3, dbconfig-common,
|
||||
debconf | debconf-2.0, ucf
|
||||
Recommends: postgresql-client
|
||||
Suggests: nginx, postgresql
|
||||
|
|
@ -68,12 +70,12 @@ Description: Versatile identity server Python module
|
|||
Package: authentic2-multitenant
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, adduser,
|
||||
python-authentic2 (= ${binary:Version}),
|
||||
python-psycopg2,
|
||||
python-django-tenant-schemas (>= 1.5.2.1),
|
||||
python-hobo,
|
||||
python-jwcrypto (>= 0.4.2),
|
||||
gunicorn, dbconfig-common,
|
||||
python3-authentic2 (= ${binary:Version}),
|
||||
python3-psycopg2,
|
||||
python3-django-tenant-schemas (>= 1.5.2.1),
|
||||
python3-hobo,
|
||||
python3-jwcrypto (>= 0.4.2),
|
||||
gunicorn3,
|
||||
debconf | debconf-2.0, ucf
|
||||
Recommends: postgresql-client
|
||||
Suggests: nginx, postgresql
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ if [ "$(whoami)" != "authentic-multitenant" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
python ${MANAGE} "$@"
|
||||
python3 ${MANAGE} "$@"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
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
|
||||
jwcrypto python3-jwcrypto
|
||||
xstatic_select2 python3-xstatic-select2
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
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
|
||||
|
|
@ -4,8 +4,8 @@ export PYBUILD_NAME=authentic2
|
|||
export PYBUILD_DISABLE=test
|
||||
|
||||
%:
|
||||
dh $@ --with python2,systemd --buildsystem=pybuild
|
||||
dh $@ --with python3,systemd --buildsystem=pybuild
|
||||
|
||||
override_dh_install:
|
||||
dh_install
|
||||
mv $(CURDIR)/debian/python-authentic2/usr/bin/authentic2-ctl $(CURDIR)/debian/python-authentic2/usr/lib/authentic2/manage.py
|
||||
mv $(CURDIR)/debian/python3-authentic2/usr/bin/authentic2-ctl $(CURDIR)/debian/python3-authentic2/usr/lib/authentic2/manage.py
|
||||
|
|
|
|||
Loading…
Reference in New Issue