Merge pull request #848 from pi-hole/PromoFaux-patch-1

Update .pullapprove.yml

.pullapprove.yml

@@ -1,19 +1,38 @@
-approve_by_comment: true
-approve_regex: '^(Approved|:shipit:|:\+1:|Engage)'
-reject_regex: '^(Rejected|:-1:|Borg)'
-reset_on_push: true
-author_approval: required
-reviewers:
-  members:
-  - brantje
-  - dschaper
-  - jacobsalmela
-  - Mcat12
-  - PromoFaux
-  name: pullapprove
-  required: 3
+version: 2
+
 always_pending:
-  title_regex: '(WIP|wip)'
+  title_regex: '(WIP|wip)'  
   labels:
     - wip
   explanation: 'This PR is a work in progress...'
+
+group_defaults:
+  reset_on_push:
+    enabled: true
+  reject_value: -2
+  approve_regex: '^(Approved|:shipit:|:\+1:|Engage)'
+  reject_regex: '^(Rejected|:-1:|Borg)'
+  author_approval:
+    auto: true
+
+
+groups:
+  development:
+    approve_by_comment:
+      enabled: true
+    conditions:
+      branches:
+        - development        
+    required: 2
+    teams:
+      - gravity
+  
+  master:
+    approve_by_comment:
+      enabled: true
+    conditions:
+      branches:
+        - master
+    required: 3
+    teams:
+      - gravity

automated install/basic-install.sh

@@ -58,7 +58,7 @@ else
   echo "::: Detecting the presence of the sudo utility for continuation of this install..."
 	if [ -x "$(command -v sudo)" ];then
 		echo "::: Utility sudo located."
-	  exec sudo bash "$0" "$@"
+	  exec curl -sSL https://install.pi-hole.net | sudo bash "$@"
     exit $?
 	else
 		echo "::: sudo is needed for the Web interface to run pihole commands.  Please run this script as root and it will be automatically installed."

gravity.sh

@@ -37,7 +37,7 @@ if [[ -f ${setupVars} ]];then
     . /etc/pihole/setupVars.conf
 else
     echo "::: WARNING: /etc/pihole/setupVars.conf missing. Possible installation failure."
-    echo ":::          Please run 'pihole -r', and choose the 'install' option to reconfigure."
+    echo ":::          Please run 'pihole -r', and choose the 'reconfigure' option to reconfigure."
     exit 1
 fi