From 3c802038f21dabcc558eb756a59b1bd6e280ede4 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 14 Mar 2018 11:35:03 +0100
Subject: [PATCH 1/2] split touch-command for multiple files into single ones,
 fixes #535

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 lib/configfiles/jessie.xml  | 4 +++-
 lib/configfiles/precise.xml | 4 +++-
 lib/configfiles/stretch.xml | 4 +++-
 lib/configfiles/trusty.xml  | 4 +++-
 lib/configfiles/wheezy.xml  | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml
index 062cdb9b..fa60dcc2 100644
--- a/lib/configfiles/jessie.xml
+++ b/lib/configfiles/jessie.xml
@@ -4651,7 +4651,9 @@ aliases:     files
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
-						<command><![CDATA[touch /var/lib/extrausers/{passwd,group,shadow}]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/passwd]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/group]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/shadow]]></command>
 					</commands>
 					<file name="/etc/nsswitch.conf" backup="true">
 						<content><![CDATA[
diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml
index 7017ec3c..6d7e8b15 100644
--- a/lib/configfiles/precise.xml
+++ b/lib/configfiles/precise.xml
@@ -1650,7 +1650,9 @@ aliases:     files
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
-						<command><![CDATA[touch /var/lib/extrausers/{passwd,group,shadow}]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/passwd]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/group]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/shadow]]></command>
 					</commands>
 					<file name="/etc/nsswitch.conf" backup="true">
 						<content><![CDATA[
diff --git a/lib/configfiles/stretch.xml b/lib/configfiles/stretch.xml
index df0a1cd6..235a0d4d 100644
--- a/lib/configfiles/stretch.xml
+++ b/lib/configfiles/stretch.xml
@@ -4551,7 +4551,9 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
-						<command><![CDATA[touch /var/lib/extrausers/{passwd,group,shadow}]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/passwd]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/group]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/shadow]]></command>
 					</commands>
 					<file name="/etc/nsswitch.conf" backup="true">
 						<content><![CDATA[
diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml
index 07788901..d244c548 100644
--- a/lib/configfiles/trusty.xml
+++ b/lib/configfiles/trusty.xml
@@ -1664,7 +1664,9 @@ aliases:     files
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
-						<command><![CDATA[touch /var/lib/extrausers/{passwd,group,shadow}]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/passwd]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/group]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/shadow]]></command>
 					</commands>
 					<file name="/etc/nsswitch.conf" backup="true">
 						<content><![CDATA[
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index 17ed9ed9..06b6c3a9 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -5464,7 +5464,9 @@ aliases:     files
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
-						<command><![CDATA[touch /var/lib/extrausers/{passwd,group,shadow}]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/passwd]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/group]]></command>
+						<command><![CDATA[touch /var/lib/extrausers/shadow]]></command>
 					</commands>
 					<file name="/etc/nsswitch.conf" backup="true">
 						<content><![CDATA[

From 724e88b94ffb3ae4b212bec0617bc27f3d0dccb7 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 14 Mar 2018 11:37:45 +0100
Subject: [PATCH 2/2] rename handler php5-fastcgi to php-fastcgi, just
 cosmetics; fixes #536

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 scripts/jobs/cron_tasks.inc.http.10.apache.php       | 4 ++--
 scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php
index e49ef34e..21225125 100644
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -360,8 +360,8 @@ class apache extends HttpConfigBase
 							// start block, cut off last pipe and close block
 							$filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
 							$this->virtualhosts_data[$vhosts_filename] .= '   <FilesMatch \.'.$filesmatch.'$>'. "\n";
-							$this->virtualhosts_data[$vhosts_filename] .= '     AddHandler php5-fastcgi .php' . "\n";
-							$this->virtualhosts_data[$vhosts_filename] .= '     Action php5-fastcgi /fastcgiphp' . "\n";
+							$this->virtualhosts_data[$vhosts_filename] .= '     AddHandler php-fastcgi .php' . "\n";
+							$this->virtualhosts_data[$vhosts_filename] .= '     Action php-fastcgi /fastcgiphp' . "\n";
 							$this->virtualhosts_data[$vhosts_filename] .= '      Options +ExecCGI' . "\n";
 							$this->virtualhosts_data[$vhosts_filename] .= '    </FilesMatch>' . "\n";
 							// >=apache-2.4 enabled?
diff --git a/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php b/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
index acf49948..fb20d742 100644
--- a/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
+++ b/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
@@ -91,8 +91,8 @@ class apache_fcgid extends apache
 					// start block, cut off last pipe and close block
 					$filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
 					$php_options_text.= '    <FilesMatch \.'.$filesmatch.'$>'. "\n";
-					$php_options_text.= '      SetHandler php5-fastcgi'. "\n";
-					$php_options_text.= '      Action php5-fastcgi /fastcgiphp' . "\n";
+					$php_options_text.= '      SetHandler php-fastcgi'. "\n";
+					$php_options_text.= '      Action php-fastcgi /fastcgiphp' . "\n";
 					$php_options_text.= '      Options +ExecCGI' . "\n";
 					$php_options_text.= '    </FilesMatch>' . "\n";
 					// >=apache-2.4 enabled?