maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master' into 0.10.0

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-14 11:41:42 +01:00
parent fe385b7800 724e88b94f
commit b03d41087a
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/configfiles/jessie.xml
View File

@@ -4651,7 +4651,9 @@ aliases: files
<install><![CDATA[apt-get install nscd libnss-extrausers]]></install> <install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
<commands index="1"> <commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command> <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> </commands>
<file name="/etc/nsswitch.conf" backup="true"> <file name="/etc/nsswitch.conf" backup="true">
<content><![CDATA[ <content><![CDATA[

4
lib/configfiles/precise.xml
View File

@@ -1650,7 +1650,9 @@ aliases: files
<install><![CDATA[apt-get install nscd libnss-extrausers]]></install> <install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
<commands index="1"> <commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command> <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> </commands>
<file name="/etc/nsswitch.conf" backup="true"> <file name="/etc/nsswitch.conf" backup="true">
<content><![CDATA[ <content><![CDATA[

4
lib/configfiles/stretch.xml
View File

@@ -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> <install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
<commands index="1"> <commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command> <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> </commands>
<file name="/etc/nsswitch.conf" backup="true"> <file name="/etc/nsswitch.conf" backup="true">
<content><![CDATA[ <content><![CDATA[

4
lib/configfiles/trusty.xml
View File

@@ -1664,7 +1664,9 @@ aliases: files
<install><![CDATA[apt-get install nscd libnss-extrausers]]></install> <install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
<commands index="1"> <commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command> <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> </commands>
<file name="/etc/nsswitch.conf" backup="true"> <file name="/etc/nsswitch.conf" backup="true">
<content><![CDATA[ <content><![CDATA[

4
lib/configfiles/wheezy.xml
View File

@@ -5464,7 +5464,9 @@ aliases: files
<install><![CDATA[apt-get install nscd libnss-extrausers]]></install> <install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
<commands index="1"> <commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command> <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> </commands>
<file name="/etc/nsswitch.conf" backup="true"> <file name="/etc/nsswitch.conf" backup="true">
<content><![CDATA[ <content><![CDATA[

4
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -360,8 +360,8 @@ class apache extends HttpConfigBase
// start block, cut off last pipe and close block // start block, cut off last pipe and close block
$filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')'; $filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
$this->virtualhosts_data[$vhosts_filename] .= ' <FilesMatch \.'.$filesmatch.'$>'. "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' <FilesMatch \.'.$filesmatch.'$>'. "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' AddHandler php5-fastcgi .php' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' AddHandler php-fastcgi .php' . "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' Action php5-fastcgi /fastcgiphp' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' Action php-fastcgi /fastcgiphp' . "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' Options +ExecCGI' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' Options +ExecCGI' . "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' </FilesMatch>' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' </FilesMatch>' . "\n";
// >=apache-2.4 enabled? // >=apache-2.4 enabled?

4
scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
View File

@@ -91,8 +91,8 @@ class apache_fcgid extends apache
// start block, cut off last pipe and close block // start block, cut off last pipe and close block
$filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')'; $filesmatch = '('.str_replace(".", "\.", substr($filesmatch, 0, -1)).')';
$php_options_text.= ' <FilesMatch \.'.$filesmatch.'$>'. "\n"; $php_options_text.= ' <FilesMatch \.'.$filesmatch.'$>'. "\n";
$php_options_text.= ' SetHandler php5-fastcgi'. "\n"; $php_options_text.= ' SetHandler php-fastcgi'. "\n";
$php_options_text.= ' Action php5-fastcgi /fastcgiphp' . "\n"; $php_options_text.= ' Action php-fastcgi /fastcgiphp' . "\n";
$php_options_text.= ' Options +ExecCGI' . "\n"; $php_options_text.= ' Options +ExecCGI' . "\n";
$php_options_text.= ' </FilesMatch>' . "\n"; $php_options_text.= ' </FilesMatch>' . "\n";
// >=apache-2.4 enabled? // >=apache-2.4 enabled?