- use webapps.d

Changed files:
    webapps.README -> 1.5
    webapps.sh -> 1.5

diff --git a/webapps.README b/webapps.README
index a0a1fd41857486c74db748c426f7aa428ea835d8..8413af7cd67940d7d93d2c529726f452b3549dcd 100644 (file)
--- a/webapps.README
+++ b/webapps.README
@@ -23,6 +23,6 @@ where $httpd is:
 
 additionally the webserver configuration is linked to webserver config directory
 which is
-apache 1.x: /etc/apache/webapps
-apache 2.x: /etc/httpd/webapps
-lighttpd: /etc/lighttpd/webapps
+apache 1.x: /etc/apache/webapps.d
+apache 2.x: /etc/httpd/webapps.d
+lighttpd: /etc/lighttpd/webapps.d

diff --git a/webapps.sh b/webapps.sh
index 6aa33deb9c7b40a507a16b7211c92ac66da0efd6..be3fd648845b8f63d2836728961079be4ca75e71 100644 (file)
--- a/webapps.sh
+++ b/webapps.sh
@@ -5,11 +5,11 @@ httpd="$2"
 app="$3"
 
 webapp_register() {
-       ln -sf $webapps/$app/$httpd.conf /etc/$httpd/webapps/$app.conf
+       ln -sf $webapps/$app/$httpd.conf /etc/$httpd/webapps.d/$app.conf
 }
 
 webapp_unregister() {
-       rm -f /etc/$httpd/webapps/$app.conf
+       rm -f /etc/$httpd/webapps.d/$app.conf
 }
 
 usage() {
@@ -34,8 +34,8 @@ checkconfig() {
        if [ ! -d "$webapps/$app" ]; then
                die "Missing directory: $webapps/$app"
        fi
-       if [ ! -d "/etc/$httpd/webapps" ]; then
-               die "Missing directory: /etc/$httpd/webapps"
+       if [ ! -d "/etc/$httpd/webapps.d" ]; then
+               die "Missing directory: /etc/$httpd/webapps.d"
        fi
 }