update webserver setup dependency

diff --git a/myfai-chboot b/myfai-chboot
index f732642dffa0811756e4df8bb79f0ede01ea9d3c..f65175a17234923bfed4716831a6108a5384fea5 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -13,7 +13,7 @@ Sets up tftp pxe config and nfs server on host "faiserver".
 
 If our kernel has no nfs support, uses apache, and depends on another
 repo of Ian Kelling, basic-https-conf, where the file is at
 
 If our kernel has no nfs support, uses apache, and depends on another
 repo of Ian Kelling, basic-https-conf, where the file is at

-/a/exe/apache-site.
+/a/exe/web-conf.

 
 Usng this, you can boot into fai with pxe-kexec without changing
 the dhcp server.
 
 Usng this, you can boot into fai with pxe-kexec without changing
 the dhcp server.

diff --git a/myfai-chboot-local b/myfai-chboot-local
index 7344ef4e34b2d3897802f4ccd8d6ea319158de6b..35331b3f9f880aa787361eedfe611ab33b9d18e0 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -35,7 +35,7 @@ EOF
 else
     std_arg="-u http://faiserver:8080/config.tar.gz"
     root_arg="live:http://faiserver:8080/squash.img"
 else
     std_arg="-u http://faiserver:8080/config.tar.gz"
     root_arg="live:http://faiserver:8080/squash.img"

-    /a/exe/apache-site -i -p 8080 - faiserver <<EOF
+    /a/exe/web-conf -i -p 8080 - apache2 faiserver <<EOF

 <Location />
     Deny from all
     Allow from $ip
 <Location />
     Deny from all
     Allow from $ip