Merge lp:~thomnico/orange-box/mirror into lp:~cpe-sa/orange-box/staging

[Nicolas Thomas]

Mirror feature based on 2.9 code proposed as a merge to test the feature

[lp:~thomnico/orange-box/mirror]

549. By Nicolas Thomas on 2015-07-17

Rebranch on staging cpe-sa

550. By Nicolas Thomas on 2015-09-11

Fix a few bugs on the destination of files

551. By Nicolas Thomas on 2015-09-11

* Fix lftp destination dir
* remove deps on biosdevname to not confuse new guys

Unmerged revisions

551. By Nicolas Thomas on 2015-09-11

* Fix lftp destination dir
* remove deps on biosdevname to not confuse new guys

550. By Nicolas Thomas on 2015-09-11

Fix a few bugs on the destination of files

549. By Nicolas Thomas on 2015-07-17

Rebranch on staging cpe-sa

548. By Nicolas Thomas on 2015-07-17

* Enable local mirroring
* Reduce the number of dns redirects
* remove dep on ubumirror and do a faster sync to cloud-images
* use lftp instead of apt-mirror for cloud-archive
[ Nicolas Thomas ]
* Adding support for mirror

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-23 19:54:14 +0000
+++ debian/changelog	2015-09-11 13:42:39 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 orange-box (2.91~0ubuntu2~trusty) trusty; urgency=medium
 
   * usr/bin/orange-box-add-virtual-nodes: Removed as this is now part of orange-box-examples
@@ -22,6 +23,20 @@
 
  -- Brad Erhart <[e-mail]>  Mon, 20 Jul 2015 16:17:29 -0700
 
+=======
+orange-box (2.10~ppa9) UNRELEASED; urgency=medium
+
+  * Enable local mirroring
+  * Reduce the number of dns redirects
+  * remove dep on ubumirror and do a faster sync to cloud-images
+  * use lftp instead of apt-mirror for cloud-archive
+  * Rebranch on staging cpe-sa
+  * Fix lftp destination dir
+  * remove deps on biosdevname to not confuse new guys
+
+ -- Nicolas Thomas <[e-mail]>  Mon, 15 Jun 2015 23:24:05 +0200
+
+>>>>>>> MERGE-SOURCE
 orange-box (2.9ubuntu1~trusty) trusty; urgency=medium
 
   * Change source/format for bzr-buildpackage to work
@@ -63,6 +78,13 @@
 
  -- Takenori Matsumoto <[e-mail]>  Fri, 02 May 2015 01:13:51 -0600
 
+orange-box (1.90-0mirror-0ubuntu1) utopic; urgency=medium
+
+  [ Nicolas Thomas ]
+  * Adding support for mirror
+
+ -- thomas <[e-mail]>  Sat, 17 Jan 2015 00:31:37 +0100
+
 orange-box (1.89-0ubuntu1~trusty) trusty; urgency=medium
 
   [ Dustin Kirkland ]

=== modified file 'debian/control'
--- debian/control	2015-07-22 23:36:54 +0000
+++ debian/control	2015-09-11 13:42:39 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Dustin Kirkland <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://launchpad.net/orange-box
 
 Package: orange-box
@@ -45,12 +45,20 @@
  vlan,
  wsmancli,
  x11vnc,
+<<<<<<< TREE
 Recommends:
  landscape-client,
+=======
+ lftp, 
+ rsync,
+ simplestreams,
+>>>>>>> MERGE-SOURCE
  python-keystone,
  python-neutronclient,
  python-novaclient,
- python-glanceclient
+ python-glanceclient,
+Recommends:
+ landscape-client,
 Description: Orange Box master node easy installation
  This package can be installed on an Ubuntu Orange Box's master node
  to automatically configure MAAS and Juju.

=== modified file 'debian/postinst'
--- debian/postinst	2015-07-22 23:36:54 +0000
+++ debian/postinst	2015-09-11 13:42:39 +0000
@@ -104,9 +104,17 @@
 
 # Set up the local mirror
 setup_local_mirror() {
+<<<<<<< TREE
 	a2ensite archive
 	a2ensite ubuntu-cloud
 	a2dissite 000-default
+=======
+	# Set up the local mirror
+#	a2ensite archive
+#	a2ensite ubuntu-cloud
+# Must enable this to make sstream and others works
+	a2ensite 000-default
+>>>>>>> MERGE-SOURCE
 	mkdir -p /srv/mirrors/archive.ubuntu.com
 	echo '<meta http-equiv="refresh" content="0; url=MAAS/">' > /srv/mirrors/archive.ubuntu.com/index.html
 	invoke-rc.d apache2 stop || true

=== modified file 'debian/postrm'
--- debian/postrm	2015-06-11 11:56:36 +0000
+++ debian/postrm	2015-09-11 13:42:39 +0000
@@ -6,14 +6,14 @@
 
 case "$1" in
 	remove)
-		for i in archive ubuntu-cloud; do
+		for i in archive ubuntu-cloud archive.ubuntu.com cdimage.ubuntu.com cloud-images.ubuntu.com ports.ubuntu.com releases.ubuntu.com ubuntu-cloud.archive.canonical.com; do
 			if [ -e "/etc/apache2/sites-enabled/${i}.conf" ]; then
 				a2dissite $i
 			fi
 		done
 		invoke-rc.d $webserver reload
 		rm -f /var/log/orange-box-mirror.log
-		rm -rf /etc/maas
+#		rm -rf /etc/maas
 		rm -rf /var/lib/orange-box
 	;;
 esac

=== modified file 'debian/preinst'
--- debian/preinst	2015-07-22 23:36:54 +0000
+++ debian/preinst	2015-09-11 13:42:39 +0000
@@ -6,7 +6,9 @@
 ## assume hostname as been set correctly .. will be checked in postinst
 OBNum=`hostname | cut -c 10- -`
 echo $OBNum
-echo "orangebox_number=$OBNum" > /etc/orange-box.conf
+echo "## Script generated file, others rely, know what your doing if tempering" > /etc/orange-box.conf
+echo "orangebox_number=$OBNum" >> /etc/orange-box.conf
+echo "orangebox_mirror=INIT">> /etc/orange-box.conf
 }
 
 ### According to OB networking re-design
@@ -22,10 +24,15 @@
 		echo "ERROR: Read the docs; a proper OrangeBox setup requires the default user to be [ubuntu]" 1>&2
 		exit 1
 	fi
+<<<<<<< TREE
 
 	# Ensure em1 is the correct name (disabled due to issues)
 	# biosdevname -i eth1 || (echo "biosdevname should have been run already assume it does"; true)
 
+=======
+	#ensure em1 is the correct name
+	#TODO#biosdevname -i eth1 || (echo "biosdevname should have been run already assume it does"; true)
+>>>>>>> MERGE-SOURCE
 	# TODO: Check that the AMTs are on static IPs
 	# TODO: Check dual hard drives, which one is which
 	# TODO: Ensure we have two interfaces, one internal, one external
@@ -62,11 +69,16 @@
 			;;
 		esac
 	done
+<<<<<<< TREE
 
 	# Reverted to eth0 due to issues
 	# Set a sane default as em1 because the biosdevname should have been installed and run
 	[ -z "$internal_interface" ] && internal_interface=eth0
 
+=======
+	# Set a sane default as eth0 because the biosdevname should have been installed and run
+	[ -z "$internal_interface" ] && internal_interface=eth0
+>>>>>>> MERGE-SOURCE
 	# TODO: use ip
 	default_mac=$(ifconfig "$internal_interface" | grep "^$internal_interface" | sed -e "s/.*HWaddr //")
 

=== removed file 'etc/apache2/sites-available/archive.conf'
--- etc/apache2/sites-available/archive.conf	2014-04-11 05:16:52 +0000
+++ etc/apache2/sites-available/archive.conf	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<VirtualHost *:80>
-	ServerName archive.ubuntu.com
-	ServerAdmin webmaster@localhost
-	DocumentRoot /srv/mirrors/archive.ubuntu.com/
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-	<Directory /srv/mirrors/archive.ubuntu.com/>
-	        Options Indexes FollowSymLinks Multiviews
-		Require all granted
-	</Directory>
-</VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'etc/apache2/sites-available/archive.ubuntu.com.conf'
--- etc/apache2/sites-available/archive.ubuntu.com.conf	1970-01-01 00:00:00 +0000
+++ etc/apache2/sites-available/archive.ubuntu.com.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	ServerName archive.ubuntu.com
+        ServerAlias *.archive.ubuntu.com
+	ServerAdmin webmaster@localhost
+	DocumentRoot /srv/mirrors/archive.ubuntu.com/
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+	<Directory /srv/mirrors/archive.ubuntu.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'etc/apache2/sites-available/cdimage.ubuntu.com.conf'
--- etc/apache2/sites-available/cdimage.ubuntu.com.conf	1970-01-01 00:00:00 +0000
+++ etc/apache2/sites-available/cdimage.ubuntu.com.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	ServerName cdimage.ubuntu.com
+        ServerAlias *.cdimage.ubuntu.com
+	ServerAdmin root@localhost
+	DocumentRoot /srv/mirrors/cdimage.ubuntu.com/
+	ErrorLog ${APACHE_LOG_DIR}/cdimage.ubuntu.com-error.log
+	CustomLog ${APACHE_LOG_DIR}/cdimage.ubuntu.com-access.log combined
+	<Directory /srv/mirrors/cdimage.ubuntu.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'etc/apache2/sites-available/cloud-images.ubuntu.com.conf'
--- etc/apache2/sites-available/cloud-images.ubuntu.com.conf	1970-01-01 00:00:00 +0000
+++ etc/apache2/sites-available/cloud-images.ubuntu.com.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	ServerName cloud-images.ubuntu.com
+        ServerAlias *.cloud-images.ubuntu.com
+	ServerAdmin root@localhost
+	DocumentRoot /srv/mirrors/cloud-images.ubuntu.com/
+	ErrorLog ${APACHE_LOG_DIR}/cloud-images.ubuntu.com-error.log
+	CustomLog ${APACHE_LOG_DIR}/cloud-images.ubuntu.com-access.log combined
+	<Directory /srv/mirrors/cloud-images.ubuntu.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'etc/apache2/sites-available/ports.ubuntu.com.conf'
--- etc/apache2/sites-available/ports.ubuntu.com.conf	1970-01-01 00:00:00 +0000
+++ etc/apache2/sites-available/ports.ubuntu.com.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	ServerName ports.ubuntu.com
+        ServerAlias *.ports.ubuntu.com
+	ServerAdmin root@localhost
+	DocumentRoot /srv/mirrors/ports.ubuntu.com/
+	ErrorLog ${APACHE_LOG_DIR}/ports.ubuntu.com-error.log
+	CustomLog ${APACHE_LOG_DIR}/ports.ubuntu.com-access.log combined
+	<Directory /srv/mirrors/ports.ubuntu.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'etc/apache2/sites-available/releases.ubuntu.com.conf'
--- etc/apache2/sites-available/releases.ubuntu.com.conf	1970-01-01 00:00:00 +0000
+++ etc/apache2/sites-available/releases.ubuntu.com.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	ServerName releases.ubuntu.com
+        ServerAlias *.releases.ubuntu.com
+	ServerAdmin root@localhost
+	DocumentRoot /srv/mirrors/releases.ubuntu.com/
+	ErrorLog ${APACHE_LOG_DIR}/releases.ubuntu.com-error.log
+	CustomLog ${APACHE_LOG_DIR}/releases.ubuntu.com-access.log combined
+	<Directory /srv/mirrors/releases.ubuntu.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== added file 'etc/apache2/sites-available/ubuntu-cloud.archive.canonical.com.conf'
--- etc/apache2/sites-available/ubuntu-cloud.archive.canonical.com.conf	1970-01-01 00:00:00 +0000
+++ etc/apache2/sites-available/ubuntu-cloud.archive.canonical.com.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,12 @@
+<VirtualHost *:80>
+	ServerName ubuntu-cloud.archive.canonical.com
+	ServerAdmin webmaster@localhost
+	DocumentRoot /srv/mirrors/ubuntu-cloud.archive.canonical.com/
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+	<Directory /srv/mirrors/ubuntu-cloud.archive.canonical.com/>
+	        Options Indexes FollowSymLinks Multiviews
+		Require all granted
+	</Directory>
+</VirtualHost>
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== removed file 'etc/apache2/sites-available/ubuntu-cloud.conf'
--- etc/apache2/sites-available/ubuntu-cloud.conf	2014-04-11 05:16:52 +0000
+++ etc/apache2/sites-available/ubuntu-cloud.conf	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<VirtualHost *:80>
-	ServerName ubuntu-cloud.archive.canonical.com
-	ServerAdmin webmaster@localhost
-	DocumentRoot /srv/mirrors/ubuntu-cloud.archive.canonical.com/
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-	<Directory /srv/mirrors/ubuntu-cloud.archive.canonical.com/>
-	        Options Indexes FollowSymLinks Multiviews
-		Require all granted
-	</Directory>
-</VirtualHost>
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

=== modified file 'etc/apt/orange-box-mirror.list'
--- etc/apt/orange-box-mirror.list	2015-06-09 14:35:14 +0000
+++ etc/apt/orange-box-mirror.list	2015-09-11 13:42:39 +0000
@@ -8,7 +8,7 @@
 set var_path     $base_path/var
 set cleanscript  /bin/true
 set defaultarch  amd64
-# set postmirror_script $var_path/postmirror.sh
+set postmirror_script /srv/var/postmirror.sh
 # set run_postmirror 0
 set nthreads     20
 set _tilde 0
@@ -16,28 +16,51 @@
 ############# end config ##############
 
 ## Trusty
-deb http://orange-box.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
-deb http://orange-box.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
-deb http://orange-box.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
-deb-i386 http://orange-box.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
-deb-i386 http://orange-box.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
-deb-i386 http://orange-box.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
+deb-i386 http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
+deb-i386 http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
+deb-i386 http://archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
+deb-i386 http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
+
+
+deb-src http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
+
 
 ## precise
-deb http://orange-box.archive.ubuntu.com/ubuntu precise main restricted universe multiverse
-deb http://orange-box.archive.ubuntu.com/ubuntu precise-security main restricted universe multiverse
-deb http://orange-box.archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse
-deb-i386 http://orange-box.archive.ubuntu.com/ubuntu precise main restricted universe multiverse
-deb-i386 http://orange-box.archive.ubuntu.com/ubuntu precise-security main restricted universe multiverse
-deb-i386 http://orange-box.archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu precise main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu precise-security main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse                                                
+
+deb-i386 http://archive.ubuntu.com/ubuntu precise main restricted universe multiverse
+deb-i386 http://archive.ubuntu.com/ubuntu precise-security main restricted universe multiverse
+deb-i386 http://archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu precise main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu precise-security main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse
+
+##http://ubuntu-cloud.archive.canonical.com precise-updates/cloud-tools/main Sources 
 
 ## Cloud-archive
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/cloud-tools main
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main
-deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/cloud-tools main
-deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main
-deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main
+#deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/cloud-tools main
+#deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main
+#deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main
+#deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
+#deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/cloud-tools main
+#deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main
+#deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main
+#deb-i386 http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
+#deb-src  http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/cloud-tools main
+#deb-src http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main
+#deb-src http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main
+#deb-src http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
+
 
 clean http://archive.ubuntu.com/ubuntu
-clean http://ubuntu-cloud.archive.canonical.com/ubuntu
+#clean http://ubuntu-cloud.archive.canonical.com/ubuntu

=== added directory 'etc/bind'
=== added file 'etc/bind/named.conf.wildcard-archive'
--- etc/bind/named.conf.wildcard-archive	1970-01-01 00:00:00 +0000
+++ etc/bind/named.conf.wildcard-archive	2015-09-11 13:42:39 +0000
@@ -0,0 +1,6 @@
+# Zone declarations.
+zone "archive.ubuntu.com" {
+    type master;
+    file "/etc/bind/zones.wildcard-archive";
+};
+

=== added file 'etc/bind/zones.wildcard-archive'
--- etc/bind/zones.wildcard-archive	1970-01-01 00:00:00 +0000
+++ etc/bind/zones.wildcard-archive	2015-09-11 13:42:39 +0000
@@ -0,0 +1,20 @@
+$TTL    300
+@  IN  SOA archive.ubuntu.com  ubuntu.com (
+              999 ; serial
+              600 ; Refresh
+              1800 ; Retry
+              604800 ; Expire
+              300 ; TTL
+              )
+
+         IN   NS      archive.ubuntu.com
+
+
+
+
+ns        IN   CNAME   archive.ubuntu.com
+archive.ubuntu.com.   IN   A       10.14.4.1
+archive.ubuntu.com   IN   A       10.14.4.1
+ubuntu-cloud.archive.canonical.com.  IN   A       10.14.4.1
+* IN A 10.14.4.1
+

=== removed directory 'etc/cron.d'
=== removed file 'etc/cron.d/charmstore-mirror'
--- etc/cron.d/charmstore-mirror	2014-07-30 20:05:45 +0000
+++ etc/cron.d/charmstore-mirror	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#Run every Staurday at 03:23 in the morning, if plugged in and internet is accessible the charmstore will be updated.
-#Remove any charmstore directories inot modified in the last 90 days to save space.
-23 3 * * 6	root	run-one orange-box-sync-charmstore >>/var/log/orange-box-sync-charmstore.log 2>&1
-38 4 1 * *	root	run-one find /srv/charmstore/ -maxdepth 1 -mindepth 1 -type d -mtime +90 -exec rm -rf {} \;

=== removed file 'etc/cron.d/orange-box-mirror'
--- etc/cron.d/orange-box-mirror	2014-06-02 15:43:19 +0000
+++ etc/cron.d/orange-box-mirror	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-42 * * * *	root	run-one apt-mirror /etc/apt/orange-box-mirror.list >>/var/log/orange-box-mirror.log 2>&1

=== modified file 'etc/debconf-selections'
--- etc/debconf-selections	2014-04-04 19:42:22 +0000
+++ etc/debconf-selections	2015-09-11 13:42:39 +0000
@@ -1,5 +1,3 @@
-maas-cluster-controller maas-cluster-controller/maas-url        string  http://10.14.4.1/MAAS
-maas-region-controller-min      maas/default-maas-url   string  10.14.4.1
 maas-region-controller-min      maas/installation-note   boolean true
 iptables-persistent     iptables-persistent/autosave_v6 boolean true
 iptables-persistent     iptables-persistent/autosave_v4 boolean true

=== added file 'etc/orangebox-mirror.state'
--- etc/orangebox-mirror.state	1970-01-01 00:00:00 +0000
+++ etc/orangebox-mirror.state	2015-09-11 13:42:39 +0000
@@ -0,0 +1,1 @@
+INIT
\ No newline at end of file

=== added file 'etc/ucloudexclude.list'
--- etc/ucloudexclude.list	1970-01-01 00:00:00 +0000
+++ etc/ucloudexclude.list	2015-09-11 13:42:39 +0000
@@ -0,0 +1,26 @@
+lost+found/
+desktop/
+lucid/
+full/
+*jaunty*
+*hardy*
+*karmic*
+*lucid*
+*maverick*
+*natty*
+*oneiric*
+*quantal*
+*vagrant*
+*proposed*
+*raring*
+*saucy*
+*utopic*
+*vivid*
+*wily*
+*alpha*
+*snappy*
+*beta*
+*.ova
+*arm*
+*ppc*
+.bzr

=== added file 'usr/bin/orange-box-mirror'
--- usr/bin/orange-box-mirror	1970-01-01 00:00:00 +0000
+++ usr/bin/orange-box-mirror	2015-09-11 13:42:39 +0000
@@ -0,0 +1,236 @@
+#!/bin/bash
+#
+#    orange-box-mirror
+#    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 -ex
+. /etc/orange-box.conf
+#TODO# merge State in orange-box.conf
+STATE=`cat /etc/orangebox-mirror.state`
+
+# looking for inconsistency / self healing
+dig +short xyz.archive.ubuntu.com | grep 172.27.${orangebox_number}.1 > /dev/null && CHECKEDSTATE=ENABLED || CHECKEDSTATE=DISABLED
+if [[ $STATE != $CHECKEDSTATE ]] 
+then
+    if [[ $STATE == MIRRORING ]] 
+    then
+	echo "WAS MIRRORING"
+	# IF nobody use the log then it is not mirroring
+	if ( sudo fuser /var/log/orange-box-mirror.log )
+	then
+	    CHECKEDSTATE=MIRRORING
+	else
+	    dig +short xyz.archive.ubuntu.com | grep 172.27.${orangebox_number}.1 && CHECKEDSTATE=ENABLED || CHECKEDSTATE=DISABLED
+	fi
+    fi
+    STATE=$CHECKEDSTATE
+    echo $CHECKEDSTATE > /etc/orangebox-mirror.state
+    echo "Some script end up in error or been screwed healing"
+fi
+
+is-root()
+{
+    if [ "$(id -u)" != "0" ]; then
+	echo "Must be run with sudo or by root"
+	exit 77
+    fi
+}
+
+control_c()
+# run if user hits control-c
+{
+  echo -en "\n*** Ouch! Exiting ***\n"
+  [[ $STATE = MIRRORING ]] &&  echo "DISABLED" > /etc/orangebox-mirror.state
+  exit $?
+}
+ 
+# trap keyboard interrupt (control-c)
+trap control_c SIGINT
+
+
+usage()
+{
+cat << EOF
+
+orange-box-mirror - control usage and sync of local to OrangeBox mirrors
+
+USAGE: <action>
+
+  The options  must be passed as follows:
+  <action>    
+          enable   - enable dns modification to point to local
+          disable  - disable usage of the local mirror
+          sync     - synchronize the mirror with archive disabling it during sync
+	  status    - describe current state
+
+ Note: actions requires root privileges use sudo 
+
+EOF
+exit 0
+}
+
+enable-dns-usage()
+{
+[[ $STATE = MIRRORING ]] && { echo "wait for mirroring to end"; exit 2; }
+[[ $STATE = ENABLED ]] && { echo "Already enabled"; exit 0; }
+is-root
+
+#important for templating
+export TTL='$TTL'
+PWDBACK=$PWD
+rm -f /etc/bind/named.conf.orange-box-mirror
+touch /etc/bind/named.conf.orange-box-mirror
+for web_site in archive.ubuntu.com cdimage.ubuntu.com cloud-images.ubuntu.com releases.ubuntu.com ubuntu-cloud.archive.canonical.com
+do
+
+a2ensite  ${web_site}
+## TODO check sed regex if name are other then a-z and "-"
+
+## MUST export for envsubst to work
+export web_site
+export web_site_root=`echo ${web_site} |sed 's/^[a-z,-]*.//'`
+export orangebox_number
+
+envsubst < /usr/lib/orange-box/templates/mirror-bind/zones.template > /etc/bind/zones.${web_site}
+
+envsubst < /usr/lib/orange-box/templates/mirror-bind/named.conf.template >> /etc/bind/named.conf.orange-box-mirror
+done
+# avoid conflict in etc/ files with ubumirror
+envsubst < /usr/lib/orange-box/templates/ubumirror.conf > /etc/ubumirror.conf
+
+# make sure no duplicates and enable only if reach that point
+TMPFILE=`mktemp`
+grep -v "named.conf.orange-box-mirror" /etc/bind/named.conf > $TMPFILE || echo "was already off continue"
+mv $TMPFILE  /etc/bind/named.conf
+chown bind:bind /etc/bind/named.conf
+echo 'include "/etc/bind/named.conf.orange-box-mirror";' >> /etc/bind/named.conf
+service bind9 restart
+service apache2 restart
+echo "ENABLED" > /etc/orangebox-mirror.state
+}
+
+disable-dns-usage()
+{
+[[ $STATE = MIRRORING ]] && { echo "Mirroring in progress usage disabled"; exit 0; }
+[[ $STATE = DISABLED ]] && { echo "Already disabled"; exit 0; }
+is-root
+TMPFILE=`mktemp`
+grep -v "named.conf.orange-box-mirror" /etc/bind/named.conf > $TMPFILE || echo "was already off continue"
+mv $TMPFILE /etc/bind/named.conf
+chown bind:bind /etc/bind/named.conf
+service bind9 restart
+echo "DISABLED" > /etc/orangebox-mirror.state
+}
+
+sync-mirror()
+{
+[[ $STATE = MIRRORING ]] && { echo "already mirroring" ;exit 2; } 
+PREVIOUSSTATE=$STATE
+#trick to not rewrite disabling
+STATE="ENABLED"
+disable-dns-usage
+echo "MIRRORING" > /etc/orangebox-mirror.state
+
+echo "Updating cloud-archive mirror"
+/usr/bin/lftp -c mirror -eP=8 -x icons http://ubuntu-cloud.archive.canonical.com /srv/mirrors/ubuntu-cloud.archive.canonical.com
+
+echo "Updating cloud-images mirror"
+
+ROOTDIR="/srv/mirrors/"
+RELEASES="precise trusty"
+
+cd $ROOTDIR
+mkdir -p cloud-images.ubuntu.com/query
+lftp -c mirror -eP=4  http://cloud-images.ubuntu.com/query cloud-images.ubuntu.com/query
+for r in $RELEASES
+do
+cd $ROOTDIR/
+IDREL=`grep $r cloud-images.ubuntu.com/query/released.latest.txt |awk '{print $4}' `
+IDDAY=`grep -e "server" cloud-images.ubuntu.com/query/daily.latest.txt| grep -v "server-"|grep $r |awk '{print $4}' `
+mkdir -p  $ROOTDIR/cloud-images.ubuntu.com/server/releases/$r/
+cd $ROOTDIR/cloud-images.ubuntu.com/server/releases/$r/
+lftp -c mirror -eP=4 http://cloud-images.ubuntu.com/server/releases/$r/release-$IDREL/
+mkdir -p $ROOTDIR/cloud-images.ubuntu.com/releases/$r/
+cd $ROOTDIR/cloud-images.ubuntu.com/releases/$r/
+lftp -c mirror -eP=4 http://cloud-images.ubuntu.com/releases/$r/release-$IDREL/
+
+mkdir -p $ROOTDIR/cloud-images.ubuntu.com/server/daily/$r/
+cd $ROOTDIR/cloud-images.ubuntu.com/server/daily/$r/
+lftp -c mirror -eP=4 http://cloud-images.ubuntu.com/server/daily/$r/$IDDAY/ || true
+
+mkdir -p $ROOTDIR/cloud-images.ubuntu.com/daily/server/$r/
+cd $ROOTDIR/cloud-images.ubuntu.com/daily/server/$r/
+lftp -c mirror -eP=4 http://cloud-images.ubuntu.com/daily/server/$r/$IDDAY/
+
+done
+
+
+echo " apt mirror sync .... "
+cat > /srv/var/postmirror.sh<<EOF
+#!/bin/bash
+wget -nH --cut-dirs 4  -r --no-parent -P /srv/mirrors/archive.ubuntu.com/ubuntu/dists/trusty-updates/main/  http://archive.ubuntu.com/ubuntu/dists/trusty/main/uefi/grub2-amd64/
+EOF
+chmod 755 /srv/var/postmirror.sh
+run-one apt-mirror /etc/apt/orange-box-mirror.list |tee -a /var/log/orange-box-mirror.log
+
+
+run-one sstream-mirror --keyring=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg http://maas.ubuntu.com/images/ephemeral-v2/daily/ /var/www/html/maas/images/ephemeral-v2/daily 'arch=amd64' 'subarch~(generic|hwe-t)' 'release~(trusty|precise)' --max=1
+run-one sstream-mirror --keyring=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg http://maas.ubuntu.com/images/ephemeral-v2/releases/ /var/www/html/maas/images/ephemeral-v2/releases 'arch=amd64' 'subarch~(generic|hwe-t)' 'release~(trusty|precise)' --max=1
+
+maas admin boot-source update 1 url="http://172.27.${orangebox_number}.1/maas/images/ephemeral-v2/releases/streams/v1/index.sjson"
+
+
+
+chmod -R g+rx,o+rx /srv/mirrors/*.com 
+echo "SYNCED" > /etc/orangebox-mirror.state
+STATE=SYNCED
+case $PREVIOUSSTATE in
+    ENABLED)
+	enable-dns-usage 
+	;;
+    DISABLED)
+	disable-dns-usage
+	;;   
+esac
+}
+
+status()
+{
+echo "This OrangeBox state is "$STATE
+}
+
+[ $# -lt 1 ] && usage
+
+ACTION=$1
+
+case $ACTION in
+    enable)
+	enable-dns-usage 
+	;;
+    disable)
+	disable-dns-usage
+	;;
+    sync)
+	sync-mirror
+	;;
+    status)
+	status
+	;;
+    *)
+	usage
+	;;
+esac

=== added file 'usr/bin/orange-box-resetproxy'
--- usr/bin/orange-box-resetproxy	1970-01-01 00:00:00 +0000
+++ usr/bin/orange-box-resetproxy	2015-09-11 13:42:39 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+#    orange-box-resetproxy
+#    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 -ex
+# Only run this as root
+if [ $EUID -ne 0 ]
+then
+        echo Execute as root or with \"sudo $0\"
+        exit 1
+fi
+
+
+
+service maas-proxy stop
+rm -rf  /var/spool/maas-proxy/*
+squid3 -z -f /etc/maas/maas-proxy.conf 
+sleep 20
+service maas-proxy start

=== added directory 'usr/lib/orange-box/templates'
=== added directory 'usr/lib/orange-box/templates/mirror-bind'
=== added file 'usr/lib/orange-box/templates/mirror-bind/named.conf.template'
--- usr/lib/orange-box/templates/mirror-bind/named.conf.template	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/templates/mirror-bind/named.conf.template	2015-09-11 13:42:39 +0000
@@ -0,0 +1,6 @@
+# Zone declarations for ${web_site}
+zone "${web_site}" {
+    type master;
+    file "/etc/bind/zones.${web_site}";
+};
+

=== added file 'usr/lib/orange-box/templates/mirror-bind/zones.template'
--- usr/lib/orange-box/templates/mirror-bind/zones.template	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/templates/mirror-bind/zones.template	2015-09-11 13:42:39 +0000
@@ -0,0 +1,17 @@
+$TTL    300
+@  IN  SOA ${web_site} ${web_site_root} (
+              999 ; serial
+              600 ; Refresh
+              1800 ; Retry
+              604800 ; Expire
+              300 ; TTL
+              )
+
+         IN   NS     ${web_site}
+
+ns        IN   CNAME ${web_site}
+  
+${web_site}.   IN   A       172.27.${orangebox_number}.1
+${web_site}    IN   A        172.27.${orangebox_number}.1
+* IN A  172.27.${orangebox_number}.1
+

=== added file 'usr/lib/orange-box/templates/ubumirror.conf'
--- usr/lib/orange-box/templates/ubumirror.conf	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/templates/ubumirror.conf	2015-09-11 13:42:39 +0000
@@ -0,0 +1,58 @@
+#
+# ubumirror.conf - configuration file for the ubumirror scripts.
+#
+
+# Please set the variables below to fit your site.
+# Which email address/user that will receive failure notices.
+EMAIL=root@orangebox${orangebox_number}
+
+# Server's FQDN.
+HOSTNAME=orangebox${orangebox_number}
+
+# Bandwidth limit for all mirror scripts - set to 0 for no limit.
+SPEED=0
+
+# I/O timeout for all mirror scripts - defaults to 600 seconds.
+IO_TIMEOUT=600
+
+# UBUARC_DIR is the destination for the base of the archive directory
+# The script won't run if this variable isn't set
+UBUARC_DIR="/srv/mirrors/archive.ubuntu.com/"
+
+# UBUCDI_DIR is the destination for the base of the cdimage directory
+# The script won't run if this variable isn't set
+UBUCDI_DIR="/srv/mirrors/cdimage.ubuntu.com/"
+
+# UBUREL_DIR is the destination for the base of the releases directory
+# The script won't run if this variable isn't set
+UBUREL_DIR="/srv/mirrors/releases.ubuntu.com/"
+
+# UBUPOR_DIR is the destination for the base of the ports directory
+# The script (ubuports) won't run if this variable isn't set
+UBUPOR_DIR="/srv/mirrors/ports.ubuntu.com/"
+#
+# UBUCLOUD_DIR is the destination for the base of the cloud-image directory
+# The script (ubucloudimage) won't run if this variable isn't set
+UBUCLOUD_DIR="/srv/mirrors/cloud-images.ubuntu.com/"
+
+# LOGDIR is the destination directory of all the logs
+LOGDIR="/var/log/ubumirrors/"
+
+# UBU{ARC,CDI,REL}_MIRROR is the rsync path in the form of host::directory/ of the
+# upstream mirrors where the ubumirror scripts will mirror from.
+UBUARC_MIRROR=rsync://rsync.archive.ubuntu.com/ubuntu
+UBUCDI_MIRROR=rsync://rsync.cdimage.ubuntu.com/cdimage
+UBUREL_MIRROR=rsync://rsync.releases.ubuntu.com/releases
+UBUPOR_MIRROR=rsync://rsync.ports.ubuntu.com/ubuntu-ports
+UBUCLOUD_MIRROR=rsync://cloud-images.ubuntu.com/cloud-images
+
+# UBU{ARC,CDI,REL}_EXCLUDE is what things you want to exclude
+UBUARC_EXCLUDE="--exclude binary-powerpc/ --exclude binary-sparc/ --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ --exclude installer-powerpc/ --exclude installer-sparc/ --exclude *_powerpc.deb --exclude *_powerpc.udeb --exclude *_sparc.deb --exclude *_sparc.udeb --exclude Contents-powerpc.gz --exclude Contents-sparc.gz "
+
+UBUCDI_EXCLUDE="--exclude *-powerpc.* --exclude *-sparc.* --exclude source/ "
+
+UBUREL_EXCLUDE="--exclude *-powerpc.* --exclude *-sparc.* "
+
+UBUPOR_EXCLUDE="--exclude binary-powerpc/ --exclude binary-sparc/ --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ --exclude installer-powerpc/ --exclude installer-sparc/ --exclude *_powerpc.deb --exclude *_powerpc.udeb --exclude *_sparc.deb --exclude *_sparc.udeb --exclude Contents-powerpc.gz --exclude Contents-sparc.gz "
+
+UBUCLOUD_EXCLUDE=""