Webhuis / CFEngine-Roadshow

Free example policies used in the Webhuis CFEngine Roadshow
2 stars 5 forks source link

Synchronize 3.6.2 with masterfiles.git and update policies #4

Closed tzz closed 9 years ago

tzz commented 9 years ago
tzz commented 9 years ago

@Webhuis DO NOT MERGE YET. This needs promises.cf changes and testing!!!

tzz commented 9 years ago

More refactoring. roadshow.cf is now an autorun policy, executed as a drop-in on top of the regular promises.cf.

So, the differences from a stock masterfiles.git are minimal now:

Only in policies: dynamic_policies
Only in policies/masterfiles: classify.cf
Only in policies/masterfiles: converge.cf
diff -r cfengine_files/masterfiles/def.cf policies/masterfiles/def.cf
175c175
<       "services_autorun" expression => "!any";
---
>       "services_autorun" expression => "any";
197c197
<       "cfengine_internal_purge_policies" expression => "!any";
---
>       "cfengine_internal_purge_policies" expression => "any";
Only in policies/masterfiles/lib: README.md
Only in policies/masterfiles: roadshow_policies
Only in policies/masterfiles/services/autorun: roadshow.cf
Only in policies/masterfiles/update: update_roadshow.cf
diff -r cfengine_files/masterfiles/update.cf policies/masterfiles/update.cf
13a14
>                           "cfe_roadshow_update_policy",
26a28
>                   "update/update_roadshow.cf",
122c124
<       "cfengine_internal_purge_policies" expression => "!any";
---
>       "cfengine_internal_purge_policies" expression => "any";

I'm still working on the code to make it execute, but this is now a clean overlay with the stock masterfiles and thus much easier to manage.

tzz commented 9 years ago

after some more tweaks and disabling services.cf missing methods, I was able to do make run-policies and run without errors. Give it a try.