Merge pull request #7 from jpfulton:reorganize-folders

Reorganize-folders
jpfulton · Aug 20, 2023 · 2192126 · 2192126
2 parents 846ca70 + 2c6e60d
commit 2192126
Show file tree

Hide file tree

Showing 51 changed files with 68 additions and 213 deletions.
diff --git a/linux-scripts/README.md → linux/README.md b/linux-scripts/README.md → linux/README.md
@@ -1,4 +1,4 @@
-# linux-scripts
+# linux
 
 This folder contains scripts for remote execution on a Linux virtual machine
 to update and configure the operating system.
diff --git a/linux-scripts/core/README.md → linux/core/README.md b/linux-scripts/core/README.md → linux/core/README.md
diff --git a/linux-scripts/core/clean-up.sh → linux/core/clean-up.sh b/linux-scripts/core/clean-up.sh → linux/core/clean-up.sh
diff --git a/linux-scripts/core/setup-firewall.sh → linux/core/setup-firewall.sh b/linux-scripts/core/setup-firewall.sh → linux/core/setup-firewall.sh
diff --git a/linux-scripts/core/setup-motd.sh → linux/core/setup-motd.sh b/linux-scripts/core/setup-motd.sh → linux/core/setup-motd.sh
diff --git a/linux-scripts/core/setup-node-and-yarn.sh → linux/core/setup-node-and-yarn.sh b/linux-scripts/core/setup-node-and-yarn.sh → linux/core/setup-node-and-yarn.sh
diff --git a/linux-scripts/core/update-base-packages.sh → linux/core/update-base-packages.sh b/linux-scripts/core/update-base-packages.sh → linux/core/update-base-packages.sh
diff --git a/linux-scripts/openvpn/README.md → linux/openvpn/README.md b/linux-scripts/openvpn/README.md → linux/openvpn/README.md
diff --git a/...ripts/openvpn/configure-openvpn-server.sh → linux/openvpn/configure-openvpn-server.sh b/...ripts/openvpn/configure-openvpn-server.sh → linux/openvpn/configure-openvpn-server.sh
diff --git a/...x-scripts/openvpn/create-client-config.sh → linux/openvpn/create-client-config.sh b/...x-scripts/openvpn/create-client-config.sh → linux/openvpn/create-client-config.sh
diff --git a/...pts/openvpn/create-server-certificates.sh → linux/openvpn/create-server-certificates.sh b/...pts/openvpn/create-server-certificates.sh → linux/openvpn/create-server-certificates.sh
diff --git a/...ripts/openvpn/install-openvpn-and-deps.sh → linux/openvpn/install-openvpn-and-deps.sh b/...ripts/openvpn/install-openvpn-and-deps.sh → linux/openvpn/install-openvpn-and-deps.sh
diff --git a/linux-scripts/spot/README.md → linux/spot/README.md b/linux-scripts/spot/README.md → linux/spot/README.md
diff --git a/...ts/spot/setup-eviction-shutdown-system.sh → linux/spot/setup-eviction-shutdown-system.sh b/...ts/spot/setup-eviction-shutdown-system.sh → linux/spot/setup-eviction-shutdown-system.sh
diff --git a/linux-scripts/spot/setup-sms-notifier.sh → linux/spot/setup-sms-notifier.sh b/linux-scripts/spot/setup-sms-notifier.sh → linux/spot/setup-sms-notifier.sh
diff --git a/linux-scripts/spot/update-notifier-config.sh → linux/spot/update-notifier-config.sh b/linux-scripts/spot/update-notifier-config.sh → linux/spot/update-notifier-config.sh
diff --git a/powershell/admin/dev-tools/checkout-jpfulton-repos.ps1 b/powershell/admin/dev-tools/checkout-jpfulton-repos.ps1
diff --git a/powershell/admin/wsl/README.md b/powershell/admin/wsl/README.md
diff --git a/powershell/admin/wsl/config-wsl.ps1 b/powershell/admin/wsl/config-wsl.ps1
diff --git a/powershell/admin/wsl/enable-wsl-systemd.ps1 b/powershell/admin/wsl/enable-wsl-systemd.ps1
diff --git a/powershell/admin/wsl/install-wsl.ps1 b/powershell/admin/wsl/install-wsl.ps1
diff --git a/powershell/admin/wsl/update-wsl-distro.ps1 b/powershell/admin/wsl/update-wsl-distro.ps1
diff --git a/powershell/azure/enable-virtual-machine-platform.ps1 b/powershell/azure/enable-virtual-machine-platform.ps1
diff --git a/scripts/create-linux-server.sh b/scripts/create-linux-server.sh
@@ -368,14 +368,14 @@ main () {
   login-to-admin-acct;
 
   # copy setup scripts to server
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/core/update-base-packages.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/core/setup-firewall.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/core/setup-motd.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/core/setup-node-and-yarn.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/spot/setup-sms-notifier.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/spot/setup-eviction-shutdown-system.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/spot/update-notifier-config.sh;
-  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/core/clean-up.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/core/update-base-packages.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/core/setup-firewall.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/core/setup-motd.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/core/setup-node-and-yarn.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/spot/setup-sms-notifier.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/spot/setup-eviction-shutdown-system.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/spot/update-notifier-config.sh;
+  scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/core/clean-up.sh;
 
   # execute remote setup scripts
   echo "Executing base platform setup scripts...";
@@ -403,10 +403,10 @@ main () {
   if [ "$OPENVPN" -eq 1 ]
     then
       echo "Copying OpenVPN setup scripts to server...";
-      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/openvpn/install-openvpn-and-deps.sh;
-      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/openvpn/create-server-certificates.sh;
-      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/openvpn/configure-openvpn-server.sh;
-      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux-scripts/openvpn/create-client-config.sh;
+      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/openvpn/install-openvpn-and-deps.sh;
+      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/openvpn/create-server-certificates.sh;
+      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/openvpn/configure-openvpn-server.sh;
+      scp-file-to-admin-home ${CURRENT_SCRIPT_DIR}../linux/openvpn/create-client-config.sh;
 
       echo "Executing OpenVPN setup scripts...";
       run-script-from-admin-home install-openvpn-and-deps.sh;