summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Vagrantfile2
-rwxr-xr-xbin/debian-dev-setup3
-rw-r--r--kvmxfile2
-rw-r--r--todo.mdwn9
4 files changed, 5 insertions, 11 deletions
diff --git a/Vagrantfile b/Vagrantfile
index b40b97a..ca00c82 100644
--- 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 41f02a1..f6c5236 100755
--- 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 58e9e04..caa9068 100644
--- 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 e796f1a..a6b8909 100644
--- 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
----