diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2014-02-23 00:57:37 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-02-24 13:17:36 +0000 |
| commit | ff2954a1a8e76cf44cf15ba1702d5a36b86499c0 (patch) | |
| tree | 82a53b4298af8b66653df3d790b3aa5adab64e74 | |
| parent | eec81891c4d911af1a9b0afbc2ebe4f5cd445ce5 (diff) | |
| download | rspamd-ff2954a1a8e76cf44cf15ba1702d5a36b86499c0.tar.gz rspamd-ff2954a1a8e76cf44cf15ba1702d5a36b86499c0.zip | |
Ship /var/{lib,log}/rspamd in package
Conflicts:
debian/postinst
| -rw-r--r-- | debian/dirs | 2 | ||||
| -rw-r--r-- | debian/postinst | 44 |
2 files changed, 12 insertions, 34 deletions
diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 000000000..33f9176bb --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +var/lib/rspamd +var/log/rspamd diff --git a/debian/postinst b/debian/postinst index b10ca9c24..bfd3a53c4 100644 --- a/debian/postinst +++ b/debian/postinst @@ -10,35 +10,19 @@ case "$1" in SERVER_LOG=/var/log/rspamd SERVER_USER=rspamd SERVER_NAME="Rspamd spam filtering system" - SERVER_GROUP=rspamd - # create user to avoid running server as root - # 1. create group if not existing - if ! getent group | grep -q "^$SERVER_GROUP:" ; then - echo -n "Adding group $SERVER_GROUP.." - addgroup --quiet --system $SERVER_GROUP 2>/dev/null ||true - echo "..done" - fi + adduser --quiet \ + --system \ + --group \ + --home $SERVER_HOME \ + --no-create-home \ + --disabled-login \ + --gecos "$SERVER_NAME" \ + $SERVER_USER + # 2. create homedir if not existing - test -d $SERVER_HOME || mkdir $SERVER_HOME test -d $SERVER_RUN || mkdir $SERVER_RUN - test -d $SERVER_LOG || mkdir $SERVER_LOG - # 3. create user if not existing - if ! getent passwd | grep -q "^$SERVER_USER:"; then - echo -n "Adding system user $SERVER_USER.." - adduser --quiet \ - --system \ - --ingroup $SERVER_GROUP \ - --no-create-home \ - --disabled-password \ - $SERVER_USER 2>/dev/null || true - echo "..done" - fi - # 4. adjust passwd entry - usermod -c "$SERVER_NAME" \ - -d $SERVER_HOME \ - -g $SERVER_GROUP \ - $SERVER_USER + # 5. adjust file and directory permissions if ! dpkg-statoverride --list $SERVER_HOME >/dev/null then @@ -47,14 +31,6 @@ case "$1" in chmod u=rwx,g=rx,o=rx $SERVER_RUN chmod u=rwx,g=rx,o=rx $SERVER_LOG fi - # 6. Add the user to the ADDGROUP group - if test -n $ADDGROUP - then - if ! groups $SERVER_USER | cut -d: -f2 | \ - grep -qw $SERVER_GROUP; then - adduser $SERVER_USER $SERVER_GROUP - fi - fi ;; abort-*) |