diff options
68 files changed, 74 insertions, 82 deletions
diff --git a/addons/automatic_updates.sh b/addons/automatic_updates.sh index 17e364f0..f328c5a7 100644 --- a/addons/automatic_updates.sh +++ b/addons/automatic_updates.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Automatic Updates" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) print_text_in_color "$ICyan" "Configuring automatic updates..." diff --git a/addons/locales.sh b/addons/locales.sh index 93c8056f..63918083 100644 --- a/addons/locales.sh +++ b/addons/locales.sh @@ -8,10 +8,6 @@ SCRIPT_NAME="Locales" # shellcheck source=lib.sh source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -### TODO Remove this after some releases -# Download fetch_lib.sh to be able to use it -download_script STATIC fetch_lib - # Check for errors + debug code and abort if something isn't right # 1 = ON # 0 = OFF diff --git a/addons/locate_mirror.sh b/addons/locate_mirror.sh index aea8bdf2..4736ffc7 100644 --- a/addons/locate_mirror.sh +++ b/addons/locate_mirror.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Locate Mirror" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Must be root root_check diff --git a/addons/redis-server-ubuntu.sh b/addons/redis-server-ubuntu.sh index 1ca36fbf..80cbbe07 100644 --- a/addons/redis-server-ubuntu.sh +++ b/addons/redis-server-ubuntu.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Redis Server Ubuntu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ diff --git a/addons/security.sh b/addons/security.sh index 584a6eb4..e4a23db3 100644 --- a/addons/security.sh +++ b/addons/security.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Setup Extra Security" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/addons/smtp-mail.sh b/addons/smtp-mail.sh index f056a67a..729fe24d 100644 --- a/addons/smtp-mail.sh +++ b/addons/smtp-mail.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="SMTP Relay with msmtp" SCRIPT_EXPLAINER="This script will setup an SMTP Relay (Mail Server) in your Nextcloud Server \ that will be used to send emails about failed cronjob's and such." # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/adminer.sh b/apps/adminer.sh index cbd7b6fc..f1a18bab 100644 --- a/apps/adminer.sh +++ b/apps/adminer.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Adminer" SCRIPT_EXPLAINER="Adminer is a full-featured database management tool written in PHP." # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/bitwarden-rs.sh b/apps/bitwarden-rs.sh index 39730ef0..294a279d 100644 --- a/apps/bitwarden-rs.sh +++ b/apps/bitwarden-rs.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden RS" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -62,7 +62,7 @@ SUBDOMAIN=$(input_box_flow "Please enter the Domain that you want to use for Bit # curl the lib another time to get the correct https_conf # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) msg_box "Before continuing, please make sure that you have you have edited the DNS settings for $SUBDOMAIN, and opened port 80 and 443 directly to this servers IP. A full exstensive guide can be found here: https://www.techandme.se/open-port-80-443 diff --git a/apps/bitwarden-rs_admin-panel.sh b/apps/bitwarden-rs_admin-panel.sh index e35baf56..277186a8 100644 --- a/apps/bitwarden-rs_admin-panel.sh +++ b/apps/bitwarden-rs_admin-panel.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden RS Admin" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/bitwarden_mailconfig.sh b/apps/bitwarden_mailconfig.sh index 6a25de86..48b905c3 100644 --- a/apps/bitwarden_mailconfig.sh +++ b/apps/bitwarden_mailconfig.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden Mail Configuration" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/bitwarden_registration.sh b/apps/bitwarden_registration.sh index a895bb8f..98d77842 100644 --- a/apps/bitwarden_registration.sh +++ b/apps/bitwarden_registration.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden Registration" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/clamav.sh b/apps/clamav.sh index e733f12e..828d771b 100644 --- a/apps/clamav.sh +++ b/apps/clamav.sh @@ -9,7 +9,7 @@ SCRIPT_EXPLAINER="This script installs the open-source antivirus-software ClamAV and configures Nextcloud to detect infected files already during the upload. At the end of the script, you will be able to choose to setup a weekly full scan of all files." # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -164,7 +164,7 @@ cat << CLAMAV_REPORT > "$SCRIPTS"/clamav-fullscan.sh # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) AV_REPORT="$(clamscan \ --recursive \ diff --git a/apps/collabora_docker.sh b/apps/collabora_docker.sh index 0a425470..4c0bf0b4 100644 --- a/apps/collabora_docker.sh +++ b/apps/collabora_docker.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Collabora (Docker)" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -158,7 +158,7 @@ NCDOMAIN_ESCAPED=${NCDOMAIN//[.]/\\\\.} # Curl the library another time to get the correct https_conf # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/apps/collabora_integrated.sh b/apps/collabora_integrated.sh index cf3e7244..d5fc0cf1 100644 --- a/apps/collabora_integrated.sh +++ b/apps/collabora_integrated.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Collabora (Integrated)" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh index 8d20c3c4..3ec26431 100644 --- a/apps/fail2ban.sh +++ b/apps/fail2ban.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Fail2ban" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh index d60dcd93..30f830ec 100644 --- a/apps/fulltextsearch.sh +++ b/apps/fulltextsearch.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Full Text Search" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library ncdb diff --git a/apps/netdata.sh b/apps/netdata.sh index 189c15dd..8c8469c1 100644 --- a/apps/netdata.sh +++ b/apps/netdata.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Netdata" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/onlyoffice_docker.sh b/apps/onlyoffice_docker.sh index 53ef3af5..c4c97c55 100644 --- a/apps/onlyoffice_docker.sh +++ b/apps/onlyoffice_docker.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="OnlyOffice (Docker)" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -171,7 +171,7 @@ NCDOMAIN=$(occ_command_no_check config:system:get overwrite.cli.url | sed 's|htt # shellcheck disable=2034,2059 true # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/apps/onlyoffice_integrated.sh b/apps/onlyoffice_integrated.sh index 885c7784..01c9d005 100644 --- a/apps/onlyoffice_integrated.sh +++ b/apps/onlyoffice_integrated.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="OnlyOffice (Integrated)" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/apps/previewgenerator.sh b/apps/previewgenerator.sh index f6932fbb..271efa9c 100644 --- a/apps/previewgenerator.sh +++ b/apps/previewgenerator.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Preview Generator" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/smbmount.sh b/apps/smbmount.sh index e17d19cf..ed9d1ab6 100644 --- a/apps/smbmount.sh +++ b/apps/smbmount.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="SMB Mount" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/talk.sh b/apps/talk.sh index 86e29c2d..3f38d323 100644 --- a/apps/talk.sh +++ b/apps/talk.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Talk" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/apps/talk_signaling.sh b/apps/talk_signaling.sh index 8f7be145..9c52c565 100644 --- a/apps/talk_signaling.sh +++ b/apps/talk_signaling.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Talk with Signaling Server" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update @@ -234,7 +234,7 @@ SUBDOMAIN=$(input_box_flow "Talk Signaling Server subdomain e.g: talk.yourdomain # curl the lib another time to get the correct https_conf # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Notification msg_box "Before continuing, please make sure that you have you have edited the DNS settings for $SUBDOMAIN, and opened port 80 and 443 directly to this servers IP. A full exstensive guide can be found here: diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh index 94ae1850..6a86bf05 100644 --- a/apps/tmbitwarden.sh +++ b/apps/tmbitwarden.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -204,7 +204,7 @@ fi # Curl the lib another time to get the correct HTTPS_CONF # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if $SUBDOMAIN exists and is reachable print_text_in_color "$ICyan" "Checking if $SUBDOMAIN exists and is reachable..." diff --git a/apps/webmin.sh b/apps/webmin.sh index 6f2268e4..22adc17e 100644 --- a/apps/webmin.sh +++ b/apps/webmin.sh @@ -10,7 +10,7 @@ Using any modern web browser, you can setup user accounts, Apache, DNS, file sha Webmin removes the need to manually edit Unix configuration files like /etc/passwd, and lets you manage a system from the console or remotely. See the following page with standard modules for a list of all the functions built into Webmin: https://webmin.com/standard.html" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/disk/change-to-zfs-mount-generator.sh b/disk/change-to-zfs-mount-generator.sh index e4364c58..25419609 100644 --- a/disk/change-to-zfs-mount-generator.sh +++ b/disk/change-to-zfs-mount-generator.sh @@ -14,7 +14,7 @@ true SCRIPT_NAME="Change to ZFS Mount Generator" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if root root_check diff --git a/disk/format-chosen.sh b/disk/format-chosen.sh index e194d797..70a189cd 100644 --- a/disk/format-chosen.sh +++ b/disk/format-chosen.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Format Chosen Disk" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if root root_check diff --git a/disk/format-sdb.sh b/disk/format-sdb.sh index 4ebf0d7b..56417b15 100644 --- a/disk/format-sdb.sh +++ b/disk/format-sdb.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Format sdb" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if root root_check diff --git a/disk/prune_zfs_snaphots.sh b/disk/prune_zfs_snaphots.sh index 53a8c73f..57c03a47 100644 --- a/disk/prune_zfs_snaphots.sh +++ b/disk/prune_zfs_snaphots.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Prune ZFS Snapshots" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/disk/smartctl.sh b/disk/smartctl.sh index f8b93c9c..58220aac 100644 --- a/disk/smartctl.sh +++ b/disk/smartctl.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Setup smartctl" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/lets-encrypt/activate-ssl.sh b/lets-encrypt/activate-ssl.sh index d8bbf01a..6cd79b28 100644 --- a/lets-encrypt/activate-ssl.sh +++ b/lets-encrypt/activate-ssl.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Activate TLS" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # This is needed since we removed this from the startup script, or changed name so it can't be downloaded anymore msg_box "You are running an outdated release. diff --git a/lets-encrypt/activate-tls.sh b/lets-encrypt/activate-tls.sh index 4ab1b0ee..c1fb8c74 100644 --- a/lets-encrypt/activate-tls.sh +++ b/lets-encrypt/activate-tls.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Activate TLS" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ @@ -66,7 +66,7 @@ fi # Curl the lib another time to get the correct https_conf # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if $TLSDOMAIN exists and is reachable echo diff --git a/lets-encrypt/test-new-config.sh b/lets-encrypt/test-new-config.sh index 15cc691c..57efff1b 100644 --- a/lets-encrypt/test-new-config.sh +++ b/lets-encrypt/test-new-config.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Test New Configuration" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ diff --git a/menu/additional_apps.sh b/menu/additional_apps.sh index f3c71a2e..c5a44cb6 100644 --- a/menu/additional_apps.sh +++ b/menu/additional_apps.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Additional Apps Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/bitwarden_menu.sh b/menu/bitwarden_menu.sh index 6d9ef49a..114181bd 100644 --- a/menu/bitwarden_menu.sh +++ b/menu/bitwarden_menu.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/documentserver.sh b/menu/documentserver.sh index 7dc6abf4..b368543e 100644 --- a/menu/documentserver.sh +++ b/menu/documentserver.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Documentserver Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/fail2ban_menu.sh b/menu/fail2ban_menu.sh index 5e361a72..6fe511d2 100644 --- a/menu/fail2ban_menu.sh +++ b/menu/fail2ban_menu.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Fail2ban Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/main_menu.sh b/menu/main_menu.sh index f06dec6e..dc39b953 100644 --- a/menu/main_menu.sh +++ b/menu/main_menu.sh @@ -8,10 +8,6 @@ SCRIPT_NAME="Main Menu" # shellcheck source=lib.sh source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -### TODO Remove this after some releases -# Download fetch_lib.sh to be able to use it -download_script STATIC fetch_lib - # Check for errors + debug code and abort if something isn't right # 1 = ON # 0 = OFF diff --git a/menu/nextcloud_configuration.sh b/menu/nextcloud_configuration.sh index fcf0771f..7118b777 100644 --- a/menu/nextcloud_configuration.sh +++ b/menu/nextcloud_configuration.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Nextcloud Configuration Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/menu/server_configuration.sh b/menu/server_configuration.sh index 93bf0cec..ea9432e3 100644 --- a/menu/server_configuration.sh +++ b/menu/server_configuration.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Server Configuration Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/startup_configuration.sh b/menu/startup_configuration.sh index eb06dc7c..dd84cc61 100644 --- a/menu/startup_configuration.sh +++ b/menu/startup_configuration.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Startup Configuration Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/talk_menu.sh b/menu/talk_menu.sh index 39d9fff3..b1b87b5a 100644 --- a/menu/talk_menu.sh +++ b/menu/talk_menu.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Talk Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/network/ddclient-configuration.sh b/network/ddclient-configuration.sh index 992f439e..105fbfdb 100644 --- a/network/ddclient-configuration.sh +++ b/network/ddclient-configuration.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Setup DDclient" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/network/static_ip.sh b/network/static_ip.sh index dc4848d2..feb36c68 100644 --- a/network/static_ip.sh +++ b/network/static_ip.sh @@ -9,7 +9,7 @@ then true SCRIPT_NAME="Static IP" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # If we have internet, then use the latest variables from the lib remote file elif [ -f /var/scripts/lib.sh ] then diff --git a/network/trusted.sh b/network/trusted.sh index 9898faf6..4b05ca2b 100644 --- a/network/trusted.sh +++ b/network/trusted.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Trusted" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh index 7df36c89..634a8591 100644 --- a/nextcloud_install_production.sh +++ b/nextcloud_install_production.sh @@ -18,7 +18,7 @@ fi true SCRIPT_NAME="Nextcloud Install Script" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if dpkg or apt is running is_process_running apt @@ -54,7 +54,7 @@ fi # shellcheck disable=2034,2059 true # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/nextcloud_update.sh b/nextcloud_update.sh index a72b82d0..daf404b1 100644 --- a/nextcloud_update.sh +++ b/nextcloud_update.sh @@ -8,7 +8,7 @@ true SCRIPT_NAME="Nextcloud Update Script" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library ncdb diff --git a/not-supported/not-supported.sh b/not-supported/not-supported.sh index fa5a899b..c92c6002 100644 --- a/not-supported/not-supported.sh +++ b/not-supported/not-supported.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Not-supported Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/not-supported_menu.sh b/not-supported/not-supported_menu.sh index c87edcc3..56cc3cef 100644 --- a/not-supported/not-supported_menu.sh +++ b/not-supported/not-supported_menu.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Not-supported Menu" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/plexmediaserver.sh b/not-supported/plexmediaserver.sh index a99303b5..1eaf7022 100644 --- a/not-supported/plexmediaserver.sh +++ b/not-supported/plexmediaserver.sh @@ -9,7 +9,7 @@ SCRIPT_NAME="PLEX Media Server" SCRIPT_EXPLAINER="PLEX Media Server is a server application that let's \ you enjoy all your photos, music, videos, and movies in one place." # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/smbserver.sh b/not-supported/smbserver.sh index 02b80a27..d9197141 100644 --- a/not-supported/smbserver.sh +++ b/not-supported/smbserver.sh @@ -10,7 +10,7 @@ SCRIPT_EXPLAINER="This script allows you to create a SMB-server from your Nextcl It helps you manage all SMB-users and SMB-shares. As bonus feature you can automatically mount the chosen directories to Nextcloud and create Nextcloud users with the same credentials like your SMB-users." # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/old/format-sda-nuc-server.sh b/old/format-sda-nuc-server.sh index 967f94d3..fde24982 100644 --- a/old/format-sda-nuc-server.sh +++ b/old/format-sda-nuc-server.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Format sda NUC Server" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check if root root_check diff --git a/old/modsecurity.sh b/old/modsecurity.sh index 7386f12b..a496caa2 100644 --- a/old/modsecurity.sh +++ b/old/modsecurity.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Modsecurity" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) print_text_in_color "$ICyan" "Installing ModSecurity..." diff --git a/old/ntpdate.sh b/old/ntpdate.sh index a5836b80..5a166d02 100644 --- a/old/ntpdate.sh +++ b/old/ntpdate.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Ntpdate" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/old/spreedme.sh b/old/spreedme.sh index 67cfcb38..757fd9e6 100644 --- a/old/spreedme.sh +++ b/old/spreedme.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Spreedme" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/old/test_connection.sh b/old/test_connection.sh index 205bfaea..2cdcd0bc 100644 --- a/old/test_connection.sh +++ b/old/test_connection.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Test connection" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ diff --git a/static/adduser.sh b/static/adduser.sh index 6e7327ab..06fe1f8e 100644 --- a/static/adduser.sh +++ b/static/adduser.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Add CLI User" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ diff --git a/static/change-ncadmin-profile.sh b/static/change-ncadmin-profile.sh index 773b91e1..cfa7c347 100644 --- a/static/change-ncadmin-profile.sh +++ b/static/change-ncadmin-profile.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Change ncadmin Profile" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/change-root-profile.sh b/static/change-root-profile.sh index 2d97a88c..6ebc4288 100644 --- a/static/change-root-profile.sh +++ b/static/change-root-profile.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Change root Profile" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/change_db_pass.sh b/static/change_db_pass.sh index 244a482f..85b2e9e6 100644 --- a/static/change_db_pass.sh +++ b/static/change_db_pass.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Change Database Password" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library ncdbpass diff --git a/static/cookielifetime.sh b/static/cookielifetime.sh index 0dfe9829..f7528968 100644 --- a/static/cookielifetime.sh +++ b/static/cookielifetime.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Set Cookie Lifetime" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) print_text_in_color "$ICyan" "Configuring Cookie Lifetime timeout..." diff --git a/static/docker_overlay2.sh b/static/docker_overlay2.sh index 8fc63e65..a92be128 100644 --- a/static/docker_overlay2.sh +++ b/static/docker_overlay2.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Change to Docker overlay2" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # T&M Hansson IT AB © - 2020, https://www.hanssonit.se/ diff --git a/static/setup_secure_permissions_nextcloud.sh b/static/setup_secure_permissions_nextcloud.sh index 0db38fbd..254896f6 100644 --- a/static/setup_secure_permissions_nextcloud.sh +++ b/static/setup_secure_permissions_nextcloud.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Setup Secure Permissions for Nextcloud" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/temporary-fix.sh b/static/temporary-fix.sh index 10c45023..0e5d2767 100644 --- a/static/temporary-fix.sh +++ b/static/temporary-fix.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Temporary Fix" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/test_connection.sh b/static/test_connection.sh index 34ae9ed5..4f0bdaee 100644 --- a/static/test_connection.sh +++ b/static/test_connection.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Test Connection (old)" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # This is needed since we removed this from the startup script, or changed name so it can't be downloaded anymore msg_box "You are running an outdated release. diff --git a/static/update.sh b/static/update.sh index cfa3dc49..e27ff725 100644 --- a/static/update.sh +++ b/static/update.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Update Server + Nextcloud" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/updatenotification.sh b/static/updatenotification.sh index 5974e9d7..3f9d48f6 100644 --- a/static/updatenotification.sh +++ b/static/updatenotification.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Update Notification" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) # Get all needed variables from the library nc_update diff --git a/vagrant/install.sh b/vagrant/install.sh index 84651f4e..d0ef53cc 100644 --- a/vagrant/install.sh +++ b/vagrant/install.sh @@ -4,7 +4,7 @@ true SCRIPT_NAME="Install NcVM with Vagrant" # shellcheck source=lib.sh -. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) check_command git clone https://github.com/nextcloud/vm.git |