diff --git a/install/AptCacher.sh b/install/AptCacher.sh index 8fd0b75a458183a609c0553e777653e06218187d..162fad5ce37a0f750540364f6cc6eaf3fa249c64 100755 --- a/install/AptCacher.sh +++ b/install/AptCacher.sh @@ -1,13 +1,16 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then - echo "Please copy in racine of NoCloud Auto Installer main.env.sample to ain.env and edit it" + echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + apt-get update apt-get -y install apt-cacher-ng diff --git a/install/Base.sh b/install/Base.sh index 8eff28163593c497724c1bd2fd8d54236ed87ad7..f4d5c104bf6ef4c913c7ba1f8d44d3dc8d0cc62f 100644 --- a/install/Base.sh +++ b/install/Base.sh @@ -18,14 +18,17 @@ set -o nounset # Treat unset variables as an error -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + apt-get clean diff --git a/install/Certbot.sh b/install/Certbot.sh index bbd2cefcbe26da934188353d7e854c384fa2491e..164bdd629a2da6321acc66b50838a195e297dd4f 100755 --- a/install/Certbot.sh +++ b/install/Certbot.sh @@ -16,14 +16,17 @@ # You should have received a copy of the GNU General Public License # along # with this program. If not, see <http://www.gnu.org/licenses/>. -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + apt-get update && apt-get install certbot python-certbot-apache diff --git a/install/Collabora.sh b/install/Collabora.sh index f6cb72f0484e45b61857660ccfebd90684b9b5b7..128e02583a90adb80e5853187edaf52039f061f0 100644 --- a/install/Collabora.sh +++ b/install/Collabora.sh @@ -18,14 +18,17 @@ set -o nounset # Treat unset variables as an error -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + ########################################################################### # 1. Install docker diff --git a/install/Dolibarr.sh b/install/Dolibarr.sh index 3e6e0dd84207aa0a49bfcffc0e23722db12638de..99524c6275d66a8d847393abc52e0a455f470249 100644 --- a/install/Dolibarr.sh +++ b/install/Dolibarr.sh @@ -18,14 +18,17 @@ set -o nounset # Treat unset variables as an error -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + if [ -f installDolibarr.env ] diff --git a/install/GlpiAgent.sh b/install/GlpiAgent.sh index 7e39ec04df10a09a1fd571014995837a451c0c93..18661d5566743ec48e10d0dabbebab70e42150f1 100644 --- a/install/GlpiAgent.sh +++ b/install/GlpiAgent.sh @@ -1,5 +1,5 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" cd /tmp wget -O glpi.deb https://github.com/glpi-project/glpi-agent/releases/download/1.4/glpi-agent_1.4-1_all.deb diff --git a/install/Monit.sh b/install/Monit.sh index 53c05e4525fc4d5eeaa0647bc31af5a2ea76cf0a..ffa51e7ef08d7a128868125914707a5f0bf3cb30 100644 --- a/install/Monit.sh +++ b/install/Monit.sh @@ -1,13 +1,16 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + # Install monit if not installed apt-get update && apt-get install -y monit diff --git a/install/MySQL.sh b/install/MySQL.sh index 5c8a2ab1a1ca350adeaed3d5d95d6893caaa61bb..b59fd778434cdcc7bdcc2db50896ecea3926849d 100644 --- a/install/MySQL.sh +++ b/install/MySQL.sh @@ -18,14 +18,17 @@ set -o nounset # Treat unset variables as an error -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + if [ -f installMySQL.env ] then diff --git a/install/Nextcloud.sh b/install/Nextcloud.sh index 2829fac3d3e6380906ab10bde2b0c4f71cde7ac0..cb3d5feea8c0f09d2c5f9604894a71e168ed73a7 100644 --- a/install/Nextcloud.sh +++ b/install/Nextcloud.sh @@ -18,14 +18,16 @@ set -o nounset # Treat unset variables as an error -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env ########################################################################### # 1. Download Nexcloud Package diff --git a/install/NextcloudApps.sh b/install/NextcloudApps.sh index 0ab8c32c941d4f3a69d8bfe7036fc6470cc43454..fc4e04fc62f2d3b79b634ac675d4841a9fd42235 100644 --- a/install/NextcloudApps.sh +++ b/install/NextcloudApps.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" NEXTCLOUD_INSTALL_DIR="/var/www/nextcloud/" APPS="tasks news talk calendar contacts impersonate" diff --git a/install/OnlyOffice.sh b/install/OnlyOffice.sh index 9b2855a664f318e12c0244b8ef1f7861f6377002..c2d8f6253f5745ed227e10642206e8a929c704dd 100644 --- a/install/OnlyOffice.sh +++ b/install/OnlyOffice.sh @@ -1,13 +1,16 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env + . $DIR/install/main.env . $DIR/install/Nextcloud.env diff --git a/install/TetrasBack.sh b/install/TetrasBack.sh index 1a04cc1c3608f085d10613022438ba85d3cb596f..50bb267ed756d95b1e36dd13c42186be1f9a0a25 100644 --- a/install/TetrasBack.sh +++ b/install/TetrasBack.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along # with this program. If not, see <http://www.gnu.org/licenses/>. -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" TB_CONFIG_ServerName=${TB_CONFIG_ServerName:-tetras-back.${DOMAIN}} TB_CONFIG_ServerAdmin=${TB_CONFIG_ServerAdmin:-${SERVER_ADMIN}} diff --git a/install/Traefik.sh b/install/Traefik.sh index 5adfac28e0582c2bd404d0b859b960eac884658d..0b928be3713238f5926e7e73dbdfe86d91a7bd26 100644 --- a/install/Traefik.sh +++ b/install/Traefik.sh @@ -1,13 +1,15 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main. apt-get update diff --git a/install/WebServer.sh b/install/WebServer.sh index 9b68940243570659a37b7c18ef43eb089d898e11..715d0e484c1a2503c12b54b0e3f1133bb4b94cb4 100644 --- a/install/WebServer.sh +++ b/install/WebServer.sh @@ -18,14 +18,16 @@ set -o nounset # Treat unset variables as an error -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" -if [ ! -e $(pwd)/$(dirname "$0")/../main.env ] +if [ ! -e $(dirname "$0")/../main.env ] then echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it" exit 1 +else + echo "Environment file loaded" fi -. $(pwd)/$(dirname "$0")/../main.env +. $(dirname "$0")/../main.env apt-get update diff --git a/install/ncdu.sh b/install/ncdu.sh index 701fd0f649446c85f03ae36259adf8f5f7ca11b8..ab3d09453d32ebbe6ded99626053fe9fb0d15394 100644 --- a/install/ncdu.sh +++ b/install/ncdu.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" # Install ncdu for disk usage analysis if [ -z "$(dpkg -l | grep ncdu)" ]; then