From da690969c408abbee2e2698a4bf2c69919b1e56c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 10 Feb 2019 13:13:29 +0100
Subject: [PATCH] rc: move all template generation to early

It's unlikely the config.xml will change and backup scripts in
early are going to need it anyway.
---
 plist                                   | 2 +-
 src/etc/rc.syshook.d/early/15-php       | 5 -----
 src/etc/rc.syshook.d/early/15-templates | 4 ++++
 src/etc/rc.syshook.d/start/20-freebsd   | 4 ----
 4 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100755 src/etc/rc.syshook.d/early/15-php
 create mode 100755 src/etc/rc.syshook.d/early/15-templates

diff --git a/plist b/plist
index 5cf52ccc8..a08cdc4ac 100644
--- a/plist
+++ b/plist
@@ -121,7 +121,7 @@
 /usr/local/etc/rc.syshook.d/carp/20-openvpn
 /usr/local/etc/rc.syshook.d/early/05-update
 /usr/local/etc/rc.syshook.d/early/10-configd
-/usr/local/etc/rc.syshook.d/early/15-php
+/usr/local/etc/rc.syshook.d/early/15-templates
 /usr/local/etc/rc.syshook.d/early/20-backup
 /usr/local/etc/rc.syshook.d/start/10-newwanip
 /usr/local/etc/rc.syshook.d/start/20-freebsd
diff --git a/src/etc/rc.syshook.d/early/15-php b/src/etc/rc.syshook.d/early/15-php
deleted file mode 100755
index b9f9587a1..000000000
--- a/src/etc/rc.syshook.d/early/15-php
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# php.ini is chained into this template, required by backend
-echo -n "Configuring PHP: "
-configctl template reload OPNsense/WebGui
diff --git a/src/etc/rc.syshook.d/early/15-templates b/src/etc/rc.syshook.d/early/15-templates
new file mode 100755
index 000000000..8f5c6994a
--- /dev/null
+++ b/src/etc/rc.syshook.d/early/15-templates
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo -n "Generating configuration: "
+configctl template reload \*
diff --git a/src/etc/rc.syshook.d/start/20-freebsd b/src/etc/rc.syshook.d/start/20-freebsd
index 11a18eecf..a0ed62e13 100755
--- a/src/etc/rc.syshook.d/start/20-freebsd
+++ b/src/etc/rc.syshook.d/start/20-freebsd
@@ -1,8 +1,4 @@
 #!/bin/sh
 
-# services need their configuration
-echo -n "Configuring additional services: "
-configctl template reload \*
-
 # start up the configured services
 /usr/local/etc/rc.freebsd start