TODO cleanup

diff --git a/Vagrantfile b/Vagrantfile
index b40b97a9afc7a029ab9981e9e76ab90c52c26087..ca00c82700b69811509e5569016203ea188536a4 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,7 +6,7 @@ Vagrant::Config.run do |config|
   config.vm.box = "wheezy"
 
   # Shell provisioner to setup basic environment.
-  config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision"
+  config.vm.provision :shell, :inline => "/vagrant/bin/debian-dev-setup"
 
   # Enable provisioning with Puppet stand alone.
   config.vm.provision :puppet do |puppet|

diff --git a/bin/debian-dev-setup b/bin/debian-dev-setup
index 41f02a150101c571e6de2e7df6e87ae819652d22..f6c5236c10f51b9f3121e7727e0c6b7ec15dc7fa 100755 (executable)
--- a/bin/debian-dev-setup
+++ b/bin/debian-dev-setup
@@ -3,6 +3,9 @@
 # Setup development environment.
 #
 
+# Default provisioner
+/vagrant/puppet/bin/provision
+
 # Parameter
 PACKAGES="/var/data/apps/distros/debian/packages"
 

diff --git a/kvmxfile b/kvmxfile
index 58e9e047882493ae8046163831df342c6a5e5bc2..caa90685a754f36890b2a8d1a872ac5d7d5e45b0 100644 (file)
--- a/kvmxfile
+++ b/kvmxfile
@@ -19,7 +19,7 @@ shared_folder_mountpoint="/home/user/code/$VM"
 provision_rsync="$KVMX_BASE/share/provision/ /usr/local/share/kvmx/provision/"
 
 # Absolute path for a provision script located inside the guest.
-provision_command="/usr/local/share/kvmx/provision/development"
+provision_command="/usr/local/share/kvmx/provision/development && /home/user/code/$VM/bin/debian-dev-setup"
 
 # Set this if you want to automatically attach an spice client when the machine
 # boots.

diff --git a/todo.mdwn b/todo.mdwn
index e796f1adebc48cd64af6e8e06d407062cd89850f..a6b890940713db33fbfc37bc0066882e4bc56e3d 100644 (file)
--- a/todo.mdwn
+++ b/todo.mdwn
@@ -11,7 +11,6 @@ Organization
 * Merge all `build-area` folders.
 * Deploy as a ikiwiki + git-annex instance, replacing reprepro.
 * Try an [AutomateBackports](https://wiki.debian.org/AutomateBackports) setup.
-* Vagrant: run `debian-dev-setup` as an additional shell provisioner.
 * Security: https://wiki.debian.org/SecurePbuilder
 
 Patch
@@ -24,14 +23,6 @@ Upstream
 
 * Fill a Debian bug report: `dpkg-source` doesn't honour `GNUPGHOME`.
 
-Backport
---------
-
-* mutt with opportunistic encryption:
-  * http://dev.mutt.org/hg/mutt/rev/b38c4838976f and other patches
-  * https://www.8t8.us/mutt/patches/
-  * [#757117 - mutt-patched: Please add patch to encrypt postponed messages](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757117).
-
 Port
 ----