From 28e3d13cd19883616cd9f7d298a10c847ae1c77a Mon Sep 17 00:00:00 2001
From: Valentin <valentin@figureslibres.io>
Date: Fri, 3 May 2024 22:21:29 +0200
Subject: [PATCH] remove all variable and function sourcing from bin srcipts

---
 README.md                      | 2 +-
 bin/create_user.sh             | 2 --
 bin/import_directus_db.sh      | 3 ---
 bin/import_directus_schema.sh  | 3 ---
 bin/install_caddy.sh           | 3 ---
 bin/install_directus.sh        | 3 ---
 bin/install_mariadb.sh         | 3 ---
 bin/install_node.sh            | 3 ---
 bin/install_nuxt_front.sh      | 3 ---
 bin/set_url.sh                 | 3 ---
 bin/setup_directus.sh          | 3 ---
 bin/setup_directus_db.sh       | 3 ---
 bin/setup_firewall_fail2ban.sh | 3 ---
 bin/setup_ssh.sh               | 2 --
 bin/setup_webhook.sh           | 3 ---
 15 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 65a44ba..6261abc 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ On a fresh install as root user using
 
 `git clone https://gitea.valentin-le-moign.fr/val/deployment_dcdn_static`
 
-`cd deployment-dcdn_static`
+`cd deployment_dcdn_static`
 
 `chmod u+x install.sh`
 
diff --git a/bin/create_user.sh b/bin/create_user.sh
index 92a8501..66a8854 100644
--- a/bin/create_user.sh
+++ b/bin/create_user.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-
 echo -e "${PURPLE}${BOLD}Create user${RESET}"
 
 read -p "Enter username: " username
diff --git a/bin/import_directus_db.sh b/bin/import_directus_db.sh
index fc87f97..ba0265f 100644
--- a/bin/import_directus_db.sh
+++ b/bin/import_directus_db.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 get_ssh_port
 get_username
 get_ip
diff --git a/bin/import_directus_schema.sh b/bin/import_directus_schema.sh
index e10bafe..0c09f85 100644
--- a/bin/import_directus_schema.sh
+++ b/bin/import_directus_schema.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 get_username
 get_ip
 get_ssh_port
diff --git a/bin/install_caddy.sh b/bin/install_caddy.sh
index ea2c1df..6e00b03 100644
--- a/bin/install_caddy.sh
+++ b/bin/install_caddy.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 if systemctl is-enabled apache2 >/dev/null 2>&1; then
     systemctl disable --now apache2
 fi
diff --git a/bin/install_directus.sh b/bin/install_directus.sh
index 1801bd5..e69f5b4 100644
--- a/bin/install_directus.sh
+++ b/bin/install_directus.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 install_pkg tmux
 
 if [[ -z "$DB_DIRECTUS_PASSWORD" ]]; then
diff --git a/bin/install_mariadb.sh b/bin/install_mariadb.sh
index 9b11d92..d2e3631 100644
--- a/bin/install_mariadb.sh
+++ b/bin/install_mariadb.sh
@@ -3,9 +3,6 @@
 # Automate mysql secure installation for debian-based systems
 # https://gist.github.com/coderua/5592d95970038944d099
 
-. bin/variables.sh
-. bin/functions.sh
-
 install_pkg mariadb-server
 echo -e "${ORANGE}${BOLD}Generate and store the password somewhere safe${RESET}"
 echo -e "${PURPLE}${BOLD}Enter the MariaDB root password : ${RESET}"
diff --git a/bin/install_node.sh b/bin/install_node.sh
index 675d960..20455c2 100644
--- a/bin/install_node.sh
+++ b/bin/install_node.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 touch /var/www/.bashrc
 mkdir -p /var/www/.nvm
 mkdir /var/www/.npm
diff --git a/bin/install_nuxt_front.sh b/bin/install_nuxt_front.sh
index 355a2a0..3579529 100644
--- a/bin/install_nuxt_front.sh
+++ b/bin/install_nuxt_front.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 get_ip
 
 echo -e "${PURPLE}${BOLD}Create and push a prod branch on the repo${RESET}"
diff --git a/bin/set_url.sh b/bin/set_url.sh
index 9348bd1..16ee30f 100644
--- a/bin/set_url.sh
+++ b/bin/set_url.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 echo -e "${PURPLE}${BOLD}Enter the domain name of the website${RESET}"
 read DOMAIN_NAME
 get_ip
diff --git a/bin/setup_directus.sh b/bin/setup_directus.sh
index 1ef279f..3e4f775 100644
--- a/bin/setup_directus.sh
+++ b/bin/setup_directus.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 echo -e "${ORANGE}${BOLD}Generate and store the credentials somewhere safe${RESET}"
 echo -e "${PURPLE}${BOLD}Enter the Directus admin email : ${RESET}"
 read directus_admin_email
diff --git a/bin/setup_directus_db.sh b/bin/setup_directus_db.sh
index 678355f..0ac4bf1 100644
--- a/bin/setup_directus_db.sh
+++ b/bin/setup_directus_db.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 if ! dpkg -s mariadb-server >/dev/null 2>&1; then
     . bin/install_mariadb.sh
 fi
diff --git a/bin/setup_firewall_fail2ban.sh b/bin/setup_firewall_fail2ban.sh
index 6863f21..cb2a899 100644
--- a/bin/setup_firewall_fail2ban.sh
+++ b/bin/setup_firewall_fail2ban.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 echo -e "${PURPLE}${BOLD}Setup Firewall and Fail2ban${RESET}"
 install_pkg ufw
 install_pkg fail2ban
diff --git a/bin/setup_ssh.sh b/bin/setup_ssh.sh
index cfdc1ab..d6dc006 100644
--- a/bin/setup_ssh.sh
+++ b/bin/setup_ssh.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-
 echo -e "${PURPLE}${BOLD}Setup SSH${RESET}"
 
 ssh_port=$((RANDOM % (65536 - 1024 + 1) + 1024))
diff --git a/bin/setup_webhook.sh b/bin/setup_webhook.sh
index 5417755..61b555c 100644
--- a/bin/setup_webhook.sh
+++ b/bin/setup_webhook.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-. bin/variables.sh
-. bin/functions.sh
-
 echo -e "${PURPLE}${BOLD}If it does not already exists, create a webhook at the following url${RESET}"
 echo -e "${PURPLE}${BOLD}${repo_url}/settings/hooks/gitea/new${RESET}"
 echo -e "${BLUE}${BOLD}Target URL ${RESET}${BLUE}https://${domain_name}/webhook.php${RESET}"