Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf

automated install/basic-install.sh

@@ -51,6 +51,7 @@ PI_HOLE_CONFIG_DIR="/etc/pihole"
 useUpdateVars=false
 
 adlistFile="/etc/pihole/adlists.list"
+regexFile="/etc/pihole/regex.list"
 # Pi-hole needs an IP address; to begin, these variables are empty since we don't know what the IP is until
 # this script can run
 IPV4_ADDRESS=""
@@ -1243,6 +1244,11 @@ installConfigs() {
             return 1
         fi
     fi
+    # Install an empty regex file
+    if [[ ! -f "${regexFile}" ]]; then
+        # Let PHP edit the regex file, if installed
+        install -o pihole -g "${LIGHTTPD_GROUP:-pihole}" -m 664 /dev/null "${regexFile}"
+    fi
     # If the user chose to install the dashboard,
     if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
         # and if the Web server conf directory does not exist,

gravity.sh

@@ -643,11 +643,6 @@ if [[ "${skipDownload}" == false ]] || [[ "${listType}" == "whitelist" ]]; then
   gravity_Whitelist
 fi
 
-# Set proper permissions on the regex file
-touch "${regexFile}"
-chown pihole:www-data "${regexFile}"
-chmod 664 "${regexFile}"
-
 convert_wildcard_to_regex
 gravity_ShowBlockCount
 

manpages/pihole.8

@@ -125,13 +125,16 @@ Available commands and options:
 .br
       -k, kelvin        Set Kelvin as preferred temperature unit
 .br
-      -r, hostrecord    Add a name to the DNS associated to an IPv4/IPv6 address
+      -r, hostrecord    Add a name to the DNS associated to an
+                        IPv4/IPv6 address
 .br
-      -e, email         Set an administrative contact address for the Block Page
+      -e, email         Set an administrative contact address for the
+                        Block Page
 .br
       -i, interface     Specify dnsmasq's interface listening behavior
 .br
-      -l, privacylevel  <level> Set privacy level (0 = lowest, 3 = highest)
+      -l, privacylevel  <level> Set privacy level
+                        (0 = lowest, 3 = highest)
 .br
 
 \fB-c, chronometer\fR	[options]
@@ -181,7 +184,8 @@ Available commands and options:
 .br
       on                Enable the Pi-hole log at /var/log/pihole.log
 .br
-      off               Disable and flush the Pi-hole log at /var/log/pihole.log
+      off               Disable and flush the Pi-hole log at
+                        /var/log/pihole.log
 .br
       off noflush       Disable the Pi-hole log at /var/log/pihole.log
 .br
@@ -204,7 +208,8 @@ Available commands and options:
 .br
       -p, --pihole      Only retrieve info regarding Pi-hole repository
 .br
-      -a, --admin       Only retrieve info regarding AdminLTE repository
+      -a, --admin       Only retrieve info regarding AdminLTE
+                        repository
 .br
       -f, --ftl         Only retrieve info regarding FTL repository
 .br
@@ -214,7 +219,8 @@ Available commands and options:
 .br
       -l, --latest      Return the latest version
 .br
-      --hash            Return the Github hash from your local repositories
+      --hash            Return the Github hash from your local
+                        repositories
 .br
 
 \fBuninstall\fR
@@ -266,7 +272,8 @@ Available commands and options:
 .br
       master            Update subsystems to the latest stable release
 .br
-      dev               Update subsystems to the latest development release
+      dev               Update subsystems to the latest development
+                        release
 .br
       branchname        Update subsystems to the specified branchname
 .br
@@ -278,47 +285,71 @@ Some usage examples
 Whitelist/blacklist manipulation
 .br
 
-    \fBpihole -w iloveads.example.com\fR       Add "iloveads.example.com" to whitelist
+\fBpihole -w iloveads.example.com\fR
 .br
-    \fBpihole -b -d noads.example.com\fR       Remove "noads.example.com" from blacklist
+    Adds "iloveads.example.com" to whitelist
 .br
-    \fBpihole --wild example.com\fR             Add example.com as a wildcard - would
+
-    block all subdomains of example.com, including example.com itself.
+\fBpihole -b -d noads.example.com\fR
 .br
-    \fBpihole --regex "ad.*\.example\.com$"\fR  Add "ad.*\.example\.com$" to the regex
+    Removes "noads.example.com" from blacklist
-    blacklist - would block all subdomains of example.com which start with "ad"
+.br
+
+\fBpihole --wild example.com\fR
+.br
+    Adds example.com as a wildcard - would block all subdomains of
+    example.com, including example.com itself.
+.br
+
+\fBpihole --regex "ad.*\\.example\\.com$"\fR
+.br
+    Adds "ad.*\\.example\\.com$" to the regex blacklist.
+    Would block all subdomains of example.com which start with "ad"
 .br
 
 Changing the Web Interface password
 .br
 
-    \fBpihole -a -p ExamplePassword\fR    Change the password to "ExamplePassword"
+\fBpihole -a -p ExamplePassword\fR
+.br
+    Change the password to "ExamplePassword"
 .br
 
 Updating lists from internet sources
 .br
 
-    \fBpihole -g\fR                       Update the list of ad-serving domains
+\fBpihole -g\fR
+.br
+    Update the list of ad-serving domains
 .br
 
 Displaying version information
 .br
 
-    \fBpihole -v -a -c\fR                 Display the current version of AdminLTE
+\fBpihole -v -a -c\fR
+.br
+    Display the current version of AdminLTE
 .br
 
 Temporarily disabling Pi-hole
 .br
 
-    \fBpihole disable 5m\fR               Disable Pi-hole functionality for five minutes
+\fBpihole disable 5m\fR
+.br
+    Disable Pi-hole functionality for five minutes
 .br
 
 Switching Pi-hole subsystem branches
 .br
 
-    \fBpihole checkout master\fR          Switch to master branch
+\fBpihole checkout master\fR
 .br
-    \fBpihole checkout core dev\fR        Switch to core development branch
+    Switch to master branch
+.br
+
+\fBpihole checkout core dev\fR
+.br
+    Switch to core development branch
 .br
 .SH "SEE ALSO"