From 5327445d44e709bd4161afed8b209773978584d5 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Tue, 20 Oct 2015 10:05:07 +0200 Subject: [PATCH] fixed now the correct section of the spec --- extras/zammad.spec | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/extras/zammad.spec b/extras/zammad.spec index d3cdbe47f..b65337552 100644 --- a/extras/zammad.spec +++ b/extras/zammad.spec @@ -29,7 +29,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %prep -/usr/bin/getent group zammad || /usr/bin/groupadd zammad /usr/bin/getent passwd zammad || /usr/sbin/useradd -g zammad -d /opt/zammad -s /bin/bash zammad #%setup @@ -58,13 +57,6 @@ tar xfj ../../SOURCES/zammad-%{version}.tar.bz2 -C $DESTROOT # copy apache2-httpd.include.conf to /etc/httpd/conf.d/zzz_otrs.conf #install -m 644 scripts/apache2-httpd.include.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/zzz_otrs.conf -# set permission -export OTRSUSER=otrs -#useradd $OTRSUSER || : -#useradd apache || : -#groupadd apache || : -#$RPM_BUILD_ROOT/opt/otrs/bin/otrs.SetPermissions.pl --web-group=apache - %pre # remember about the installed version #if test -e /opt/otrs/RELEASE; then @@ -78,15 +70,12 @@ if id $ZUSER >/dev/null 2>&1; then # update home dir usermod -d /opt/zammads $ZUSER else - useradd $ZUSER -d /opt/zammad -s /bin/bash -g zammad -c 'Zammad user' && echo "$ZUSER added." + useradd $ZUSER -U -d /opt/zammad -s /bin/bash -g zammad -c 'Zammad user' && echo "$ZUSER added." fi %post -# run OTRS rebuild config, delete cache, if the system was already in use (i.e. upgrade). -export OTRSUSER=zammad - %clean #rm -rf $RPM_BUILD_ROOT