From 03150fd6eeee44ad4e9c4618e3f4379da2d36a1d Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Sun, 28 Jul 2013 12:21:02 +0530
Subject: [PATCH] CLOUDSTACK-3797: Including httpd permission and test page

- add a test page for the http service
- startup on boot
- configure iptables port :80
- cleanup iso files

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
---
 tools/appliance/definitions/builtin/cleanup.sh  |  2 ++
 .../definitions/builtin/install-xs-tools.sh     |  3 +++
 .../definitions/builtin/postinstall.sh          | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tools/appliance/definitions/builtin/cleanup.sh b/tools/appliance/definitions/builtin/cleanup.sh
index e450f8e477d..825a0091d2c 100644
--- a/tools/appliance/definitions/builtin/cleanup.sh
+++ b/tools/appliance/definitions/builtin/cleanup.sh
@@ -1,8 +1,10 @@
 # Clean up unneeded packages.
 yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 yum -y clean all
+
 #rm -rf /etc/yum.repos.d/{puppetlabs,epel}.repo
 rm -rf VBoxGuestAdditions_*.iso
+rm -rf xs-tools*.iso
 
 # Ensure that udev doesn't screw us with network device naming.
 ln -sf /dev/null /lib/udev/rules.d/75-persistent-net-generator.rules
diff --git a/tools/appliance/definitions/builtin/install-xs-tools.sh b/tools/appliance/definitions/builtin/install-xs-tools.sh
index fc3bd47558f..94f96c38568 100644
--- a/tools/appliance/definitions/builtin/install-xs-tools.sh
+++ b/tools/appliance/definitions/builtin/install-xs-tools.sh
@@ -5,3 +5,6 @@ sudo mount -o loop xs-tools.iso /mnt
 
 #install the xs tools
 sudo yes | sudo sh /mnt/Linux/install.sh
+
+#unmount and cleanup
+sudo umount /mnt
diff --git a/tools/appliance/definitions/builtin/postinstall.sh b/tools/appliance/definitions/builtin/postinstall.sh
index 5af147e17b0..ef595126c35 100644
--- a/tools/appliance/definitions/builtin/postinstall.sh
+++ b/tools/appliance/definitions/builtin/postinstall.sh
@@ -27,15 +27,28 @@ install_packages() {
 }
 
 start_services() {
-    chkconfig httpd on
     service httpd start
 }
 
+httpd_configure() {
+    # start httpd on boot
+    chkconfig httpd on
+    # open port 80
+    iptables -I INPUT -p tcp --dport 80 -j ACCEPT
+    # create a test page
+    echo "<h1> Hello, World </h1>" > /var/www/html/test.html
+    # give 755 permissions and ownership
+    chmod -R 755 /var/www/html/
+    chown -R apache:apache /var/www/html/
+}
+
 begin=$(date +%s)
 
 install_packages
+httpd_configure
+start_services
 
 fin=$(date +%s)
 t=$((fin-begin))
 
-echo "Builtin baked in $t seconds"
+echo "Testing Builtin baked in $t seconds"