From 7d3bd4ca2aa1ce4da3996152db4b78265b0e76cb Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 15:42:07 +0100 Subject: [PATCH 01/21] adding script.sh --- site-modules/adhoc/tasks/script.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 site-modules/adhoc/tasks/script.sh diff --git a/site-modules/adhoc/tasks/script.sh b/site-modules/adhoc/tasks/script.sh new file mode 100644 index 0000000..eebfd9b --- /dev/null +++ b/site-modules/adhoc/tasks/script.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +# script content goes here From 499bd376c0b0959b347217a6e5ce59edb50ed033 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 15:43:45 +0100 Subject: [PATCH 02/21] Create script.ps1 --- site-modules/adhoc/tasks/script.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 site-modules/adhoc/tasks/script.ps1 diff --git a/site-modules/adhoc/tasks/script.ps1 b/site-modules/adhoc/tasks/script.ps1 new file mode 100644 index 0000000..ace100b --- /dev/null +++ b/site-modules/adhoc/tasks/script.ps1 @@ -0,0 +1 @@ +# script content goes here From 90e3dce67ba1a8a03284ad64fd1f90bde6bb5ac6 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:10:11 +0100 Subject: [PATCH 03/21] Create myplan.pp --- site-modules/adhoc/plans/myplan.pp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 site-modules/adhoc/plans/myplan.pp diff --git a/site-modules/adhoc/plans/myplan.pp b/site-modules/adhoc/plans/myplan.pp new file mode 100644 index 0000000..1512c31 --- /dev/null +++ b/site-modules/adhoc/plans/myplan.pp @@ -0,0 +1,9 @@ +# This is a description for my plan +plan adhoc::myplan( +# input parameters go here + TargetSpec $targets, +) { + +# plan steps go here + +} From 60ee3081e66bc044b9bdc96f372db589357f47c2 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:11:42 +0100 Subject: [PATCH 04/21] Rename script.ps1 to winscript.ps1 --- site-modules/adhoc/tasks/{script.ps1 => winscript.ps1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{script.ps1 => winscript.ps1} (100%) diff --git a/site-modules/adhoc/tasks/script.ps1 b/site-modules/adhoc/tasks/winscript.ps1 similarity index 100% rename from site-modules/adhoc/tasks/script.ps1 rename to site-modules/adhoc/tasks/winscript.ps1 From 4471cd665eb65a7195725655053b0be2c15d1c61 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:11:54 +0100 Subject: [PATCH 05/21] Rename script.sh to nixscript.sh --- site-modules/adhoc/tasks/{script.sh => nixscript.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{script.sh => nixscript.sh} (100%) diff --git a/site-modules/adhoc/tasks/script.sh b/site-modules/adhoc/tasks/nixscript.sh similarity index 100% rename from site-modules/adhoc/tasks/script.sh rename to site-modules/adhoc/tasks/nixscript.sh From 063ff0e342d19847207c7ea58ffda30b722befdb Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:12:18 +0100 Subject: [PATCH 06/21] Rename nixscript.sh to nix.sh --- site-modules/adhoc/tasks/{nixscript.sh => nix.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{nixscript.sh => nix.sh} (100%) diff --git a/site-modules/adhoc/tasks/nixscript.sh b/site-modules/adhoc/tasks/nix.sh similarity index 100% rename from site-modules/adhoc/tasks/nixscript.sh rename to site-modules/adhoc/tasks/nix.sh From f4c9cd90fc0bc8fa14c0ec4a44435c3a0df58cad Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:12:32 +0100 Subject: [PATCH 07/21] Rename winscript.ps1 to win.ps1 --- site-modules/adhoc/tasks/{winscript.ps1 => win.ps1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{winscript.ps1 => win.ps1} (100%) diff --git a/site-modules/adhoc/tasks/winscript.ps1 b/site-modules/adhoc/tasks/win.ps1 similarity index 100% rename from site-modules/adhoc/tasks/winscript.ps1 rename to site-modules/adhoc/tasks/win.ps1 From 061ca3be10e05e39810afd350737b0acaf90014d Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:17:23 +0100 Subject: [PATCH 08/21] Create nix.json --- site-modules/adhoc/tasks/nix.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 site-modules/adhoc/tasks/nix.json diff --git a/site-modules/adhoc/tasks/nix.json b/site-modules/adhoc/tasks/nix.json new file mode 100644 index 0000000..73b7252 --- /dev/null +++ b/site-modules/adhoc/tasks/nix.json @@ -0,0 +1,4 @@ +{ + "description": "This is the description for the nix task", + "input_method": "environment" + } From c4ca5e9b46acd6cd2b8e89a0a2f5555e5249c9d1 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:17:38 +0100 Subject: [PATCH 09/21] Create win.json --- site-modules/adhoc/tasks/win.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 site-modules/adhoc/tasks/win.json diff --git a/site-modules/adhoc/tasks/win.json b/site-modules/adhoc/tasks/win.json new file mode 100644 index 0000000..b2ffa6b --- /dev/null +++ b/site-modules/adhoc/tasks/win.json @@ -0,0 +1,4 @@ +{ + "description": "This is the description for the win task", + "input_method": "environment" + } From 76aa3960c9ceeefeffd02d0372352eb3d3def96a Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:20:16 +0100 Subject: [PATCH 10/21] Update win.json --- site-modules/adhoc/tasks/win.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/adhoc/tasks/win.json b/site-modules/adhoc/tasks/win.json index b2ffa6b..11415ce 100644 --- a/site-modules/adhoc/tasks/win.json +++ b/site-modules/adhoc/tasks/win.json @@ -1,4 +1,4 @@ { "description": "This is the description for the win task", - "input_method": "environment" + "input_method": "powershell" } From fe708d35b604b0fbba68bb71c7b456c5c6c8d60e Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:42:07 +0100 Subject: [PATCH 11/21] Update and rename nix.json to nix_example.json --- site-modules/adhoc/tasks/nix.json | 4 ---- site-modules/adhoc/tasks/nix_example.json | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 site-modules/adhoc/tasks/nix.json create mode 100644 site-modules/adhoc/tasks/nix_example.json diff --git a/site-modules/adhoc/tasks/nix.json b/site-modules/adhoc/tasks/nix.json deleted file mode 100644 index 73b7252..0000000 --- a/site-modules/adhoc/tasks/nix.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "This is the description for the nix task", - "input_method": "environment" - } diff --git a/site-modules/adhoc/tasks/nix_example.json b/site-modules/adhoc/tasks/nix_example.json new file mode 100644 index 0000000..8c5ed75 --- /dev/null +++ b/site-modules/adhoc/tasks/nix_example.json @@ -0,0 +1,4 @@ +{ + "description": "This is the description for the nix_example task", + "input_method": "environment" + } From 3ea34209fe15f58b7cd36dd457868a9f83c91e24 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:42:18 +0100 Subject: [PATCH 12/21] Rename nix.sh to nix_example.sh --- site-modules/adhoc/tasks/{nix.sh => nix_example.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{nix.sh => nix_example.sh} (100%) diff --git a/site-modules/adhoc/tasks/nix.sh b/site-modules/adhoc/tasks/nix_example.sh similarity index 100% rename from site-modules/adhoc/tasks/nix.sh rename to site-modules/adhoc/tasks/nix_example.sh From 7a2efe24e01f74fca33a16cb1e1d360affc44a41 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:42:29 +0100 Subject: [PATCH 13/21] Rename win.json to win_example.json --- site-modules/adhoc/tasks/{win.json => win_example.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{win.json => win_example.json} (100%) diff --git a/site-modules/adhoc/tasks/win.json b/site-modules/adhoc/tasks/win_example.json similarity index 100% rename from site-modules/adhoc/tasks/win.json rename to site-modules/adhoc/tasks/win_example.json From 694e89034bd4db1fff7bcd8120df7a33b91cdb60 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:42:46 +0100 Subject: [PATCH 14/21] Rename win.ps1 to win_example.ps1 --- site-modules/adhoc/tasks/{win.ps1 => win_example.ps1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site-modules/adhoc/tasks/{win.ps1 => win_example.ps1} (100%) diff --git a/site-modules/adhoc/tasks/win.ps1 b/site-modules/adhoc/tasks/win_example.ps1 similarity index 100% rename from site-modules/adhoc/tasks/win.ps1 rename to site-modules/adhoc/tasks/win_example.ps1 From 01a2757a2c2b6b8876a5e010eb2159fd0349845f Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 12 May 2021 17:43:05 +0100 Subject: [PATCH 15/21] Update win_example.json --- site-modules/adhoc/tasks/win_example.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/adhoc/tasks/win_example.json b/site-modules/adhoc/tasks/win_example.json index 11415ce..cfac998 100644 --- a/site-modules/adhoc/tasks/win_example.json +++ b/site-modules/adhoc/tasks/win_example.json @@ -1,4 +1,4 @@ { - "description": "This is the description for the win task", + "description": "This is the description for the win_example task", "input_method": "powershell" } From ab2fc06328f482ed2196ef72f383f961167401b9 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 19 May 2021 10:03:28 +0100 Subject: [PATCH 16/21] Indent to level of line number (line 4) being described Co-authored-by: Reid Vandewiele --- site-modules/adhoc/plans/myplan.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/adhoc/plans/myplan.pp b/site-modules/adhoc/plans/myplan.pp index 1512c31..6a52372 100644 --- a/site-modules/adhoc/plans/myplan.pp +++ b/site-modules/adhoc/plans/myplan.pp @@ -1,6 +1,6 @@ # This is a description for my plan plan adhoc::myplan( -# input parameters go here + # input parameters go here TargetSpec $targets, ) { From e781ffc0015422365674411a1309a2e05d5f460d Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 19 May 2021 10:03:58 +0100 Subject: [PATCH 17/21] Indentation for JSON 4 spaces, closing brace at same level as opening brace Co-authored-by: Reid Vandewiele --- site-modules/adhoc/tasks/nix_example.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site-modules/adhoc/tasks/nix_example.json b/site-modules/adhoc/tasks/nix_example.json index 8c5ed75..2c4d5c7 100644 --- a/site-modules/adhoc/tasks/nix_example.json +++ b/site-modules/adhoc/tasks/nix_example.json @@ -1,4 +1,4 @@ { - "description": "This is the description for the nix_example task", - "input_method": "environment" - } + "description": "This is the description for the nix_example task", + "input_method": "environment" +} From d5ae85cc4891aa3ba34287eb56b13991465d5b99 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 19 May 2021 10:04:27 +0100 Subject: [PATCH 18/21] Indentation fix Co-authored-by: Reid Vandewiele --- site-modules/adhoc/plans/myplan.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/adhoc/plans/myplan.pp b/site-modules/adhoc/plans/myplan.pp index 6a52372..e60e742 100644 --- a/site-modules/adhoc/plans/myplan.pp +++ b/site-modules/adhoc/plans/myplan.pp @@ -4,6 +4,6 @@ plan adhoc::myplan( TargetSpec $targets, ) { -# plan steps go here + # plan steps go here } From 6246354f477473d8480d67ce25e9c5b9234f0852 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 19 May 2021 10:04:45 +0100 Subject: [PATCH 19/21] Indentation for JSON 4 spaces, closing brace at same level as opening brace Co-authored-by: Reid Vandewiele --- site-modules/adhoc/tasks/win_example.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site-modules/adhoc/tasks/win_example.json b/site-modules/adhoc/tasks/win_example.json index cfac998..42dccda 100644 --- a/site-modules/adhoc/tasks/win_example.json +++ b/site-modules/adhoc/tasks/win_example.json @@ -1,4 +1,4 @@ { - "description": "This is the description for the win_example task", - "input_method": "powershell" - } + "description": "This is the description for the win_example task", + "input_method": "powershell" +} From 7a5498c05e084fb1a161306769ad67924721ca77 Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 19 May 2021 10:05:10 +0100 Subject: [PATCH 20/21] change of language script > task Co-authored-by: Reid Vandewiele --- site-modules/adhoc/tasks/nix_example.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/adhoc/tasks/nix_example.sh b/site-modules/adhoc/tasks/nix_example.sh index eebfd9b..6b06377 100644 --- a/site-modules/adhoc/tasks/nix_example.sh +++ b/site-modules/adhoc/tasks/nix_example.sh @@ -1,3 +1,3 @@ #!/bin/bash -# script content goes here +# task content goes here From 831d665de9a0dddf9beb5876b1f80119bf32fb0f Mon Sep 17 00:00:00 2001 From: Marc McKinley Date: Wed, 19 May 2021 10:05:44 +0100 Subject: [PATCH 21/21] change of language script > task Co-authored-by: Reid Vandewiele --- site-modules/adhoc/tasks/win_example.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/adhoc/tasks/win_example.ps1 b/site-modules/adhoc/tasks/win_example.ps1 index ace100b..3a109ee 100644 --- a/site-modules/adhoc/tasks/win_example.ps1 +++ b/site-modules/adhoc/tasks/win_example.ps1 @@ -1 +1 @@ -# script content goes here +# task content goes here