# HG changeset patch
# User Chris Cannam
# Date 1502967964 -3600
# Node ID 9149f2098413e4111ae356c84341193d535920b6
# Parent  d8949733849dfb3100379bb436242c6fea5963c6
Minor rejig

diff -r d8949733849d -r 9149f2098413 .dockerignore
--- a/.dockerignore	Thu Aug 17 11:55:29 2017 +0100
+++ b/.dockerignore	Thu Aug 17 12:06:04 2017 +0100
@@ -1,5 +1,6 @@
 .dockerignore
 .hg
-extra/soundsoftware/dockertest/Dockerfile
-extra/soundsoftware/dockertest/start.sh
+.hgignore
+deploy/docker/Dockerfile
+deploy/docker/start.sh
 *.log
diff -r d8949733849d -r 9149f2098413 deploy/provision.d/040-hg-dir.sh
--- a/deploy/provision.d/040-hg-dir.sh	Thu Aug 17 11:55:29 2017 +0100
+++ b/deploy/provision.d/040-hg-dir.sh	Thu Aug 17 12:06:04 2017 +0100
@@ -10,11 +10,3 @@
     cp /var/www/code/deploy/config/hgweb.config /var/hg/
     chmod +x /var/hg/index.cgi
 fi
-
-if [ ! -d /var/hg/vamp-plugin-sdk ]; then
-    # This project can be used for testing
-    echo "Cloning vamp-plugin-sdk repo for testing..."
-    cd /var/hg
-    hg clone https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk
-    chown -R code.www-data vamp-plugin-sdk
-fi
diff -r d8949733849d -r 9149f2098413 deploy/provision.d/110-apache-start.sh
--- a/deploy/provision.d/110-apache-start.sh	Thu Aug 17 11:55:29 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-
-apache2ctl restart
-
diff -r d8949733849d -r 9149f2098413 deploy/provision.d/110-hg-testdir.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/provision.d/110-hg-testdir.sh	Thu Aug 17 12:06:04 2017 +0100
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -d /var/hg/vamp-plugin-sdk ]; then
+    # This project can be used for testing
+    echo "Cloning vamp-plugin-sdk repo for testing..."
+    cd /var/hg
+    hg clone https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk
+    chown -R code.www-data vamp-plugin-sdk
+fi
diff -r d8949733849d -r 9149f2098413 deploy/provision.d/200-apache-start.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/provision.d/200-apache-start.sh	Thu Aug 17 12:06:04 2017 +0100
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+apache2ctl restart
+