# # # patch "hostconfig.dist" # from [4f0007567e3c414b7f514dc834c4e9c907a01643] # to [e424650acb9240555517184ffdce011a2578ebb1] # # patch "install" # from [c9701f11141d9c9ae8a8288fa704f3e098cbe0dc] # to [f653e385ea28e038157c8e60cd79894abedf16f4] # # patch "webhost.conf" # from [0d97069e21bb8e0fe5a9dccb3a99912033ec3328] # to [26ff759df1677c5fa8f4fac78e1bff91da9e8802] # ============================================================ --- hostconfig.dist 4f0007567e3c414b7f514dc834c4e9c907a01643 +++ hostconfig.dist e424650acb9240555517184ffdce011a2578ebb1 @@ -12,12 +12,12 @@ hostname "HOSTNAME" -base_url "BASE_URL" +base_url "BASEURL" -project_dir "PROJECT_DIR" +project_dir "PROJECTDIR" -graph_dir "GRAPH_DIR" +graph_dir "GRAPHDIR" -www_dir "WWW_DIR" +www_dir "WWWDIR" comment "foo" ============================================================ --- install c9701f11141d9c9ae8a8288fa704f3e098cbe0dc +++ install f653e385ea28e038157c8e60cd79894abedf16f4 @@ -116,10 +116,10 @@ -e "s!DBUSER!$DBUSER!" \ -e "s!DBPASS!$DBPASS!" \ -e "s!MONOTONE!$MONOTONE!" \ - -e "s!BASE_URL!http://$HOSTNAME/$NAME/!" \ - -e "s!PROJECT_DIR!$PROJDIR!" \ - -e "s!GRAPH_DIR!$GRAPHDIR!" \ - -e "s!WWW_DIR!$WWWDIR!" \ + -e "s!BASEURL!http://$HOSTNAME/$NAME/!" \ + -e "s!PROJECTDIR!$PROJDIR!" \ + -e "s!GRAPHDIR!$GRAPHDIR!" \ + -e "s!WWWDIR!$WWWDIR!" \ < hostconfig.dist > $CONFDIR/hostconfig.new install_file $CONFDIR/hostconfig /bin/true @@ -130,13 +130,13 @@ chmod a+x /etc/init.d/$NAME.new install_file /etc/init.d/$NAME /bin/false - sed -e "s!GRAPH_DIR!$GRAPHDIR!" \ + sed -e "s!GRAPHDIR!$GRAPHDIR!" \ -e "s!CONFDIR!$CONFDIR!" \ < webhost.cronjob > /etc/cron.daily/$NAME.new install_file /etc/cron.daily/$NAME /bin/false sed -e "s!NAME!$NAME!" \ - -e "s!WWW_DIR!$WWWDIR!" \ + -e "s!WWWDIR!$WWWDIR!" \ < webhost.conf > /etc/apache2/conf.d/$NAME.new install_file /etc/apache2/conf.d/$NAME /bin/true ============================================================ --- webhost.conf 0d97069e21bb8e0fe5a9dccb3a99912033ec3328 +++ webhost.conf 26ff759df1677c5fa8f4fac78e1bff91da9e8802 @@ -1,2 +1,2 @@ # Configuration file for Apache +Alias /webhost WWWDIR -Alias /webhost WWW_DIR