From: Dan Brown <redacted>
Date: Sun, 30 Jan 2022 16:40:06 +0000 (+0000)
Subject: Renamed old primary branch references
X-Git-Url: http://source.bookstackapp.com/devops/commitdiff_plain/02f356cda1b32f4aea85ec9b0bf574be8abbe449

Renamed old primary branch references
---

diff --git a/meta-scripts/bookstack-release-steps b/meta-scripts/bookstack-release-steps
index 3798e6a..83f0022 100755
--- a/meta-scripts/bookstack-release-steps
+++ b/meta-scripts/bookstack-release-steps
@@ -12,9 +12,9 @@ echo "bookstack-update-translators"
 echo "git commit -a -m \"Updated translator attribution before release ${version}\""
 echo ""
 
-echo -e "\e[1m\e[94m== Merge codebase from master ==\e[0m"
+echo -e "\e[1m\e[94m== Merge codebase from development ==\e[0m"
 echo "git checkout release"
-echo "git merge master"
+echo "git merge development"
 echo ""
 
 echo -e "\e[1m\e[94m== Builds deps and increment version ==\e[0m"
diff --git a/scripts/installation-ubuntu-16.04.sh b/scripts/installation-ubuntu-16.04.sh
index c67babe..db955d6 100644
--- a/scripts/installation-ubuntu-16.04.sh
+++ b/scripts/installation-ubuntu-16.04.sh
@@ -62,7 +62,7 @@ php artisan migrate --no-interaction --force
 chown www-data:www-data -R bootstrap/cache public/uploads storage && chmod -R 755 bootstrap/cache public/uploads storage
 
 # Add nginx configuration
-curl -s https://raw.githubusercontent.com/BookStackApp/devops/master/config/nginx/ubuntu-1604-install-config > /etc/nginx/sites-available/bookstack
+curl -s https://raw.githubusercontent.com/BookStackApp/devops/main/config/nginx/ubuntu-1604-install-config > /etc/nginx/sites-available/bookstack
 sed -i.bak "s/bookstack.dev/$DOMAIN/" /etc/nginx/sites-available/bookstack
 ln -s /etc/nginx/sites-available/bookstack /etc/nginx/sites-enabled/bookstack