commit cfengine-masterfiles for openSUSE:Factory
Hello community, here is the log from the commit of package cfengine-masterfiles for openSUSE:Factory checked in at 2014-06-25 21:20:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine-masterfiles (Old) and /work/SRC/openSUSE:Factory/.cfengine-masterfiles.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cfengine-masterfiles" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine-masterfiles/cfengine-masterfiles.changes 2014-06-01 19:41:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine-masterfiles.new/cfengine-masterfiles.changes 2014-06-25 21:20:47.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 18 13:40:29 UTC 2014 - kkaempf@suse.com + +- Update to 3.6.0 final + Bugfixes + +------------------------------------------------------------------- Old: ---- masterfiles-3.6rc2-build1.tar.gz New: ---- masterfiles-3.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine-masterfiles.spec ++++++ --- /var/tmp/diff_new_pack.pCxdIe/_old 2014-06-25 21:20:47.000000000 +0200 +++ /var/tmp/diff_new_pack.pCxdIe/_new 2014-06-25 21:20:47.000000000 +0200 @@ -18,7 +18,7 @@ Name: cfengine-masterfiles -%define srcname masterfiles-3.6rc2-build1 +%define srcname masterfiles-3.6.0 # Yes, its not FHS conformant but in sync with cfengine documentation # reported upstream as https://cfengine.com/dev/issues/1896 @@ -28,7 +28,7 @@ Summary: CFEngine promises master files License: MIT and LGPL-3.0+ Group: Productivity/Networking/System -Version: 3.6.0rc2 +Version: 3.6.0 Release: 0 Url: http://www.cfengine.org/ Source: %{srcname}.tar.gz ++++++ masterfiles-3.6rc2-build1.tar.gz -> masterfiles-3.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/README.md new/masterfiles-3.6.0/README.md --- old/masterfiles-3.6rc2-build1/README.md 2014-05-26 22:07:16.000000000 +0200 +++ new/masterfiles-3.6.0/README.md 2014-06-12 13:14:42.000000000 +0200 @@ -25,6 +25,22 @@ make install DESTDIR=/my/other/install/directory ``` +## Host report + +A very important piece of functionality, which you may want for your +own use but will certainly be helpful for debugging or submitting bugs +to CFEngine (core, masterfiles, or any other are) is the host report. + +Run the host report like so: `cf-agent -b host_info_report` + +You should see output like: + +``` +R: Host info report generated and avilable at '/var/cfengine/reports/host_info_report.txt' +``` + +Take a look at the resulting file, it has lots of useful information about the system. + ## Setting up First, review `update.cf` and `def.cf`. Most settings you need to change will live here. @@ -167,9 +183,11 @@ ##### trustkeysfrom -`trustkeysfrom` tells the policy server what hosts to trust for -bootstrapping. As the comments say, empty it after your hosts have -been bootstrapped to avoid unpleasant surprises. +`trustkeysfrom` tells the policy server from which IPs it should accept +connections even if the host's key is unknown, trusting it at connect +time. This is only useful to be open during for bootstrapping these +hosts. As the comments say, empty it after your hosts have been +bootstrapped to avoid unpleasant surprises. ##### services_autorun @@ -317,15 +335,6 @@ use the `services_autorun` facility, to ensure the bundles in them are found. -## Unexpected behavior - -Note that in this document, the term "unexpected behavior" has been -used, so a definition would help. - -Last year, a CFEngine user got hit by a flying frisbee while walking -backwards through a revolving door. This year, he won 4 track events -in the **winter** Olympics. That's unexpected behavior. - ## Further structure * `cfe_internal`: internal CFEngine policies you shouldn't modify or you will get unexpected behavior diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/cfe_internal/CFE_knowledge.cf new/masterfiles-3.6.0/cfe_internal/CFE_knowledge.cf --- old/masterfiles-3.6rc2-build1/cfe_internal/CFE_knowledge.cf 2014-05-26 22:07:16.000000000 +0200 +++ new/masterfiles-3.6.0/cfe_internal/CFE_knowledge.cf 2014-06-12 13:14:42.000000000 +0200 @@ -40,7 +40,7 @@ "$(cfe_internal_hub_vars.docroot)/.htaccess" comment => "Correct up htaccess file in doc root", handle => "cfe_internal_setup_knowledge_files_doc_root_htaccess", - perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group)), + perms => mog("0644","root","root"), copy_from => no_backup_cp("$(sys.workdir)/share/GUI/Apache-htaccess"); "$(cfe_internal_hub_vars.docroot)/hub/." @@ -48,14 +48,14 @@ handle => "cfe_internal_setup_knowledge_files_doc_root_hub", create => "true", depth_search => recurse_basedir("inf"), - perms => mog("0755",$(def.cf_apache_user),$(def.cf_apache_group)); + perms => mog("0755","root","root"); "$(cfe_internal_hub_vars.docroot)/scripts/." comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/scripts", handle => "cfe_internal_setup_knowledge_files_doc_root_scripts", create => "true", depth_search => recurse_basedir("inf"), - perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group)); + perms => mog("0644","root","root"); "$(cfe_internal_hub_vars.docroot)/tmp/." comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/tmp (temp files to email)", @@ -69,6 +69,7 @@ handle => "cfe_internal_setup_knowledge_files_doc_root_application_logs", create => "true", depth_search => recurse_basedir("inf"), + file_select => cfe_internal_exclude_index_html, perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group)); "$(cfe_internal_hub_vars.docroot)/application" @@ -86,18 +87,25 @@ perms => m("0644"); "$(cfe_internal_hub_vars.docroot)/api" - comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/api (writing exported reports PDF/CSV)", + comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/api", handle => "cfe_internal_setup_knowledge_files_doc_root_api", - file_select => cfe_internal_exclude_sh_scripts, + file_select => cfe_internal_exclude_sh_pl_scripts, + depth_search => recurse_basedir_exclude("inf"), + perms => mog("0644","root","root"); + + + "$(cfe_internal_hub_vars.docroot)/api/static/." + comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/api/static (writing exported reports PDF/CSV)", + handle => "cfe_internal_setup_knowledge_files_doc_root_api_static", depth_search => recurse_basedir("inf"), perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group)); "$(cfe_internal_hub_vars.docroot)/api/dc-scripts" comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/api/dc-scripts (execute git push/pull)", handle => "cfe_internal_setup_knowledge_files_doc_root_api_dc_scripts", - file_select => cfe_internal_sh_scripts, + file_select => cfe_internal_sh_pl_scripts, depth_search => recurse_basedir("inf"), - perms => mog("0700",$(def.cf_apache_user),$(def.cf_apache_group)); + perms => mog("0755","root","root"); "$(cfe_internal_hub_vars.docroot)/sql_lite/." comment => "Create a directory sql_lite for analytic to be working", @@ -112,6 +120,12 @@ depth_search => recurse_basedir("inf"), comment => "Create tmp directories for httpd internal use", handle => "cfe_internal_setup_knowledge_files_tmp_dir"; + + "$(sys.workdir)/httpd/logs/." + comment => "Ensure permissions for $(sys.workdir)/httpd/logs", + handle => "cfe_internal_setup_knowledge_files_httpd_logs", + create => "true", + perms => mog("0664","root","cfapache"); } ############################################################################# @@ -125,26 +139,27 @@ ############################################################################ -body file_select knowledge_files +body file_select folder(regex) { - leaf_name => { ".*.cf", ".*.html", ".*.png", ".*php", ".*css" }; + leaf_name => { ".*$(regex)$"}; file_result => "leaf_name"; } ############################################################################ -body file_select folder(regex) +body depth_search recurse_basedir(d) { - leaf_name => { ".*$(regex)$"}; - file_result => "leaf_name"; + depth => "$(d)"; + include_basedir => "true"; } -############################################################################ +########################################################################### -body depth_search recurse_basedir(d) +body depth_search recurse_basedir_exclude(d) { depth => "$(d)"; include_basedir => "true"; + exclude_dirs => { "static" }; } ############################################################################ @@ -152,7 +167,7 @@ body depth_search recurse_exclude(d) { depth => "$(d)"; - exclude_dirs => { "hub" , "graphs", "scripts", "tmp", "logs", "api", "sql_lite", "rest", "application" }; + exclude_dirs => { "hub" , "graphs", "scripts", "tmp", "logs", "api", "sql_lite", "rest", "application", "dc-scripts" }; } ############################################################################ @@ -164,14 +179,27 @@ out_of_range_define => { "$(out)" }; } -body file_select cfe_internal_exclude_sh_scripts +############################################################################ + +body file_select cfe_internal_exclude_sh_pl_scripts { - leaf_name => { ".*\.sh" }; + leaf_name => { ".*\.sh",".*\.pl"}; file_result => "!leaf_name"; } -body file_select cfe_internal_sh_scripts +############################################################################ + +body file_select cfe_internal_sh_pl_scripts { - leaf_name => { ".*\.sh" }; + leaf_name => { ".*\.sh",".*\.pl" }; file_result => "leaf_name"; } + +############################################################################ + +body file_select cfe_internal_exclude_index_html +{ + leaf_name => { "index.html" }; + file_result => "!leaf_name"; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/controls/cf_serverd.cf new/masterfiles-3.6.0/controls/cf_serverd.cf --- old/masterfiles-3.6rc2-build1/controls/cf_serverd.cf 2014-05-26 22:07:16.000000000 +0200 +++ new/masterfiles-3.6.0/controls/cf_serverd.cf 2014-06-12 13:14:42.000000000 +0200 @@ -24,6 +24,10 @@ # following ones. SEE COMMENTS IN def.cf trustkeysfrom => { @(def.trustkeysfrom) }; + ## List of hosts that we'll accept connections not using latest protocol + ## (absence of this option means allow all, empty list means allow none) + # allowlegacyconnects => { }; + # Maximum number of concurrent connections. # Suggested value >= total number of hosts maxconnections => "100"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/inventory/README.md new/masterfiles-3.6.0/inventory/README.md --- old/masterfiles-3.6rc2-build1/inventory/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/masterfiles-3.6.0/inventory/README.md 2014-06-12 13:14:42.000000000 +0200 @@ -0,0 +1,299 @@ +# CFEngine 3 inventory modules + +The CFEngine 3 inventory modules are pieces of CFEngine policy that +are loaded and used by the `promises.cf` mechanism in order to +*inventory* the system. + +CFEngine Enterprise has specific functionality to show and use +inventory data, but users of the Community Version can use them as +well locally on each host. + +## How It Works + +The inventory modules are called in `promises.cf`: + +``` +body common control +{ + bundlesequence => { + # Common bundle first (Best Practice) + inventory_control, + @(inventory.bundles), + ... +``` + +As you see, this calls the `inventory_control` bundle, and then each +bundle in the list `inventory.bundles`. That list is built in the +top-level common `inventory` bundle, which will load the right things +for some common cases. The `any.cf` inventory module is always loaded; +the rest are loaded if they are appropriate for the platform. For +instance, Debian systems will load `debian.cf` and `linux.cf` and +`lsb.cf` but may load others as needed. + +The effect for users is that the right inventory modules will be +loaded and evaluated. + +The `inventory_control` bundle lives in `def.cf` and defines what +inventory modules should be disabled. You can simply set +`disable_inventory` to avoid the whole system, or you can look for the +`disable_inventory_xyz` class to disable module `xyz`. + +Any inventory module works the same way, by doing some discovery work +and then tagging its classes and variables with the `report` or +`inventory` tags. For example: + +``` + vars: + "ports" slist => { @(mon.listening_ports) }, + meta => { "inventory", "attribute_name=Ports listening" }; +``` + +This defines a reported attribute "Ports listening" which contains a +list of strings representing the listening ports. More on this in a +second. + +## Your Very Own Inventory Module + +The good news is, writing an inventory module is incredibly easy. + +They are just CFEngine bundles. You can see a simple one that collects +the listening ports in `any.cf`: + +``` +bundle agent cfe_autorun_inventory_listening_ports +# @brief Inventory the listening ports +# +# This bundle uses `mon.listening_ports` and is always enabled by +# default, as it runs instantly and has no side effects. +{ + vars: + "ports" slist => { @(mon.listening_ports) }, + meta => { "inventory", "attribute_name=Ports listening" }; +} +``` + +Well, the slist copy is a CFEngine detail (we get the listening ports +from the monitoring daemon), so just assume that the data is correct. +What's important is the second line that starts with `meta`. That +defines metadata for the promise that CFEngine will use to determine +that this data is indeed inventory data and should be reported to the +CFEngine Enterprise Hub. + +That's it. Really. The comments are optional but nice to have. You +don't have to put your new bundle in a file under the `inventory` +directory, either. The variables and classes can be declared anywhere +as long as they have the right tags. So you can use the `services` +directory or whatever else makes sense to you. + +## CFEngine Enterprise vs. Community + +In CFEngine Enterprise, the reported data is aggregated in the hub and +reported across the whole host population. + +In CFEngine Community, users can use the `classesmatching()` and +`variablesmatching()` functions to collect all the inventory variables +and classes and report them in other ways. + +## What Modules Are Available? + +As soon as you use the `promises.cf` provided in the parent directory, +quite a few inventory modules will be enabled (if appropriate for your +system). Here's the list of modules and what they provide. Note they +are all enabled by code in `def.cf` as explained above. + +### LSB + +* lives in: `lsb.cf` +* applies to: LSB systems (most Linux distributions, basically) +* runs: `lsb_release -a` +* sample data: +``` +Distributor ID: Ubuntu +Description: Ubuntu 14.04 LTS +Release: 14.04 +Codename: trusty +``` +* provides: + * classes `lsb_$(os)`, `lsb_$(os)_$(release)`, `lsb_$(os)_$(codename)` + * variables: `inventory_lsb.os` (Distributor ID), `inventory_lsb.codename`, `inventory_lsb.release`, `inventory_lsb.flavor`, `inventory_lsb.description` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/lsb.cf, .* )%] + +* sample output: +``` +% cf-agent -KI -binventory_control,inventory_lsb + +R: inventory_lsb: OS = Ubuntu, codename = trusty, release = 14.04, flavor = Ubuntu_14_04, description = Ubuntu 14.04 LTS +``` + +### SUSE + +* lives in: `suse.cf` +* applies to: SUSE Linux +* provides classes: `suse_pure` and `suse_derived` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/suse.cf, .* )%] + +### Debian + +* lives in: `debian.cf` +* applies to: Debian and its derivatives +* provides: + * variables: `inventory_debian.mint_release` and `inventory_debian.mint_codename` + * classes: `debian_pure`, `debian_derived`, `linuxmint`, `lmde`, `linuxmint_$(mint_release)`, `linuxmint_$(mint_codename)`, `$(mint_codename)` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/debian.cf, .* )%] + +### Red Hat + +* lives in: `redhat.cf` +* applies to: Red Hat and its derivatives +* provides classes: `redhat_pure`, `redhat_derived` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/redhat.cf, .* )%] + +### Windows + +* lives in: `windows.cf` + +### Mac OS X + +* lives in: `macos.cf` + +### Generic (unknown OS) + +* lives in: `generic.cf` (see `any.cf` for generally applicable inventory modules) + +### LLDP + +* lives in: `any.cf` +* runs `inventory_control.lldpctl_exec` through a Perl filter +* provides variables: `cfe_autorun_inventory_LLDP.K` for each `K` returned by the LLDB executable +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_LLDP, \})%] + +### mtab + +* lives in: `any.cf` +* parses: `/etc/mtab` +* provides classes: `have_mount_FSTYPE` and `have_mount_FSTYPE_MOUNTPOINT` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_mtab, \})%] + +* sample output (note this is verbose mode with `-v` because there's a lot of output): + +``` +% cf-agent -Kv -binventory_control,cfe_autorun_inventory_mtab|grep 'cfe_autorun_inventory_mtab: we have' + +R: cfe_autorun_inventory_mtab: we have a ext4 mount under / +... +R: cfe_autorun_inventory_mtab: we have a cgroup mount under /sys/fs/cgroup/systemd +R: cfe_autorun_inventory_mtab: we have a tmpfs mount under /run/shm +``` + +### fstab + +* lives in: `any.cf` +* parses: `sys.fstab` +* provides classes: `have_fs_FSTYPE` `have_fs_MOUNTPOINT` and `have_fs_FSTYPE_MOUNTPOINT` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_fstab, \})%] + +* sample output (note this is verbose mode with `-v` because there's a LOT of output): + +``` +% cf-agent -Kv -binventory_control,cfe_autorun_inventory_fstab|grep 'cfe_autorun_inventory_fstab: we have' + +R: cfe_autorun_inventory_fstab: we have a ext4 fstab entry under / +R: cfe_autorun_inventory_fstab: we have a cifs fstab entry under /backups/load +R: cfe_autorun_inventory_fstab: we have a auto fstab entry under /mnt/cdrom +``` + +### CMDB + +* lives in: `any.cf` +* parses: `me.json` (which is copied from the policy server; see implementation) +* provides classes: `CLASS` for each CLASS found under the `classes` key in the JSON data +* provides variables: `inventory_cmdb_load.VARNAME` for each VARNAME found under the `vars` key in the JSON data +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+inventory_cmdb_load, \})%] + +### DMI decoding + +* lives in: `any.cf` +* runs: `dmidecode` +* provides variables: `cfe_autorun_inventory_dmidecode.dmi[K]` for each key K in the `dmidecode` output +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_dmidecode, \})%] + +* sample output (sudo is needed to access the DMI): + +``` +% sudo /var/cfengine/bin/cf-agent -KI -binventory_control,cfe_autorun_inventory_dmidecode + +R: cfe_autorun_inventory_dmidecode: Obtained BIOS vendor = 'Intel Corp.' +R: cfe_autorun_inventory_dmidecode: Obtained BIOS version = 'BLH6710H.86A.0146.2013.1555.1888' +R: cfe_autorun_inventory_dmidecode: Obtained System serial number = '' +R: cfe_autorun_inventory_dmidecode: Obtained System manufacturer = '' +R: cfe_autorun_inventory_dmidecode: Obtained System version = '' +R: cfe_autorun_inventory_dmidecode: Obtained CPU model = 'Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz' +``` + +### Listening ports + +* lives in: `any.cf` +* provides variables: `cfe_autorun_inventory_listening_ports.ports` as a copy of `mon.listening_ports` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_listening_ports, \})%] + +### Disk space + +* lives in: `any.cf` +* provides variables: `cfe_autorun_inventory_disk.free` as a copy of `mon.value_diskfree` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_disk, \})%] + +### Available memory + +* lives in: `any.cf` +* provides variables: `cfe_autorun_inventory_memory.free` as a copy of `mon.value_mem_free` and `cfe_autorun_inventory_memory.total` as a copy of `mon.value_mem_total` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_memory, \})%] + +### Load average + +* lives in: `any.cf` +* provides variables: `cfe_autorun_inventory_loadaverage.value` as a copy of `mon.value_loadavg` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_loadaverage, \})%] + +### procfs + +* lives in: `any.cf` +* parses: `consoles`, `cpuinfo`, `modules`, `partitions`, `version` +* provides variables: `cfe_autorun_inventory_proc.console_count`, `cfe_autorun_inventory_proc.cpuinfo[K]` for each CPU info key, `cfe_autorun_inventory_proc.paritions[K]` for each partition key +* provides classes: `_have_console_CONSOLENAME`, `have_module_MODULENAME` +* implementation: +[%CFEngine_include_snippet(masterfiles/inventory/any.cf, .+cfe_autorun_inventory_proc, \})%] + +* sample output (note this is verbose mode with `-v` because there's a LOT of output): + +``` +% cf-agent -Kv -binventory_control,cfe_autorun_inventory_proc|grep 'cfe_autorun_inventory_proc: we have' + +R: cfe_autorun_inventory_proc: we have console tty0 + +R: cfe_autorun_inventory_proc: we have module snd_seq_midi +... +R: cfe_autorun_inventory_proc: we have module ghash_clmulni_intel + +R: cfe_autorun_inventory_proc: we have cpuinfo flags = fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic popcnt tsc_deadline_timer aes xsave avx lahf_lm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid +... +R: cfe_autorun_inventory_proc: we have cpuinfo model name = Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz + +R: cfe_autorun_inventory_proc: we have partitions sr0 with 1048575 blocks +... +R: cfe_autorun_inventory_proc: we have partitions sda with 468851544 blocks + +R: cfe_autorun_inventory_proc: we have kernel version 'Linux version 3.11.0-15-generic (buildd@roseapple) (gcc version 4.8.1 (Ubuntu/Linaro 4.8.1-10ubuntu8) ) #25-Ubuntu SMP Thu Jan 30 17:22:01 UTC 2014' +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/promises.cf new/masterfiles-3.6.0/promises.cf --- old/masterfiles-3.6rc2-build1/promises.cf 2014-05-26 22:07:16.000000000 +0200 +++ new/masterfiles-3.6.0/promises.cf 2014-06-12 13:14:42.000000000 +0200 @@ -72,6 +72,9 @@ version => "CFEngine Promises.cf 3.6.0"; + # Uncomment to connect to the hub using latest protocol. + #protocol_version => "latest"; + # goal_categories => { "goals", "targets", "milestones" }; # goal_patterns => { "goal_.*", "target.*","milestone.*" }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/templates/host_info_report.mustache new/masterfiles-3.6.0/templates/host_info_report.mustache --- old/masterfiles-3.6rc2-build1/templates/host_info_report.mustache 2014-05-26 22:07:16.000000000 +0200 +++ new/masterfiles-3.6.0/templates/host_info_report.mustache 2014-06-12 13:14:42.000000000 +0200 @@ -10,6 +10,7 @@ Last Agent Run: {{vars.host_info_report_cfengine.last_agent_run}} Policy Release ID: {{vars.host_info_report_cfengine.cf_promises_release_id.releaseId}} Policy Last Updated: {{vars.host_info_report_cfengine.cf_promises_validated_timestamp_formatted}} +Bootstrapped to: {{vars.sys.policy_hub}} ## OS Architecture: {{vars.sys.arch}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/masterfiles-3.6rc2-build1/update.cf new/masterfiles-3.6.0/update.cf --- old/masterfiles-3.6rc2-build1/update.cf 2014-05-26 22:07:16.000000000 +0200 +++ new/masterfiles-3.6.0/update.cf 2014-06-12 13:14:42.000000000 +0200 @@ -24,6 +24,9 @@ "update/update_policy.cf", "update/update_processes.cf" }; + + # Uncomment to connect to the hub using latest protocol. + #protocol_version => "latest"; } ############################################################################# -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de