From 9818973e600fbe3c16c7d4f51f39f34a9d52167c Mon Sep 17 00:00:00 2001
From: Johan <johan.followit@gmail.com>
Date: Tue, 7 Mar 2023 15:08:38 +0100
Subject: [PATCH] Update Bash script docs

---
 BashScript.md            | 12 ------------
 BashScripts/README.md    |  8 +++++++-
 BashScripts/vm-tweaks.sh |  2 ++
 README.md                |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 BashScript.md

diff --git a/BashScript.md b/BashScript.md
deleted file mode 100644
index 09c1f7e..0000000
--- a/BashScript.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Bash scripts
-
-### Installera Apache & uCMS prerequisites on Ubuntu
-
-<pre><code>sudo su -c "bash <(wget -qO- https://git.myspace.nu/MySpace/Docs/raw/branch/master/BashScripts/install-apache.sh)"
-cd /var/www/cms/www
-git clone https://git.myspace.nu/MySpace/uCMS-3.git .
-chmod -R ugo+rwx ./</code></pre>
-
-### Installera Active Directory Domain Controller on Ubuntu
-
-<pre><code>sudo su -c "bash <(wget -qO- https://git.myspace.nu/MySpace/Docs/raw/branch/master/BashScripts/install-ubuntu-dc.sh)"</code></pre>
diff --git a/BashScripts/README.md b/BashScripts/README.md
index eb0aef8..0a511c0 100644
--- a/BashScripts/README.md
+++ b/BashScripts/README.md
@@ -6,6 +6,12 @@
 sudo su -c "bash <(wget -qO- https://git.myspace.nu/MySpace/Docs/raw/branch/master/BashScripts/install-apache.sh)"
 ```
 
+### Optionally install uCMS
+
+<pre><code>cd /var/www/cms/www
+git clone https://git.myspace.nu/MySpace/uCMS-3.git .
+chmod -R ugo+rwx ./</code></pre>
+
 ## Install MySQL
 
 ```bash
@@ -27,7 +33,7 @@ sudo su -c "bash <(wget -qO- https://git.myspace.nu/MySpace/Docs/raw/branch/mast
 ## Install Samba Active Directory Domain Controller
 
 ```bash
-sudo su -c "bash <(wget -qO- https://git.myspace.nu/MySpace/Docs/raw/branch/master/BashScripts/install-dc.sh)"
+sudo su -c "bash <(wget -qO- https://git.myspace.nu/MySpace/Docs/raw/branch/master/BashScripts/install-ubuntu-dc.sh)"
 ```
 
 ## Install VM Tweaks
diff --git a/BashScripts/vm-tweaks.sh b/BashScripts/vm-tweaks.sh
index d844376..464a242 100644
--- a/BashScripts/vm-tweaks.sh
+++ b/BashScripts/vm-tweaks.sh
@@ -11,6 +11,8 @@ rmmod floppy > /dev/null 2>&1 && (
 	echo "blacklist floppy" | tee /etc/modprobe.d/blacklist-floppy.conf
 	dpkg-reconfigure initramfs-tools
 )
+
+# Disable Cloud-init
 if [ ! -f "/etc/cloud/cloud-init.disabled" ]; then
 	echo "Disabling cloud-init"
 	touch /etc/cloud/cloud-init.disabled
diff --git a/README.md b/README.md
index 315bb56..246d508 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@
 
 ## [Node.JS](Node.JS.md)
 
-## [Bash Scripts](BashScript.md)
+## [Bash Scripts](https://git.myspace.nu/MySpace/Docs/src/branch/master/BashScripts)