diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-03-04 21:37:09 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-03-04 21:37:09 +0000 |
| commit | 9df6ca1081d10c6ccb841ab436c23c3e3a067acd (patch) | |
| tree | 485fea4fad65cbfa14034a785dec271df4650f33 /rapid-tunneling.spec | |
| parent | 8d75b8882d7b94577cacd6c60cc56107a8549708 (diff) | |
rapid-tunneling: more installation fixes
* Avoid initial sudoers lecture.
* Install apache configuration on Debian.
* Don't hide errors of useradd on rapid-tunneling/redhat (copied from deb)
* Those errors were because directory /var/lib/rapid-tunneling did not
exist.
git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@6825 283159da-0705-0410-b60c-f2062b4bb6ad
Diffstat (limited to 'rapid-tunneling.spec')
| -rw-r--r-- | rapid-tunneling.spec | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/rapid-tunneling.spec b/rapid-tunneling.spec index 20047d5..94d380f 100644 --- a/rapid-tunneling.spec +++ b/rapid-tunneling.spec @@ -46,13 +46,18 @@ control tunnels to the server. %{__make} install DESTDIR=%{buildroot} %{__install} -m 755 -d %{buildroot}/etc/init.d %{__install} -m 755 sshd_support %{buildroot}/etc/init.d +# The placeholder is needed for debs, but creates an unnecessary file +# conflicts on rpm: +%{__rm} -f %{buildroot}/var/lib/rapid-tunneling/.placeholder %clean %{__rm} -rf %{buildroot} %post # add a user with uid=gid=0 -useradd -d /var/lib/rapid-tunneling/home -m -u 0 -g 0 -o rapid-tunneling 2>/dev/null || true +if ! getent passwd rapid-tunneling >/dev/null ; then + useradd -d /var/lib/rapid-tunneling/home -m -u 0 -g 0 -o rapid-tunneling +fi %preun if [ "$1" = 0 ]; then @@ -82,18 +87,21 @@ fi %post gui SUDOERS=/etc/sudoers -LINE="asterisk ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling" -LINE2="asterisk ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling-status" -if ! fgrep -q "$LINE" $SUDOERS; then echo "$LINE" >> $SUDOERS; fi -if ! fgrep -q "$LINE2" $SUDOERS; then echo "$LINE2" >> $SUDOERS; fi +user="asterisk" +TEXT="Defaults>$user !lecture +$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling +$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling-status" +if ! fgrep -q "$TEXT" $SUDOERS; then echo "$TEXT" >> $SUDOERS; fi +# FIXME: reload apache %preun gui if [ "$1" = 0 ]; then SUDOERS=/etc/sudoers - LINE="asterisk ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling" - LINE2="asterisk ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling-status" - fgrep -v "$LINE" $SUDOERS > ${SUDOERS}.tmp && cp ${SUDOERS}.tmp $SUDOERS && rm ${SUDOERS}.tmp - fgrep -v "$LINE2" $SUDOERS > ${SUDOERS}.tmp && cp ${SUDOERS}.tmp $SUDOERS && rm ${SUDOERS}.tmp + user="asterisk" + TEXT="Defaults>$user !lecture +$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling +$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling-status" + fgrep -v "$TEXT" $SUDOERS > ${SUDOERS}.tmp && cp ${SUDOERS}.tmp $SUDOERS && rm ${SUDOERS}.tmp fi %files @@ -102,6 +110,7 @@ fi %{_sbindir}/rapid-tunneling-status %{_mandir}/man8/rapid-tunneling.8* %{_mandir}/man8/rapid-tunneling-status.8* +/var/lib/rapid-tunneling %files server %defattr(-, root, root, 0755) |