コミット: c0c52d558c403c21370cf72f917140e05eb94e08 - allura (git)

allura

コミットメタ情報

• リビジョン: c0c52d558c403c21370cf72f917140e05eb94e08 (tree)
• 日時: 2012-07-19 04:00:03
• 作者: Tim Van Steenburgh <tvansteenburgh@gmai...>
• コミッター: Tim Van Steenburgh

ログメッセージ

Merge branch 'dev' of git://sfi-engr-scm-1/forge into dev

変更サマリ

• modified: rebuild.bash
• modified: update.sh
• modified: vagrant/README
• modified: vagrant/Vagrantfile
• modified: vagrant/Vagrantfile.pkg
• modified: vagrant/allura_setup.sh
• modified: vagrant/manifests/ubuntu-1110-server-amd64.pp
• modified: vagrant/start_allura

差分

--- a/rebuild.bash
+++ b/rebuild.bash
@@ -1,7 +1,8 @@
+#!/bin/bash
 for APP in Allura* *Forge* NoWarnings
 do
-	echo "# installing $APP dependencies"
-	pushd $APP
-	python setup.py develop || exit
-	popd
+    echo "# setting up $APP dependencies"
+    pushd $APP > /dev/null
+    python setup.py -q develop || exit
+    popd > /dev/null
 done

--- a/vagrant/README
+++ b/vagrant/README
@@ -4,10 +4,10 @@ $ mkdir ~/vagrant_allura && cd ~/vagrant_allura
 
 # Get the base box
 $ vagrant box add ubuntu-1110-server-amd64 http://timhuegdon.com/vagrant-boxes/ubuntu-11.10.box
-$ vagrant init
+$ vagrant init ubuntu-1110-server-amd64
 
 # Get a copy of the provisioning scripts
-$ cp /var/local/allura/vagrant/* .
+$ cp -R /var/local/allura/vagrant/* .
 
 # At this point you can make whatever changes you want to the provisioning
 # scripts
@@ -15,15 +15,18 @@ $ cp /var/local/allura/vagrant/* .
 # Provision the box (this will take a while)
 $ vagrant up
 
+# If you get an error, you can run `vagrant destroy` to start over
+
 # Package the Allura box
 $ vagrant package --vagrantfile Vagrantfile.pkg
 
 # Test your new box
-$ mkdir ~/vagrant_allura_test and cd ~/vagrant_allura_test
+$ mkdir ~/vagrant_allura_test && cd ~/vagrant_allura_test
 $ vagrant box add allura ~/vagrant_allura/package.box
-$ vagrant init
+$ vagrant init allura
+$ vagrant up
 $ vagrant ssh
 
 # Do whatever testing you want...
 
-# If everything checks out, you can rename your package.box and upload it 
+# If everything checks out, you can rename your package.box and upload it

--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -30,6 +30,7 @@ Vagrant::Config.run do |config|
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
   config.vm.forward_port 8080, 8080
+  config.vm.forward_port 8983, 8983 # solr
 
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
@@ -62,7 +63,7 @@ Vagrant::Config.run do |config|
   config.vm.provision :shell, :path => "allura_setup.sh"
 
   # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding 
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
   # some recipes and/or roles.
   #
   # config.vm.provision :chef_solo do |chef|

--- a/vagrant/Vagrantfile.pkg
+++ b/vagrant/Vagrantfile.pkg
@@ -2,4 +2,5 @@ Vagrant::Config.run do |config|
   # Forward Allura web port so you can browse the site at
   # http://localhost:8080 (local port is the second number)
   config.vm.forward_port 8080, 8080
+  config.vm.forward_port 8983, 8983 # solr
 end

--- a/vagrant/allura_setup.sh
+++ b/vagrant/allura_setup.sh
@@ -1,5 +1,18 @@
 #!/bin/bash
 
+# Install Solr
+cd /home/vagrant/src
+if [ ! -d apache-solr-1.4.1 ]
+then
+    echo "Installing Solr..."
+    wget -q http://apache.mirrors.tds.net/lucene/solr/1.4.1/apache-solr-1.4.1.tgz
+    tar xf apache-solr-1.4.1.tgz && rm -f apache-solr-1.4.1.tgz
+    cd apache-solr-1.4.1/example/
+    mkdir -p /home/vagrant/src/forge/solr_config/conf
+    cp solr/conf/solrconfig.xml /home/vagrant/src/forge/solr_config/conf/
+    chown -R vagrant:vagrant /home/vagrant/src/apache-solr* /home/vagrant/src/forge/solr_config/conf/
+fi
+
 # Create log dir
 if [ ! -d /var/log/allura ]
 then
@@ -24,27 +37,30 @@ then
     chown vagrant:vagrant /home/vagrant/.bash_profile
 fi
 
-. /home/vagrant/anvil/bin/activate
-
-cd /home/vagrant/src/forge
-
 # Setup Allura python packages
-echo "Setting up Allura python packages..."
-for APP in Allura* Forge* NoWarnings
-do
-    pushd $APP
-    python setup.py develop
-    popd
-done
+cd /home/vagrant/src/forge
+sudo -u vagrant bash -c '. /home/vagrant/anvil/bin/activate; ./rebuild.bash'
 
 echo "Purging unneeded packages..."
 aptitude clean
 aptitude -y -q purge ri
-aptitude -y -q purge installation-report landscape-common wireless-tools wpasupplicant ubuntu-serverguide
-aptitude -y -q purge python-dbus libnl1 python-smartpm linux-headers-2.6.32-21-generic python-twisted-core libiw30
-aptitude -y -q purge python-twisted-bin libdbus-glib-1-2 python-pexpect python-pycurl python-serial python-gobject python-pam libffi5
+aptitude -y -q purge installation-report landscape-common wireless-tools wpasupplicant
+aptitude -y -q purge python-dbus libnl1 python-smartpm linux-headers-server python-twisted-core libiw30 language-selector-common
+aptitude -y -q purge python-twisted-bin libdbus-glib-1-2 python-pexpect python-pycurl python-serial python-gobject python-pam accountsservice libaccountsservice0
 
 echo "Zeroing free space to aid VM compression..."
-cat /dev/zero > zero.fill;sync;sleep 1;sync;rm -f zero.fill
+cat /dev/zero > zero.fill;
+echo "Errors about 'No space left' are ok; carrying on..."
+sync;sleep 1;sync;rm -f zero.fill
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
+echo "Done with allura_setup.sh"
+
+# sometimes mongo ends up stopped
+# maybe due to that disk-filling exercise
+# make sure it's still running
+service mongodb status
+if [ "$?" -ne "0" ]; then
+	rm /var/lib/mongodb/mongod.lock
+	service mongodb start
+fi

--- a/vagrant/manifests/ubuntu-1110-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1110-server-amd64.pp
@@ -3,6 +3,10 @@ group { "puppet":
   ensure => "present",
 }
 
+exec { "package index update":
+    command => "/usr/bin/apt-get update",
+}
+
 # install required system packages
 Package { ensure => "installed" }
 
@@ -21,7 +25,9 @@ $packages = [
  "python-pip"
 ]
 
-package { $packages: }
+package { $packages:
+    require => Exec[ "package index update" ],
+}
 
 file { '/usr/lib/libz.so':
   ensure => 'link',
@@ -43,7 +49,7 @@ exec { "install venv":
 
 # create Allura virtualenv
 exec { "create allura venv":
-  command => "/usr/local/bin/virtualenv --system-site-packages anvil && chown -R vagrant:vagrant /home/vagrant/anvil",
+  command => "/usr/local/bin/virtualenv --system-site-packages anvil",
   cwd     => "/home/vagrant",
   creates => "/home/vagrant/anvil",
   user => "vagrant",
@@ -75,21 +81,13 @@ exec { "clone repo":
   require => [ File[ "/home/vagrant/src" ], Package[ "git-core" ] ],
 }
 
-# pre-install Paste and PasteDeploy to work around problem in TG2 install
-exec { "prereqs":
-  command => "/home/vagrant/anvil/bin/pip install Paste==1.7.5.1 PasteDeploy==1.5.0",
-  user => "vagrant",
-  group => "vagrant",
-  require => Exec[ "create allura venv" ],
-}
-
-# install remainder of Allura dependencies
-exec { "/usr/bin/sudo /home/vagrant/anvil/bin/pip install -r requirements.txt":
+# install Allura dependencies
+exec { "/home/vagrant/anvil/bin/pip install -r requirements.txt":
   cwd     => "/home/vagrant/src/forge",
   user => "vagrant",
   group => "vagrant",
   timeout => 0,
-  require => [ Exec[ "clone repo"], Exec[ "prereqs" ] ],
+  require => [ Exec[ "clone repo"], Exec[ "create allura venv" ] ],
 }
 
 # create SCM repo dirs

--- a/vagrant/start_allura
+++ b/vagrant/start_allura
@@ -12,18 +12,6 @@ then
 fi
 echo "Logs are in /var/log/allura"
 
-# Install Solr
-cd /home/vagrant/src
-if [ ! -d apache-solr-1.4.1 ]
-then
-    echo "Installing Solr..."
-    wget -q http://apache.mirrors.tds.net/lucene/solr/1.4.1/apache-solr-1.4.1.tgz
-    tar xf apache-solr-1.4.1.tgz && rm -f apache-solr-1.4.1.tgz
-    cd apache-solr-1.4.1/example/
-    mkdir -p /home/vagrant/src/forge/solr_config/conf
-    cp solr/conf/solrconfig.xml /home/vagrant/src/forge/solr_config/conf/
-fi
-
 # Start solr
 if pgrep -f solr.*start.jar >/dev/null
 then