Merge lp:~thomnico/orange-box-examples/cloudfoundry into lp:orange-box-examples

[Nicolas Thomas]

=== modified file '.bzrignore'
--- .bzrignore	2014-10-21 10:16:20 +0000
+++ .bzrignore	2014-10-28 18:43:07 +0000
@@ -1,3 +1,4 @@
 precise
 telco/precise
 telco/trusty
+cloudfoundry/trusty

=== modified file 'cloudfoundry/01-deploy.sh'
--- cloudfoundry/01-deploy.sh	2014-10-28 09:07:20 +0000
+++ cloudfoundry/01-deploy.sh	2014-10-28 18:43:07 +0000
@@ -1,5 +1,23 @@
 #!/bin/bash
 
+#
+#    01-deploy.sh
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: Darryl Weaver <[e-mail]>
+#             Nicolas Thomas <[e-mail]>
+#  
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -e
 

=== added file 'cloudfoundry/orange-box-local-xip-io'
--- cloudfoundry/orange-box-local-xip-io	1970-01-01 00:00:00 +0000
+++ cloudfoundry/orange-box-local-xip-io	2014-10-28 18:43:07 +0000
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+#    orange-box-local-xip-io
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors:         Nicolas Thomas <[e-mail]>
+#  
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+fgrep "/etc/bind/named.conf.xip.io" /etc/bind/named.conf > /dev/null && (echo "already applied" ; exit 2)
+
+if [ "$(id -u)" != "0" ]; then
+  echo "Must be run with sudo or by root"
+  exit 77
+fi
+
+cat > /etc/bind/named.conf.xip.io <<EOF
+# Zone declarations.
+zone "xip.io" {
+    type master;
+    file "/etc/bind/zones.xip.io";
+};
+EOF
+
+echo '$TTL    300' > /etc/bind/zones.xip.io
+cat >> /etc/bind/zones.xip.io <<EOF
+@  IN  SOA xip.io.  io. (
+              666 ; serial
+              600 ; Refresh
+              1800 ; Retry
+              604800 ; Expire
+              300 ; TTL
+              )
+
+         IN   NS      xip.io
+
+io        IN   A       10.14.4.1
+xip.io     IN   A       10.14.4.1
+
+ns        IN   CNAME   xip.io
+
+EOF
+
+#doing it for 10.14.100.* and 10.14.200.* which are the supposed used range
+for i in `seq 1 1 254` 
+do 
+   echo "*.10.14.100.$i IN A 10.14.100.$i" >> /etc/bind/zones.xip.io
+   echo "*.10.14.200.$i IN A 10.14.200.$i" >> /etc/bind/zones.xip.io
+done
+
+
+echo 'include "/etc/bind/named.conf.xip.io";' >> /etc/bind/named.conf
+service bind9 restart

=== removed directory 'cloudfoundry/trusty'