[Astlinux-commits] SF.net SVN: astlinux:[7207] branches/1.0/package/lighttpd

[<abe...@us...>]

Revision: 7207
          http://sourceforge.net/p/astlinux/code/7207
Author:   abelbeck
Date:     2015-08-20 17:55:03 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
lighttpd, add support for fossil

Modified Paths:
--------------
    branches/1.0/package/lighttpd/lighttpd.conf
    branches/1.0/package/lighttpd/lighttpd.init

Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf	2015-08-20 17:12:55 UTC (rev 7206)
+++ branches/1.0/package/lighttpd/lighttpd.conf	2015-08-20 17:55:03 UTC (rev 7207)
@@ -130,6 +130,12 @@
                                  "realm"   => "admin",
                                  "require" => "user=admin"
                                ),
+                               "/admin/fossil/" =>
+                               (
+                                 "method"  => "basic",
+                                 "realm"   => "admin",
+                                 "require" => "user=admin"
+                               ),
                                "/admin/monit/" =>
                                (
                                  "method"  => "basic",
@@ -161,6 +167,17 @@
 @CLI_PROXY_SERVER@                     )
 @CLI_PROXY_SERVER@}
 
+@FOSSIL_SERVER@$HTTP["scheme"] == "https" {
+@FOSSIL_SERVER@     proxy.server += ( "/admin/fossil/" =>
+@FOSSIL_SERVER@                       ( "localhost" =>
+@FOSSIL_SERVER@                         (
+@FOSSIL_SERVER@                           "host" => "127.0.0.1",
+@FOSSIL_SERVER@                           "port" => "8055"
+@FOSSIL_SERVER@                         )
+@FOSSIL_SERVER@                       )
+@FOSSIL_SERVER@                     )
+@FOSSIL_SERVER@}
+
 @MONIT_SERVER@$HTTP["scheme"] == "https" {
 @MONIT_SERVER@     proxy.server += ( "/admin/monit/" =>
 @MONIT_SERVER@                       ( "localhost" =>

Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init	2015-08-20 17:12:55 UTC (rev 7206)
+++ branches/1.0/package/lighttpd/lighttpd.init	2015-08-20 17:55:03 UTC (rev 7207)
@@ -96,6 +96,14 @@
     cli_proxy_server="#"
   fi
 
+  if [ -f /etc/init.d/fossil ]; then
+    # Always enable /admin/fossil/ proxy so fossil can be
+    # enabled/disabled without requiring a reboot via the web interface.
+    fossil_server=""
+  else
+    fossil_server="#"
+  fi
+
   if [ -f /etc/init.d/monit ]; then
     # Always enable /admin/monit/ proxy so monit can be
     # enabled/disabled without requiring a reboot via the web interface.
@@ -144,6 +152,7 @@
          -e "s|@HTTPSCGI@|${httpscgi}|g" \
          -e "s|@IPV6@|${ipv6}|g" \
          -e "s|@CLI_PROXY_SERVER@|${cli_proxy_server}|g" \
+         -e "s|@FOSSIL_SERVER@|${fossil_server}|g" \
          -e "s|@MONIT_SERVER@|${monit_server}|g" \
          -e "s|@NETSTAT_SERVER@|${netstat_server}|g" \
          -e "s|@PHONEPROV@|${phoneprov}|g" \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.