From 338605370966ce319b5dea6af7a3812f1eb048e0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 4 May 2017 16:58:47 +0200
Subject: [PATCH] webgui: clean up after rework

---
 +POST_INSTALL                        |  9 -------
 Makefile                             |  7 -----
 Mk/tree.mk                           |  2 +-
 plist                                |  6 +++--
 src/etc/inc/plugins.inc.d/webgui.inc |  6 +++++
 src/etc/rc                           |  3 ---
 src/etc/rc.php_test_run              | 38 ----------------------------
 7 files changed, 11 insertions(+), 60 deletions(-)
 delete mode 100755 src/etc/rc.php_test_run

diff --git a/+POST_INSTALL b/+POST_INSTALL
index 231721e25..a85d84386 100644
--- a/+POST_INSTALL
+++ b/+POST_INSTALL
@@ -44,13 +44,4 @@ if /usr/local/etc/rc.d/configd status > /dev/null; then
 	/usr/local/etc/rc.d/configd restart
 fi
 
-echo "Flush Phalcon volt templates"
-rm -f /usr/local/opnsense/mvc/app/cache/*.php
-
-echo "Reloading GUI configuration"
-/usr/local/etc/rc.php_ini_setup
-if pgrep -q php-cgi; then
-	pkill -HUP php-cgi
-fi
-
 /usr/local/etc/rc.configure_firmware
diff --git a/Makefile b/Makefile
index b5bd9085c..96a8156e6 100644
--- a/Makefile
+++ b/Makefile
@@ -306,13 +306,6 @@ style: want-pear-PHP_CodeSniffer
 style-fix: want-pear-PHP_CodeSniffer
 	phpcbf --standard=ruleset.xml ${.CURDIR}/src/opnsense || true
 
-setup: force
-	${.CURDIR}/src/etc/rc.php_ini_setup
-
-health: force
-	# check test script output and advertise a failure...
-	[ "`${.CURDIR}/src/etc/rc.php_test_run`" == "FCGI-PASSED PASSED" ]
-
 test: want-phpunit
 	@cd ${.CURDIR}/src/opnsense/mvc/tests && \
 	    phpunit --configuration PHPunit.xml
diff --git a/Mk/tree.mk b/Mk/tree.mk
index 06be035be..284436230 100644
--- a/Mk/tree.mk
+++ b/Mk/tree.mk
@@ -83,7 +83,7 @@ install-${TARGET}: force
 
 plist-${TARGET}: force
 .for TREE in ${TREES_${TARGET}}
-	@(cd ${TREE}; find * -type f ${_IGNORES}) | while read FILE; do \
+	@(cd ${TREE}; find * -type f ${_IGNORES} -o -type l) | while read FILE; do \
 		FILE="$${FILE%%.in}"; PREFIX=""; \
 		if [ -z "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
 			PREFIX="@sample "; \
diff --git a/plist b/plist
index f1a5c0579..f54b7dec2 100644
--- a/plist
+++ b/plist
@@ -122,8 +122,6 @@
 /usr/local/etc/rc.newwanip
 /usr/local/etc/rc.newwanipv6
 /usr/local/etc/rc.openvpn
-/usr/local/etc/rc.php_ini_setup
-/usr/local/etc/rc.php_test_run
 /usr/local/etc/rc.reboot
 /usr/local/etc/rc.recover
 /usr/local/etc/rc.reload_all
@@ -722,6 +720,10 @@
 /usr/local/opnsense/service/templates/OPNsense/Sample/sub2/example_sub2.txt
 /usr/local/opnsense/service/templates/OPNsense/Syslog/+TARGETS
 /usr/local/opnsense/service/templates/OPNsense/Syslog/newsyslog.conf
+/usr/local/opnsense/service/templates/OPNsense/WebGui/+TARGETS
+/usr/local/opnsense/service/templates/OPNsense/WebGui/php.etc.ini
+/usr/local/opnsense/service/templates/OPNsense/WebGui/php.ini
+/usr/local/opnsense/service/templates/OPNsense/WebGui/php.lib.ini
 /usr/local/opnsense/service/tests/__init__.py
 /usr/local/opnsense/service/tests/config/config.xml
 /usr/local/opnsense/service/tests/core.py
diff --git a/src/etc/inc/plugins.inc.d/webgui.inc b/src/etc/inc/plugins.inc.d/webgui.inc
index 631ee081a..6b62723d1 100644
--- a/src/etc/inc/plugins.inc.d/webgui.inc
+++ b/src/etc/inc/plugins.inc.d/webgui.inc
@@ -104,6 +104,12 @@ function webgui_configure_do($verbose = false)
         /* only stop the frontend when the generation was successful */
         killbypid('/var/run/lighty-webConfigurator.pid', 'TERM', true);
 
+        /* flush Phalcon volt templates */
+        foreach (glob('/usr/local/opnsense/mvc/app/cache/*.php') as $filename) {
+            unlink($filename);
+        }
+
+
         /* regenerate the php.ini files in case the setup has changed */
         configd_run('template reload OPNsense/WebGui');
 
diff --git a/src/etc/rc b/src/etc/rc
index 3fbd739fc..7f88b990d 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -227,9 +227,6 @@ echo "done."
 # Recreate capabilities DB
 /usr/bin/cap_mkdb /etc/login.conf
 
-# Set up the correct php.ini content
-/usr/local/etc/rc.php_ini_setup
-
 # Perform major updates
 for STAGE in B P; do
 	if opnsense-update -${STAGE}; then
diff --git a/src/etc/rc.php_test_run b/src/etc/rc.php_test_run
deleted file mode 100755
index 01eed3ca9..000000000
--- a/src/etc/rc.php_test_run
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/*
-     This script will chroot via the builder system to test
-     the local php setup.  If we can perform a series of
-     small tests to ensure the php environment is sane.
-*/
-
-require_once('util.inc');
-require_once('xmlparse.inc');
-require_once('config.lib.inc');
-
-$config = parse_config();
-
-$passed_tests = true;
-
-// Test config.inc
-if ($config['system']['hostname'] == '') {
-	$passed_tests = false;
-}
-
-// Test for php-fcgi
-$php_cgi = trim(`php-cgi -v | grep cgi-fcgi`);
-if (stristr($php_cgi, 'cgi-fcgi')) {
-	echo 'FCGI-PASSED ';
-} else {
-	echo 'FCGI-FAILED ';
-	exit(1);
-}
-
-if ($passed_tests) {
-	echo 'PASSED';
-	exit(0);
-}
-
-echo 'FAILED';
-exit(1);