From 4a1acae4f3f06588baf905b96d2727381a1caf49 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Tue, 24 Feb 2015 23:02:45 -0600 Subject: [PATCH 01/13] fix --- Lab-03-Instructions.md | 2 ++ README.md | 4 +++- kars0011-testfile.md | 2 ++ starter.sh | 4 +++- test document.md | 0 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 kars0011-testfile.md create mode 100644 test document.md diff --git a/Lab-03-Instructions.md b/Lab-03-Instructions.md index d804e16..78a5a4c 100644 --- a/Lab-03-Instructions.md +++ b/Lab-03-Instructions.md @@ -80,6 +80,8 @@ Review the text file: Why did I make the directory structure so detailed? This is typical of setting up infrastructure as code - you need to be able to maintain focus and successfully set up instructions that are both complicated and yet repetitive. +If you have developed an approach to "mkdir" and "touch" that you wish to refer to later you should copy it to an external text file (outside of your Vagrant VM). + Exit and destroy your VM. ```` diff --git a/README.md b/README.md index 5742b72..36b3d8e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # Lab-03 -See the instructions. +See the instructions. + +This is a new line. diff --git a/kars0011-testfile.md b/kars0011-testfile.md new file mode 100644 index 0000000..139597f --- /dev/null +++ b/kars0011-testfile.md @@ -0,0 +1,2 @@ + + diff --git a/starter.sh b/starter.sh index 011cfc8..cf99312 100644 --- a/starter.sh +++ b/starter.sh @@ -2,4 +2,6 @@ # Starter shell script # Put commands below # To run, type ./starter.sh (you need the "./") -# It must have permissions starting with a "7" \ No newline at end of file +# It must have permissions starting with a "7" + +mkdir "boo" \ No newline at end of file diff --git a/test document.md b/test document.md new file mode 100644 index 0000000..e69de29 From ab104b285d5409c0d601c6cca46fc14078be6854 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Tue, 24 Feb 2015 23:09:19 -0600 Subject: [PATCH 02/13] my first commit --- kars0011-testfile.md | 1 + 1 file changed, 1 insertion(+) diff --git a/kars0011-testfile.md b/kars0011-testfile.md index 139597f..b28b04f 100644 --- a/kars0011-testfile.md +++ b/kars0011-testfile.md @@ -1,2 +1,3 @@ + From 8e91f29f1d97700bf9439378e190af5a21267a26 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Tue, 24 Feb 2015 23:12:51 -0600 Subject: [PATCH 03/13] second commit --- kars0011-testfile.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kars0011-testfile.md b/kars0011-testfile.md index b28b04f..b494f5a 100644 --- a/kars0011-testfile.md +++ b/kars0011-testfile.md @@ -1,3 +1,7 @@ +hello world +hello again + + From 34dd49111165df634e64fea80cfc40b743bd817e Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Tue, 24 Feb 2015 23:14:46 -0600 Subject: [PATCH 04/13] third commit --- kars0011-testfile.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kars0011-testfile.md b/kars0011-testfile.md index b494f5a..821b81c 100644 --- a/kars0011-testfile.md +++ b/kars0011-testfile.md @@ -1,5 +1,7 @@ hello world hello again +hello Mars + From 0c5065bcec7a643289567496b5395a8a01e49d16 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Wed, 25 Feb 2015 00:53:53 -0600 Subject: [PATCH 05/13] my first commit --- kars0011-testfile.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/kars0011-testfile.md b/kars0011-testfile.md index 821b81c..c038fe8 100644 --- a/kars0011-testfile.md +++ b/kars0011-testfile.md @@ -1,6 +1,4 @@ hello world -hello again -hello Mars From e347aaaed53edfe9fe48d50f1a489fd0179d0fc7 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Wed, 25 Feb 2015 00:56:25 -0600 Subject: [PATCH 06/13] second commit --- kars0011-testfile.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kars0011-testfile.md b/kars0011-testfile.md index c038fe8..d4ca83f 100644 --- a/kars0011-testfile.md +++ b/kars0011-testfile.md @@ -1,4 +1,6 @@ hello world +hello again + From 507180f5e183cf6b5d08fc938adf7d16b2c80e13 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Wed, 25 Feb 2015 00:58:10 -0600 Subject: [PATCH 07/13] third commit --- kars0011-testfile.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kars0011-testfile.md b/kars0011-testfile.md index d4ca83f..886a9b0 100644 --- a/kars0011-testfile.md +++ b/kars0011-testfile.md @@ -1,5 +1,7 @@ hello world hello again +hello mars + From 68206a19f51f8d896309425b19bd9e189c98f05a Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Fri, 27 Feb 2015 13:16:08 -0600 Subject: [PATCH 08/13] script commit --- kars0011-Lab03.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 kars0011-Lab03.sh diff --git a/kars0011-Lab03.sh b/kars0011-Lab03.sh new file mode 100755 index 0000000..cf99312 --- /dev/null +++ b/kars0011-Lab03.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# Starter shell script +# Put commands below +# To run, type ./starter.sh (you need the "./") +# It must have permissions starting with a "7" + +mkdir "boo" \ No newline at end of file From 8bbc283afd48168ca404aa8f7999fa8fe118bb5f Mon Sep 17 00:00:00 2001 From: vagrant Date: Sat, 28 Feb 2015 02:05:24 +0000 Subject: [PATCH 09/13] Lab 3 (kars0011): pull request Vagrantfile --- kars0011-Lab03.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kars0011-Lab03.sh b/kars0011-Lab03.sh index cf99312..856b47d 100755 --- a/kars0011-Lab03.sh +++ b/kars0011-Lab03.sh @@ -1,7 +1,12 @@ + #!/bin/bash # Starter shell script +# Rename as YourID-Lab03.sh # Put commands below -# To run, type ./starter.sh (you need the "./") -# It must have permissions starting with a "7" +# To run, type ./YourID-Lab03.sh (you need the "./") +# It must have permissions starting with a "7" -mkdir "boo" \ No newline at end of file +mkdir -p main/{A/{B,C,D},E/{F,G},H/{I,J/{K,L},M}} +touch main/{A/{aa,B/bb,C/cc,D/dd},E/{ee,F/ff,G/gg},H/{hh,I/ii,J/{jj,K/kk,L/ll},M/mm}} +apt-get install tree +apt-get install git From e9730f1eb18a456f6b093ff252e6795776ec1f5f Mon Sep 17 00:00:00 2001 From: vagrant Date: Sat, 28 Feb 2015 02:10:22 +0000 Subject: [PATCH 10/13] Lab 3 kars0011: Vagrantfile edit --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 3ccbac5..8ace158 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,5 +6,5 @@ Vagrant.configure(2) do |config| config.vm.box = "precise64" config.ssh.private_key_path = "~/.ssh/insecure_private_key" - + config.vm.provision :shekk, path "./kars0011-Lab03.sh" end From 1c1f31f077ec679194734c5a0f70769b7b788066 Mon Sep 17 00:00:00 2001 From: vagrant Date: Sat, 28 Feb 2015 02:12:56 +0000 Subject: [PATCH 11/13] Lab 3: Vagrantfile final version --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 8ace158..81f0725 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,5 +6,5 @@ Vagrant.configure(2) do |config| config.vm.box = "precise64" config.ssh.private_key_path = "~/.ssh/insecure_private_key" - config.vm.provision :shekk, path "./kars0011-Lab03.sh" + config.vm.provision :shell, path: "./kars0011-Lab03.sh" end From afd45f62a56510cfd4a8a79e522707d522cc13d4 Mon Sep 17 00:00:00 2001 From: rawankarsou Date: Fri, 27 Feb 2015 20:16:25 -0600 Subject: [PATCH 12/13] Lab 3: little fix. grrr --- kars0011-Lab03.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kars0011-Lab03.sh b/kars0011-Lab03.sh index 856b47d..4161ce1 100755 --- a/kars0011-Lab03.sh +++ b/kars0011-Lab03.sh @@ -8,5 +8,5 @@ mkdir -p main/{A/{B,C,D},E/{F,G},H/{I,J/{K,L},M}} touch main/{A/{aa,B/bb,C/cc,D/dd},E/{ee,F/ff,G/gg},H/{hh,I/ii,J/{jj,K/kk,L/ll},M/mm}} -apt-get install tree -apt-get install git +sudo apt-get install -y tree +sudo apt-get install -y git From 430b282b1f3d9f12cc29a26d7a2e5362a98cddaf Mon Sep 17 00:00:00 2001 From: vagrant Date: Sat, 28 Feb 2015 02:23:05 +0000 Subject: [PATCH 13/13] Lab 3: Vagrantfile - added vim to VM deployment script --- kars0011-Lab03.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/kars0011-Lab03.sh b/kars0011-Lab03.sh index 4161ce1..fe834a8 100755 --- a/kars0011-Lab03.sh +++ b/kars0011-Lab03.sh @@ -10,3 +10,4 @@ mkdir -p main/{A/{B,C,D},E/{F,G},H/{I,J/{K,L},M}} touch main/{A/{aa,B/bb,C/cc,D/dd},E/{ee,F/ff,G/gg},H/{hh,I/ii,J/{jj,K/kk,L/ll},M/mm}} sudo apt-get install -y tree sudo apt-get install -y git +sudo apt-get install -y vim