templates: remove files in the way of directories

Way better fix for the squid file transition.  Does not require
a manual restart anymore.

(cherry picked from commit 101fc844)

src/opnsense/service/modules/template.py

@@ -190,8 +190,11 @@ class Template(object):
         for fpart in filename.strip().split('/')[:-1]:
             fparts.append(fpart)
             if len(fpart) > 1:
-                if not os.path.exists('/'.join(fparts)):
-                    os.mkdir('/'.join(fparts))
+                tmppart = '/'.join(fparts);
+                if os.path.isfile(tmppart):
+                    os.remove(tmppart)
+                if not os.path.exists(tmppart):
+                    os.mkdir(tmppart)
 
     def _generate(self, module_name, create_directory=True):
         """ generate configuration files for one section using bound config and template data

src/opnsense/service/templates/OPNsense/Proxy/+TARGETS

-rc.conf.d:/etc/rc.conf.d/squid
+rc.conf.d:/etc/rc.conf.d/squid/squid
 squid.conf:/usr/local/etc/squid/squid.conf
 newsyslog.conf:/etc/newsyslog.conf.d/squid
 externalACLs.conf:/usr/local/etc/squid/externalACLs.conf