diff options
-rw-r--r-- | client/pkg/requirements.pip | 1 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/pydist-overrides | 1 | ||||
-rwxr-xr-x | debian/rules | 1 | ||||
-rw-r--r-- | debian/soledad-server.install | 2 | ||||
-rw-r--r-- | debian/soledad-server.postinst | 30 | ||||
-rw-r--r-- | debian/soledad-server.postrm | 54 | ||||
-rw-r--r-- | debian/soledad-sudoers | 2 | ||||
-rw-r--r-- | server/pkg/requirements.pip | 2 |
9 files changed, 92 insertions, 3 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index bc92b5b9..ec7d7699 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -5,5 +5,4 @@ scrypt # repos instead. chardet zope.proxy -twisted oauth diff --git a/debian/control b/debian/control index fdb0427f..ebdf492e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: soledad Section: python Priority: optional Maintainer: Micah Anderson <micah@debian.org> -Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-python +Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9) Standards-Version: 3.9.6 Package: soledad-server diff --git a/debian/pydist-overrides b/debian/pydist-overrides index b0817d87..a577bca6 100644 --- a/debian/pydist-overrides +++ b/debian/pydist-overrides @@ -2,6 +2,7 @@ pysqlcipher python-sqlcipher PyOpenSSL python-openssl u1db python-u1db scrypt python-scrypt +cchardet python-chardet zope.proxy python-zope.proxy configparser python-configparser leap.soledad.common soledad-common diff --git a/debian/rules b/debian/rules index 75310561..88ef50b5 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ override_dh_install: cp common/src/leap/__init__.py debian/soledad-common/usr/local/lib/python$$pv/*-packages/leap/; \ cp common/src/leap/__init__.py debian/soledad-common/usr/local/lib/python$$pv/*-packages/leap/soledad/; \ done + dh_install override_dh_auto_clean: dh_auto_clean diff --git a/debian/soledad-server.install b/debian/soledad-server.install new file mode 100644 index 00000000..01342c4b --- /dev/null +++ b/debian/soledad-server.install @@ -0,0 +1,2 @@ +server/pkg/create-user-db usr/bin/ +debian/soledad-sudoers etc/sudoers.d/ diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst new file mode 100644 index 00000000..0f46caf6 --- /dev/null +++ b/debian/soledad-server.postinst @@ -0,0 +1,30 @@ +#!/bin/sh + +export PATH=/bin:/usr/bin:/sbin:/usr/sbin + +# create soledad group +getent group soledad > /dev/null +RET=$? + +if [ ! $RET -eq 0 ]; then + addgroup --system soledad +fi + +# create soledad user +id soledad > /dev/null 2>&1 +RET=$? + +if [ ! $RET -eq 0 ]; then + adduser --system soledad --no-create-home --home /srv/leap/ --ingroup soledad +fi + +# create soledad-admin user +id soledad-admin > /dev/null 2>&1 +RET=$? + +if [ ! $RET -eq 0 ]; then + adduser --system soledad-admin --no-create-home --home /srv/leap/ --ingroup soledad +fi + + +invoke-rc.d soledad-server start diff --git a/debian/soledad-server.postrm b/debian/soledad-server.postrm new file mode 100644 index 00000000..b4e5618e --- /dev/null +++ b/debian/soledad-server.postrm @@ -0,0 +1,54 @@ +#!/bin/sh +# postrm script for soledad-server +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + purge) + + # XXX some actions needed here: + # XXX remove soledad users? + # XXX remove users from sudoers? + + #for d in path1 \ + # path2 \ + # path3 ; do + # [ -d $d ] && rm -rf $d + #done + + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +# XXX kali: disabling debhelper autogenerated code for postrm ---------- +# it was causing the following error: +# postrm-contains-additional-updaterc.d-calls etc/init.d/soledad-server +# XXX DEBHELPER# +# ---------------------------------------------------------------------- + +exit 0 diff --git a/debian/soledad-sudoers b/debian/soledad-sudoers new file mode 100644 index 00000000..642497f8 --- /dev/null +++ b/debian/soledad-sudoers @@ -0,0 +1,2 @@ +Cmnd_Alias SOLEDAD_CREATE_DB = /usr/bin/create-user-db +soledad ALL=(soledad-admin) NOPASSWD: SOLEDAD_CREATE_DB diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip index c99b2715..d6430872 100644 --- a/server/pkg/requirements.pip +++ b/server/pkg/requirements.pip @@ -2,7 +2,7 @@ configparser u1db routes PyOpenSSL -twisted>=12.3.0 + Beaker couchdb |