From 6c2c899d600b4264a6d2876b854672015438dbda Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Thu, 5 Mar 2009 08:24:45 +0000
Subject: Get rid of content directly under /var/www

 * Web interface files now reside under /usr/share/rapid-tunneling/www .
 * On Debian package: just remove the /var/www/support link.
 * Thus usage of apache configuration is mandatory.
 * On rpm: also restart apache.


git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@6827 283159da-0705-0410-b60c-f2062b4bb6ad
---
 rapid-tunneling.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'rapid-tunneling.spec')

diff --git a/rapid-tunneling.spec b/rapid-tunneling.spec
index 94d380f..5ed12cb 100644
--- a/rapid-tunneling.spec
+++ b/rapid-tunneling.spec
@@ -10,8 +10,6 @@ Requires: openssh-clients busybox gnupg
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%define webroot /var/www/html/support
-
 %description
 RapidTunneling (tm) allows remote access to machines behind firewalls
 and NAT routers via SSH port forwarding.
@@ -92,9 +90,9 @@ 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
+service httpd reload
 
-%preun gui
+%postun gui
 if [ "$1" = 0 ]; then
 	SUDOERS=/etc/sudoers
 	user="asterisk"
@@ -103,6 +101,7 @@ $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
+service httpd reload
 
 %files
 %defattr(-, root, root, 0755)
@@ -124,7 +123,7 @@ fi
 
 %files gui
 %defattr(-, root, root, 0755)
-%{webroot}/
+%{_datadir}/rapid-tunneling/www
 %config(noreplace) /etc/rapid-tunneling/gui.htpasswd
 %config /etc/httpd/conf.d/rapid-tunneling.conf
 
-- 
cgit v1.2.3