From: www@jspc55 Date: Fri, 22 Nov 2013 11:06:56 +0000 (+0100) Subject: duplicated index.html/pl for httpi and apache X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=26c1b396a79399b68ccc341c7307a909c643a1cb;p=daqtools.git duplicated index.html/pl for httpi and apache --- diff --git a/web/htdocs/index.html b/web/htdocs/index.html deleted file mode 100755 index 5cf7c95..0000000 --- a/web/htdocs/index.html +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env perl - -use CGI qw/:standard/; -print "HTTP/1.0 200 OK\n"; -print header("text/html"); - -my $dn = $ENV{'PWD'}; -my $daqop = $ENV{'DAQOPSERVER'}; - -print <<"HTML_DOCUMENT" - - - - - - -DAQ Control - - - - -

DAQ Control

-Welcome to your all-round DAQ monitor and control tool. - -

Documentation

-
-The main documentation of the network can be found in these documents and locations: - -
- -

Monitoring and Control Features

-
-
-

Network & CTS

-
- -
-
- -
-

Time measurement

-
- -
-
- -
-

Front-ends

-
- -
-
- - -
-

Building Blocks

-
- -
-
- -
-

Further Tools

-
- -
-
-
- -

Server Details

-
- - - - - - - - - -
Location
$dn
DAQ OP Server
$daqop
-
- - - - -HTML_DOCUMENT -; diff --git a/web/htdocs/index.html b/web/htdocs/index.html new file mode 120000 index 0000000..d4c0f8b --- /dev/null +++ b/web/htdocs/index.html @@ -0,0 +1 @@ +index.pl \ No newline at end of file diff --git a/web/htdocs/index.pl b/web/htdocs/index.pl new file mode 100755 index 0000000..ae9ed1b --- /dev/null +++ b/web/htdocs/index.pl @@ -0,0 +1,122 @@ +#!/usr/bin/perl +if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) { + print "HTTP/1.0 200 OK\n"; + print header("text/html"); + } +else { + print "Content-type: text/html\n\n"; + } + + + + +use CGI qw/:standard/; + + +my $dn = $ENV{'PWD'}; +my $daqop = $ENV{'DAQOPSERVER'}; + +print <<"HTML_DOCUMENT" + + + + + + +DAQ Control + + + + +

DAQ Control

+Welcome to your all-round DAQ monitor and control tool. + +

Documentation

+
+The main documentation of the network can be found in these documents and locations: + +
+ +

Monitoring and Control Features

+
+
+

Network & CTS

+
+ +
+
+ +
+

Time measurement

+
+ +
+
+ +
+

Front-ends

+
+ +
+
+ + +
+

Building Blocks

+
+ +
+
+ +
+

Further Tools

+
+ +
+
+
+ +

Server Details

+
+ + + + + + + + + +
Location
$dn
DAQ OP Server
$daqop
+
+ + + + +HTML_DOCUMENT +; diff --git a/web/httpi b/web/httpi index e9a278c..d99b263 100755 --- a/web/httpi +++ b/web/httpi @@ -431,7 +431,7 @@ exit; sub nsecmodel { &log; ($x,$x,$x,$x,$uid,$gid) = stat(S); - (!$uid || !$gid || $uid < 100) && + (!$uid || !$gid || $uid < 2 ) && die "resource is root-owned, secured or not stat-able\n"; if (!$<) { ($) = "$gid $gid") || die "can't set egid to $gid";