summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-03-05 08:24:45 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-03-05 08:24:45 +0000
commit6c2c899d600b4264a6d2876b854672015438dbda (patch)
tree429e44e3ef7311f5251abc3c2f7349fc27dc88a3 /debian
parent256af4c843ad8e46d8a3660a3665389bf3b70eff (diff)
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
Diffstat (limited to 'debian')
-rw-r--r--debian/TODO.Debian5
-rw-r--r--debian/control6
-rw-r--r--debian/rapid-tunneling-gui.links1
3 files changed, 5 insertions, 7 deletions
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 04c9fc0..b152052 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -4,11 +4,6 @@
If we do, we must use the current useradd command. If we don't: use
adduser. The web interface only assumes that there's such a user.
* Do we delete users on purge?
-* A symlink under /var/www is only good as a quick hack.
- According to the draft webapps policy we should not rely on /var/www/
- to be the web root. But this means that the package will not work out
- of the box. Anybody who I asked seems to dismiss this issue. I don't.
- http://webapps-common.alioth.debian.org/draft/html/ch-httpd.html#s-httpd-register-symlinks
* Reload the httpd after installing the GUI package for the password to take
effect.
* This password doesn't buy us much, anyway.
diff --git a/debian/control b/debian/control
index dd136da..213d6ce 100644
--- a/debian/control
+++ b/debian/control
@@ -27,11 +27,15 @@ Description: RapidTunneling (tm) server
Package: rapid-tunneling-gui
Architecture: all
-Depends: ${misc:Depends}, rapid-tunneling, sudo,
+Depends: ${misc:Depends}, rapid-tunneling, sudo,
libapache2-mod-php5 | php5-cgi | libapache-mod-php5
+Recommends: apache2
Description: Xorcom RapidTunneling (tm) web GUI
RapidTunneling (tm) allows remote access to machines behind firewalls
and NAT routers via SSH port forwarding.
.
This package contains the web-based user interface to initiate and
control tunnels to the server.
+ .
+ Should work with any httpd that supports PHP, but any one other than
+ apache2 will require manual configuration.
diff --git a/debian/rapid-tunneling-gui.links b/debian/rapid-tunneling-gui.links
index b1f383a..4857aea 100644
--- a/debian/rapid-tunneling-gui.links
+++ b/debian/rapid-tunneling-gui.links
@@ -1,2 +1 @@
-/usr/share/rapid-tunneling/www /var/www/support
/etc/rapid-tunneling/apache2-rapid-tunneling.conf /etc/apache2/conf.d/rapid-tunneling.conf