README.md

@@ -1,25 +1,2 @@
 # wmdeit-cf-files
 
-INSTALL
-Assuming your CFEngine installation resists under /var/cfengine run 
-the following commands:
-
- cd /var/cfengine/masterfiles
- git clone https://srcsrv.wikimedia.de/WMDE/wmdeit-cf-wmdelib.git wmdelib
-
-Edit the file /var/cfengine/masterfiles/def.json and the the lines
-seen below to the inputs ands wars section:
-
- {
-   "inputs": [
-     ...
-     "$(wmde\_libdir)/lib.cf",
-     "$(wmde\_libdir)/vim.cf",
-     "$(wmde\_libdir)/postfix.cf"
-   ],
-   "vars":{
-     ...
-     "wmde\_libdir": "wmdelib"
-   }
-
-}

apache.cf

@@ -173,7 +173,7 @@ files:
 
 	"$(apache.main_cfg)"
 		create => "true",
-		edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache",
+		edit_template => "$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd.conf.mustache",
 		template_method => "mustache",
 		handle => "apache_main_cfg_crreated",
 		classes => if_repaired(apache_changed);
@@ -222,7 +222,7 @@ vars:
 
 	"template_file" 
 	string => 
-		"$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd-vhost.conf.mustache";
+		"$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd-vhost.conf.mustache";
 
 	"domain_file" string => "$(apache.cfg_dir)/Vhosts/$(site[domain]).conf";
 	"domain_dir" string => "$(apache.www_dir)/$(site[domain])/";

certbot.cf

@@ -44,7 +44,7 @@ files:
 	freebsd::
 		"/etc/cron.d/certbot"
 			create => "true",
-			copy_from => local_cp("$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/certbot-cron.mustache");
+			copy_from => local_cp("$(sys.workdir)/inputs/$(def.mfdomain)/templates/certbot-cron.mustache");
 	
 #			content => '# 
 # Managed by CFEngine
@@ -75,7 +75,7 @@ vars:
                         "--webroot -w $(webroot)");
 
 files:
-	"$(sys.workdir)/data/agent/certbot/$(site[domain])-cert-created"
+	"$(sys.workdir)/data/certbot/$(site[domain])-cert-created"
 		create => "true",
 		content => "$(args)",
 		classes => if_repaired(certbot_repaired);

vim.cf

@@ -37,7 +37,7 @@ packages:
 files:
   "$(vimrc)"
         create => "true",
-        copy_from => local_dcp("$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/vimrc.mustache");
+        copy_from => local_dcp("$(sys.workdir)/inputs/$(def.mfdomain)/templates/vimrc.mustache");
 
 reports: