[gnome-ostree] install: More updates for AWS installer

[Colin Walters <walters src gnome org>]

commit 1da101668a73eadfff0c3ea4135400195e192101
Author: Colin Walters <walters verbum org>
Date:   Tue Aug 14 22:32:57 2012 -0400

    install: More updates for AWS installer

 install/amazon-linux-cloud-init.sh |   43 +++++++++++++++++++++++++++++------
 install/ostree-user-install.sh     |   12 ++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)
---
diff --git a/install/amazon-linux-cloud-init.sh b/install/amazon-linux-cloud-init.sh
index e38752c..ce5dcb4 100755
--- a/install/amazon-linux-cloud-init.sh
+++ b/install/amazon-linux-cloud-init.sh
@@ -20,10 +20,20 @@
 
 set -e
 
-exec 1>/var/log/cloud-init.log
-exec 2>&1
+# Note: I'm not entirely sure why, but when allocating a larger
+# instance store, the filesystem is still the default 8G.  Resizing
+# here works.
+resize2fs /dev/xvda1
+
+cat > /etc/yum.repos.d/cdn-verbum-org.repo <<EOF
+[cdn-verbum-org]
+name=cdn.verbum.org/rpms
+baseurl=http://cdn.verbum.org/rpms
+gpgcheck=0
+EOF
 
 PACKAGES="
+linux-user-chroot
 git
 make
 gcc
@@ -37,20 +47,37 @@ docbook-style-xsl docbook-utils doxygen elfutils flex gcc gcc-c++ gettext git
 gzip hg intltool libtool make patch pkgconfig sed subversion tar unzip
 
 diffstat texinfo texi2html chrpath
+
+httpd
 "
 
 yum -y install $PACKAGES
 
-cat > /etc/yum.repos.d/cdn-verbum-org.repo <<EOF
-[cdn-verbum-org]
-name=cdn.verbum.org/rpms
-baseurl=http://cdn.verbum.org/rpms
-gpgcheck=0
+mkdir /var/log/httpd/
+
+cat > /etc/httpd/conf.d/ostree.conf <<EOF
+<VirtualHost *:80>
+        DocumentRoot /home/ostree/public_html/
+
+        ErrorLog /var/log/httpd/ostree-error_log
+        ScriptLog /var/log/httpd/ostree-error_log
+        CustomLog /var/log/httpd/ostree-access_log combined
+
+        KeepAlive On
+</VirtualHost>
+
+<Directory "/home/ostree/public_html/">
+     AllowOverride None
+     Options Indexes MultiViews FollowSymLinks
+     order allow,deny
+     allow from all
+</Directory>
 EOF
 
-yum -y install linux-user-chroot
+service httpd start
 
 adduser ostree
+chmod a+x /home/ostree  # for httpd access
 
 su - ostree -c 'set -e ; mkdir -p ~/src; cd ~/src;
 test -d gnome-ostree || git clone --depth=1 git://git.gnome.org/gnome-ostree;
diff --git a/install/ostree-user-install.sh b/install/ostree-user-install.sh
index fa0776a..560bff7 100755
--- a/install/ostree-user-install.sh
+++ b/install/ostree-user-install.sh
@@ -46,6 +46,7 @@ cd ~/src
 test -d poky || git clone --depth=1 -b gnomeos-3.6 git://github.com/cgwalters/poky poky
 mkdir -p ~/build
 cd ~/build
+(
 . ~/src/poky/oe-init-build-env gnomeos-build
 cat > conf/bblayers.conf << END
 LCONF_VERSION = "4"
@@ -56,3 +57,14 @@ BBLAYERS = " \
   ${HOME}/src/poky/meta-gnomeos \
   "
 END
+)
+
+ln -s ~/build/gnomeos-build/tmp/deploy/images/repo ~/build/gnomeos-build
+
+mkdir -p ~/public_html
+cd ~/public_html
+ln -s ~/build/gnomeos-build/repo .
+ln -s ~/build/ostbuild/work/logs logs
+
+cp ~/src/gnome-ostree/qa/repoweb/* .
+