From f12cd0ad29310e8a14bfcd6ad440cf780cb78c58 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Sun, 7 Feb 2016 20:44:27 -0800 Subject: [PATCH] Move the HTTP server files into a dedicated directory Again, this is to tidy up the top-level directory in preparation for de-duplicating the script functionality. --- arch-template.json | 8 ++++---- install-parallels.sh => srv/install-parallels.sh | 0 install-virtualbox.sh => srv/install-virtualbox.sh | 0 install-vmware.sh => srv/install-vmware.sh | 0 parallels_tools.sh => srv/parallels-tools.sh | 0 poweroff.timer => srv/poweroff.timer | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename install-parallels.sh => srv/install-parallels.sh (100%) mode change 100644 => 100755 rename install-virtualbox.sh => srv/install-virtualbox.sh (100%) mode change 100644 => 100755 rename install-vmware.sh => srv/install-vmware.sh (100%) mode change 100644 => 100755 rename parallels_tools.sh => srv/parallels-tools.sh (100%) mode change 100644 => 100755 rename poweroff.timer => srv/poweroff.timer (100%) diff --git a/arch-template.json b/arch-template.json index 3ec8eeb..e20ba8e 100644 --- a/arch-template.json +++ b/arch-template.json @@ -13,7 +13,7 @@ "iso_checksum_type": "{{user `iso_checksum_type`}}", "guest_os_type": "ArchLinux_64", "guest_additions_mode": "disable", - "http_directory": ".", + "http_directory": "srv", "boot_wait": "5s", "boot_command": [ "", @@ -33,7 +33,7 @@ "iso_url": "{{user `iso_url`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", - "http_directory": ".", + "http_directory": "srv", "boot_wait": "5s", "boot_command": [ "", @@ -55,13 +55,13 @@ "iso_url": "{{user `iso_url`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", - "http_directory": ".", + "http_directory": "srv", "boot_wait": "5s", "boot_command": [ "", "/usr/bin/curl -O http://{{.HTTPIP}}:{{.HTTPPort}}/install-parallels.sh", "/usr/bin/curl -O http://{{.HTTPIP}}:{{.HTTPPort}}/poweroff.timer", - "/usr/bin/curl -O http://{{.HTTPIP}}:{{.HTTPPort}}/parallels_tools.sh", + "/usr/bin/curl -O http://{{.HTTPIP}}:{{.HTTPPort}}/parallels-tools.sh", "/usr/bin/bash ./install-parallels.sh" ], "disk_size": 20480, diff --git a/install-parallels.sh b/srv/install-parallels.sh old mode 100644 new mode 100755 similarity index 100% rename from install-parallels.sh rename to srv/install-parallels.sh diff --git a/install-virtualbox.sh b/srv/install-virtualbox.sh old mode 100644 new mode 100755 similarity index 100% rename from install-virtualbox.sh rename to srv/install-virtualbox.sh diff --git a/install-vmware.sh b/srv/install-vmware.sh old mode 100644 new mode 100755 similarity index 100% rename from install-vmware.sh rename to srv/install-vmware.sh diff --git a/parallels_tools.sh b/srv/parallels-tools.sh old mode 100644 new mode 100755 similarity index 100% rename from parallels_tools.sh rename to srv/parallels-tools.sh diff --git a/poweroff.timer b/srv/poweroff.timer similarity index 100% rename from poweroff.timer rename to srv/poweroff.timer