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

only show restart command of php-fcgi for nginx if fcgid/fpm is not used

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-11 08:25:19 +01:00
parent 1f24ca9ba2
commit d6c708e6ee
5 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
admin_configfiles.php
View File

@@ -185,7 +185,6 @@ function getFileContentContainer($file_content, &$replace_arr, $realname)
if ($file_content != '') { if ($file_content != '') {
$file_content = strtr($file_content, $replace_arr); $file_content = strtr($file_content, $replace_arr);
$file_content = htmlspecialchars($file_content); $file_content = htmlspecialchars($file_content);
$numbrows = count(explode("\n", $file_content));
eval("\$files=\"" . getTemplate("configfiles/configfiles_file") . "\";"); eval("\$files=\"" . getTemplate("configfiles/configfiles_file") . "\";");
} }
return $files; return $files;

14
lib/configfiles/gentoo.xml
View File

@@ -277,6 +277,20 @@ exit "$RETVAL"
</content> </content>
</file> </file>
<include>//service[@type='http']/general/commands</include> <include>//service[@type='http']/general/commands</include>
<command>
<visibility mode="false">{{settings.phpfpm.enabled}}
</visibility>
<visibility mode="false">{{settings.system.mod_fcgid}}
</visibility>
<content><![CDATA[rc-update add php-fcgi default]]></content>
</command>
<command>
<visibility mode="false">{{settings.phpfpm.enabled}}
</visibility>
<visibility mode="false">{{settings.system.mod_fcgid}}
</visibility>
<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
</command>
<command><![CDATA[rc-update add nginx default]]></command> <command><![CDATA[rc-update add nginx default]]></command>
<command><![CDATA[/etc/init.d/nginx restart]]></command> <command><![CDATA[/etc/init.d/nginx restart]]></command>
</daemon> </daemon>

9
lib/configfiles/precise.xml
View File

@@ -283,8 +283,13 @@ exit "$RETVAL"
</content> </content>
</file> </file>
<include>//service[@type='http']/general/commands</include> <include>//service[@type='http']/general/commands</include>
<command><![CDATA[chmod u+x /etc/init.d/php-fcgi]]></command> <command>
<command><![CDATA[/etc/init.d/php-fcgi restart]]></command> <visibility mode="false">{{settings.phpfpm.enabled}}
</visibility>
<visibility mode="false">{{settings.system.mod_fcgid}}
</visibility>
<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
</command>
<command><![CDATA[/etc/init.d/nginx restart]]></command> <command><![CDATA[/etc/init.d/nginx restart]]></command>
</daemon> </daemon>
</service> </service>

9
lib/configfiles/trusty.xml
View File

@@ -287,8 +287,13 @@ exit "$RETVAL"
</content> </content>
</file> </file>
<include>//service[@type='http']/general/commands</include> <include>//service[@type='http']/general/commands</include>
<command><![CDATA[chmod u+x /etc/init.d/php-fcgi]]></command> <command>
<command><![CDATA[service php-fcgi restart]]></command> <visibility mode="false">{{settings.phpfpm.enabled}}
</visibility>
<visibility mode="false">{{settings.system.mod_fcgid}}
</visibility>
<content><![CDATA[service php-fcgi restart]]></content>
</command>
<command><![CDATA[service nginx restart]]></command> <command><![CDATA[service nginx restart]]></command>
</daemon> </daemon>
</service> </service>

9
lib/configfiles/wheezy.xml
View File

@@ -327,8 +327,13 @@ exit "$RETVAL"
</content> </content>
</file> </file>
<include>//service[@type='http']/general/commands</include> <include>//service[@type='http']/general/commands</include>
<command><![CDATA[chmod u+x /etc/init.d/php-fcgi]]></command> <command>
<command><![CDATA[/etc/init.d/php-fcgi restart]]></command> <visibility mode="false">{{settings.phpfpm.enabled}}
</visibility>
<visibility mode="false">{{settings.system.mod_fcgid}}
</visibility>
<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
</command>
<command><![CDATA[/etc/init.d/nginx restart]]></command> <command><![CDATA[/etc/init.d/nginx restart]]></command>
</daemon> </daemon>
</service> </service>