From 7402b9018c34735dd628601f56cb323aed9adf4d Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Sun, 14 Oct 2018 15:08:49 +0200 Subject: [PATCH] sed Tech and Me|T&M Hansson IT Signed-off-by: Daniel Hansson --- README.md | 2 +- apps/adminer.sh | 2 +- apps/collabora.sh | 2 +- apps/fail2ban.sh | 2 +- apps/fulltextsearch.sh | 2 +- apps/netdata.sh | 2 +- apps/nextant.sh | 2 +- apps/onlyoffice.sh | 2 +- apps/previewgenerator.sh | 2 +- apps/spreedme.sh | 2 +- apps/talk.sh | 2 +- apps/webmin.sh | 2 +- lets-encrypt/activate-ssl.sh | 2 +- lets-encrypt/test-new-config.sh | 2 +- nextcloud-startup-script.sh | 6 +++--- nextcloud_install_production.sh | 2 +- nextcloud_update.sh | 6 +++--- static/adduser.sh | 2 +- static/change-ncadmin-profile.sh | 2 +- static/change-root-profile.sh | 2 +- static/change_db_pass.sh | 2 +- static/format-sdb.sh | 2 +- static/instruction.sh | 4 ++-- static/ip.sh | 2 +- static/ip2.sh | 2 +- static/modsecurity.sh | 2 +- static/nextcloud.sh | 2 +- static/ntpdate.sh | 2 +- static/redis-server-ubuntu.sh | 2 +- static/security.sh | 2 +- static/set_static_ip.sh | 2 +- static/setup_secure_permissions_nextcloud.sh | 2 +- static/temporary-fix.sh | 2 +- static/test_connection.sh | 2 +- static/trusted.sh | 2 +- static/update.sh | 2 +- 36 files changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 1a73b8f0..f50739e1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ * [Donate](https://shop.hanssonit.se/product-category/donate/) or buy our [pre-configured VMs](https://shop.hanssonit.se/product-category/virtual-machine/): 500 GB, 1 TB, PostgreSQL or Hyper-V. ## Current [maintainers](https://github.com/nextcloud/vm/graphs/contributors) -* [Daniel Hanson](https://github.com/enoch85) @ [Tech and Me](https://www.techandme.se) +* [Daniel Hanson](https://github.com/enoch85) @ [T&M Hansson IT AB](https://www.hanssonit.se) * You? :) ## Special thanks to diff --git a/apps/adminer.sh b/apps/adminer.sh index b41f17b1..24f1c5d9 100644 --- a/apps/adminer.sh +++ b/apps/adminer.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing and securing Adminer..." diff --git a/apps/collabora.sh b/apps/collabora.sh index b3ef9d9b..07d00c42 100644 --- a/apps/collabora.sh +++ b/apps/collabora.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing Collabora..." diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh index 32976fbc..427a3a40 100644 --- a/apps/fail2ban.sh +++ b/apps/fail2ban.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Inspired by https://github.com/nextcloud/nextcloudpi/blob/master/etc/nextcloudpi-config.d/fail2ban.sh echo "Installing Fail2ban..." diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh index 52bdd219..a3e6c7b9 100644 --- a/apps/fulltextsearch.sh +++ b/apps/fulltextsearch.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # SwITNet Ltd © - 2018, https://switnet.net/ echo "Installing Elastic Search & Full Text Search on Nextcloud..." diff --git a/apps/netdata.sh b/apps/netdata.sh index 49f19b73..3f195a28 100644 --- a/apps/netdata.sh +++ b/apps/netdata.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing Netdata..." diff --git a/apps/nextant.sh b/apps/nextant.sh index a41e8cc9..7788e6af 100644 --- a/apps/nextant.sh +++ b/apps/nextant.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/apps/onlyoffice.sh b/apps/onlyoffice.sh index 1164a5d9..30820ec6 100644 --- a/apps/onlyoffice.sh +++ b/apps/onlyoffice.sh @@ -2,7 +2,7 @@ echo "Installing OnlyOffice..." -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/apps/previewgenerator.sh b/apps/previewgenerator.sh index 923e5150..47f444e0 100644 --- a/apps/previewgenerator.sh +++ b/apps/previewgenerator.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/apps/spreedme.sh b/apps/spreedme.sh index 2ab738ad..40f9bf1c 100644 --- a/apps/spreedme.sh +++ b/apps/spreedme.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing Spreed.ME..." diff --git a/apps/talk.sh b/apps/talk.sh index 78fd3cd9..a152c2c1 100644 --- a/apps/talk.sh +++ b/apps/talk.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing Nextcloud Talk..." diff --git a/apps/webmin.sh b/apps/webmin.sh index 0178dac1..c9b6743c 100644 --- a/apps/webmin.sh +++ b/apps/webmin.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing Webmin..." diff --git a/lets-encrypt/activate-ssl.sh b/lets-encrypt/activate-ssl.sh index 4fd36426..5dda4ea7 100644 --- a/lets-encrypt/activate-ssl.sh +++ b/lets-encrypt/activate-ssl.sh @@ -4,7 +4,7 @@ true # shellcheck source=lib.sh . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/lets-encrypt/test-new-config.sh b/lets-encrypt/test-new-config.sh index ea7c78cc..0f374923 100644 --- a/lets-encrypt/test-new-config.sh +++ b/lets-encrypt/test-new-config.sh @@ -4,7 +4,7 @@ true # shellcheck source=lib.sh . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh index e8c8e6b9..58f65784 100644 --- a/nextcloud-startup-script.sh +++ b/nextcloud-startup-script.sh @@ -7,7 +7,7 @@ unset FIRST_IFACE unset CHECK_CURRENT_REPO unset NCDB -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ ## If you want debug mode, please activate it further down in the code at line ~60 @@ -229,7 +229,7 @@ It will also do the following: The script will take about 10 minutes to finish, depending on your internet connection. -####################### Tech and Me - 2018 #######################" +####################### T&M Hansson IT - $(date +"%Y") #######################" clear # Set keyboard layout @@ -562,7 +562,7 @@ Some tips and tricks: - FORUM: https://help.nextcloud.com/ - NEXTCLOUD: https://nextcloud.com/pricing/ -################################## Tech and Me - 2018 ##################################" +################################## T&M Hansson IT - $(date +"%Y") ##################################" # Set trusted domain in config.php if [ -f "$SCRIPTS"/trusted.sh ] diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh index ed4a7bf0..5b3b90ca 100644 --- a/nextcloud_install_production.sh +++ b/nextcloud_install_production.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Prefer IPv4 sed -i "s|#precedence ::ffff:0:0/96 100|precedence ::ffff:0:0/96 100|g" /etc/gai.conf diff --git a/nextcloud_update.sh b/nextcloud_update.sh index 4813031c..d5378e3c 100644 --- a/nextcloud_update.sh +++ b/nextcloud_update.sh @@ -6,7 +6,7 @@ NCDB=1 && NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/v unset NC_UPDATE unset NCDB -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -132,7 +132,7 @@ and major releases without skipping any of them, as skipping releases increases errors. Major releases are 9, 10, 11 and 12. Point releases are intermediate releases for each major release. For example, 9.0.52 and 10.0.2 are point releases. -Please contact Tech and Me (T&M Hansson IT AB) to help you with upgrading between major versions. +Please contact T\&M Hansson IT AB to help you with upgrading between major versions. https://shop.hanssonit.se/product-category/support/" exit 1 fi @@ -391,7 +391,7 @@ msg_box "Latest version is: $NCVERSION. Current version is: $CURRENTVERSION_afte If you notice that some apps are disabled it's due to that they are not compatible with the new Nextcloud version. To recover your old apps, please check $BACKUP/apps and copy them to $NCPATH/apps manually. -Thank you for using Tech and Me's updater!" +Thank you for using T\&M Hansson IT's updater!" occ_command status occ_command maintenance:mode --off echo "NEXTCLOUD UPDATE success-$(date +"%Y%m%d")" >> /var/log/cronjobs_success.log diff --git a/static/adduser.sh b/static/adduser.sh index 513aae50..a94d1bbb 100644 --- a/static/adduser.sh +++ b/static/adduser.sh @@ -4,7 +4,7 @@ true # shellcheck source=lib.sh . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/change-ncadmin-profile.sh b/static/change-ncadmin-profile.sh index 3858a18a..4753e591 100644 --- a/static/change-ncadmin-profile.sh +++ b/static/change-ncadmin-profile.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/change-root-profile.sh b/static/change-root-profile.sh index 3f445971..5fac4427 100644 --- a/static/change-root-profile.sh +++ b/static/change-root-profile.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/change_db_pass.sh b/static/change_db_pass.sh index 3bc76059..49f2bb8d 100644 --- a/static/change_db_pass.sh +++ b/static/change_db_pass.sh @@ -5,7 +5,7 @@ true NCDBPASS=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) unset NCDBPASS -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/format-sdb.sh b/static/format-sdb.sh index 5d14df70..18cae622 100644 --- a/static/format-sdb.sh +++ b/static/format-sdb.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/instruction.sh b/static/instruction.sh index 8f8d93d7..030c4f86 100644 --- a/static/instruction.sh +++ b/static/instruction.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true @@ -33,7 +33,7 @@ cat << INST2 | Detailed instructions for setting this up can be found here: | | https://www.techandme.se/nextcloud-update-is-now-fully-automated/ | | | -| ####################### Tech and Me - 2018 ######################## | +| ####################### T&M Hansson IT - $(date +"%Y") ######################## | +-----------------------------------------------------------------------+ INST2 diff --git a/static/ip.sh b/static/ip.sh index 6c1f47bc..f72fe2d0 100644 --- a/static/ip.sh +++ b/static/ip.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/ip2.sh b/static/ip2.sh index 3b98187c..7305eb96 100644 --- a/static/ip2.sh +++ b/static/ip2.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/modsecurity.sh b/static/modsecurity.sh index e78f47e3..da21bbe7 100644 --- a/static/modsecurity.sh +++ b/static/modsecurity.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ echo "Installing ModSecurity..." diff --git a/static/nextcloud.sh b/static/nextcloud.sh index f7a4103b..1f5909f9 100644 --- a/static/nextcloud.sh +++ b/static/nextcloud.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ WANIP6=$(curl -s -k -m 7 https://6.ifcfg.me) WANIP4=$(curl -s -m 5 ipinfo.io/ip) diff --git a/static/ntpdate.sh b/static/ntpdate.sh index 83abce4d..816e7b8f 100644 --- a/static/ntpdate.sh +++ b/static/ntpdate.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/redis-server-ubuntu.sh b/static/redis-server-ubuntu.sh index 32d112ee..e512b4df 100644 --- a/static/redis-server-ubuntu.sh +++ b/static/redis-server-ubuntu.sh @@ -4,7 +4,7 @@ true # shellcheck source=lib.sh . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/security.sh b/static/security.sh index 7798797d..3de1c61b 100644 --- a/static/security.sh +++ b/static/security.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # REMOVE disable of SC2154 WHEN PUTTING SPAMHAUS IN PRODUCTION (it's just to fixing travis for now) # shellcheck disable=2034,2059,SC2154 diff --git a/static/set_static_ip.sh b/static/set_static_ip.sh index e07beafd..8a88f4da 100644 --- a/static/set_static_ip.sh +++ b/static/set_static_ip.sh @@ -5,7 +5,7 @@ true FIRST_IFACE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) unset FIRST_IFACE -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check if root root_check diff --git a/static/setup_secure_permissions_nextcloud.sh b/static/setup_secure_permissions_nextcloud.sh index 190bb693..55b252d8 100644 --- a/static/setup_secure_permissions_nextcloud.sh +++ b/static/setup_secure_permissions_nextcloud.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/temporary-fix.sh b/static/temporary-fix.sh index c8f1dfd5..5d08b4f3 100644 --- a/static/temporary-fix.sh +++ b/static/temporary-fix.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/test_connection.sh b/static/test_connection.sh index 4e9a512d..9e7d0a6e 100644 --- a/static/test_connection.sh +++ b/static/test_connection.sh @@ -4,7 +4,7 @@ true # shellcheck source=lib.sh . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/trusted.sh b/static/trusted.sh index fd7cd5a3..9365f47c 100644 --- a/static/trusted.sh +++ b/static/trusted.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true diff --git a/static/update.sh b/static/update.sh index f0ce414d..79d46cf6 100644 --- a/static/update.sh +++ b/static/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Tech and Me © - 2018, https://www.techandme.se/ +# T&M Hansson IT AB © - 2018, https://www.hanssonit.se/ # shellcheck disable=2034,2059 true