Skip to content

Commit 1ed7f52

Browse files
committedAug 13, 2019
Try to fix up paths
1 parent 502621c commit 1ed7f52

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed
 

‎Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ Vagrant.configure("2") do |config|
33
config.vm.synced_folder ".", "/app"
44
config.vm.provision "shell", inline: "/app/bin/install-gauntlt.sh", upload_path: "/home/vagrant/install-gauntlt.sh", privileged: false
55
config.vm.provision "shell", inline: "/app/bin/install-ansible.sh", upload_path: "/home/vagrant/install-ansible.sh", privileged: false
6-
config.vm.provision "shell", inline: "/app/bin/ansible.sh", upload_path: "/home/vagrant/ansible.sh", privileged: false
6+
config.vm.provision "shell", inline: "/app/bin/ansible.sh bakery.yml scan-openscap.yml scan-gauntlt.yml app-AfterInstall.yml app-StartServer.yml ", upload_path: "/home/vagrant/ansible.sh", privileged: false
77
config.vm.network "forwarded_port", guest: 80, host: 6080, auto_correct: true
88
end

‎bin/ansible.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2020

2121
ensure_not_root
2222

23-
ansible-playbook -l localhost /app/ansible/bakery.yml /app/ansible/scan-openscap.yml /app/ansible/scan-gauntlt.yml
23+
cd "$DIR/../ansible"
24+
ansible-playbook -l localhost $@
25+
/app/ansible/bakery.yml /app/ansible/scan-openscap.yml /app/ansible/scan-gauntlt.yml

‎bin/pack.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ export BASE_DIR
1919
. "$DIR/common.sh"
2020

2121
function finish() {
22-
ls -l "$BASE_DIR" "$BASE_DIR/build"
22+
pwd
23+
ls -l "$BASE_DIR" "$BASE_DIR/build" build
2324
}
2425

2526
trap finish EXIT

‎packer/machines/web-server.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
"inline": [
5454
"bash /app/bin/install-gauntlt.sh",
5555
"bash /app/bin/install-ansible.sh",
56-
"bash /app/bin/ansible.sh"
56+
"bash /app/bin/ansible.sh bakery.yml scan-openscap.yml scan-gauntlt.yml"
5757
]
5858
},
5959
{
6060
"type": "file",
61-
"source": "/app/build/",
61+
"source": "build/",
6262
"direction": "download",
6363
"destination": "/app"
6464
}

0 commit comments

Comments
 (0)
Please sign in to comment.