From d6c708e6eebfa02d1019afeb8891c3ba62e1cde9 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 11 Feb 2015 08:25:19 +0100
Subject: [PATCH] only show restart command of php-fcgi for nginx if fcgid/fpm
 is not used

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 admin_configfiles.php       |  1 -
 lib/configfiles/gentoo.xml  | 14 ++++++++++++++
 lib/configfiles/precise.xml |  9 +++++++--
 lib/configfiles/trusty.xml  |  9 +++++++--
 lib/configfiles/wheezy.xml  |  9 +++++++--
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/admin_configfiles.php b/admin_configfiles.php
index 7aeb89fd..c59e80d6 100644
--- a/admin_configfiles.php
+++ b/admin_configfiles.php
@@ -185,7 +185,6 @@ function getFileContentContainer($file_content, &$replace_arr, $realname)
     if ($file_content != '') {
         $file_content = strtr($file_content, $replace_arr);
         $file_content = htmlspecialchars($file_content);
-        $numbrows = count(explode("\n", $file_content));
         eval("\$files=\"" . getTemplate("configfiles/configfiles_file") . "\";");
     }
     return $files;
diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index 254cb80f..04e3d60a 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -277,6 +277,20 @@ exit "$RETVAL"
 						</content>
 					</file>
 					<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[/etc/init.d/nginx restart]]></command>
 				</daemon>
diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml
index e5b4a1e5..a2200dfb 100644
--- a/lib/configfiles/precise.xml
+++ b/lib/configfiles/precise.xml
@@ -283,8 +283,13 @@ exit "$RETVAL"
 						</content>
 					</file>
 					<include>//service[@type='http']/general/commands</include>
-					<command><![CDATA[chmod u+x /etc/init.d/php-fcgi]]></command>
-					<command><![CDATA[/etc/init.d/php-fcgi restart]]></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[/etc/init.d/nginx restart]]></command>
 				</daemon>
 			</service>
diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml
index 409fb4c8..ee949411 100644
--- a/lib/configfiles/trusty.xml
+++ b/lib/configfiles/trusty.xml
@@ -287,8 +287,13 @@ exit "$RETVAL"
 						</content>
 					</file>
 					<include>//service[@type='http']/general/commands</include>
-					<command><![CDATA[chmod u+x /etc/init.d/php-fcgi]]></command>
-					<command><![CDATA[service php-fcgi restart]]></command>
+					<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>
 				</daemon>
 			</service>
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index e8860201..6e9cd07a 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -327,8 +327,13 @@ exit "$RETVAL"
 						</content>
 					</file>
 					<include>//service[@type='http']/general/commands</include>
-					<command><![CDATA[chmod u+x /etc/init.d/php-fcgi]]></command>
-					<command><![CDATA[/etc/init.d/php-fcgi restart]]></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[/etc/init.d/nginx restart]]></command>
 				</daemon>
 			</service>