Hello community,
here is the log from the commit of package cfengine-masterfiles for
openSUSE:Factory checked in at 2015-03-16 07:00:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-02-06 22:37:51.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.cfengine-masterfiles.new/cfengine-masterfiles.changes
2015-03-16 07:00:54.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 13 07:57:20 UTC 2015 - [email protected]
+
+- Update to 3.6.5
+ RHEL7 support, systemd support, bugfixes.
+
+-------------------------------------------------------------------
Old:
----
masterfiles-3.6.4.tar.gz
New:
----
masterfiles-3.6.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cfengine-masterfiles.spec ++++++
--- /var/tmp/diff_new_pack.c8BTuo/_old 2015-03-16 07:00:55.000000000 +0100
+++ /var/tmp/diff_new_pack.c8BTuo/_new 2015-03-16 07:00:55.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cfengine-masterfiles
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
Summary: CFEngine promises master files
License: MIT and LGPL-3.0+
Group: Productivity/Networking/System
-Version: 3.6.4
+Version: 3.6.5
Release: 0
%define srcname masterfiles-%{version}
Url: http://www.cfengine.org/
++++++ masterfiles-3.6.4.tar.gz -> masterfiles-3.6.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/cfe_internal/CFE_cfengine.cf
new/masterfiles-3.6.5/cfe_internal/CFE_cfengine.cf
--- old/masterfiles-3.6.4/cfe_internal/CFE_cfengine.cf 2015-01-26
17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/cfe_internal/CFE_cfengine.cf 2015-03-06
15:59:32.000000000 +0100
@@ -31,6 +31,13 @@
am_policy_hub.enterprise::
+ "hub" -> { "Mission Portal", "CFEngine Enterprise" }
+ usebundle => cfe_internal_purge_scheduled_reports_older_than_days(
$(def.purge_scheduled_reports_older_than_days) ),
+ handle =>
"cfe_internal_management_purge_scheduled_reports_older_than_days",
+ comment => "So that we do not fill up the disk we need to purge
scheduled
+ reports after some time.";
+
+
"hub" usebundle => cfe_internal_webserver("on"),
handle => "cfe_internal_management_web_server",
comment => "Manage Apache Web server (on/off)";
@@ -70,9 +77,12 @@
any::
- "any" usebundle => cfe_internal_limit_robot_agents,
- handle => "cfe_internal_management_limit_cfe_agents",
- comment => "Manage CFE processes";
+# NB! On a container host this may kill CFEngine processes inside containers.
+# See https://dev.cfengine.com/issues/6906
+#
+# "any" usebundle => cfe_internal_limit_robot_agents,
+# handle => "cfe_internal_management_limit_cfe_agents",
+# comment => "Manage CFE processes";
"any" usebundle => cfe_internal_log_rotation,
handle => "cfe_internal_management_log_rotation",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/cfe_internal/CFE_hub_specific.cf
new/masterfiles-3.6.5/cfe_internal/CFE_hub_specific.cf
--- old/masterfiles-3.6.4/cfe_internal/CFE_hub_specific.cf 2015-01-26
17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/cfe_internal/CFE_hub_specific.cf 2015-03-06
15:59:32.000000000 +0100
@@ -490,3 +490,15 @@
classes => kept_successful_command,
handle =>
"cfe_internal_postgresql_maintenance_commands_run_vacuumdb_cmd_$(maintenance_type)";
}
+
+bundle agent cfe_internal_purge_scheduled_reports_older_than_days(days)
+{
+ files:
+ "$(cfe_internal_hub_vars.docroot)/tmp/."
+ handle => "cfe_internal_purge_scheduled_reports_files_docroot_tmp",
+ delete => tidy,
+ depth_search => recurse("inf"),
+ file_select => filetype_older_than("plain", $(days) ),
+ comment => "Mission Portals scheduled reports are written here. They need
+ to be purged after some time so that they do not fill the
disk.";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/cfe_internal/CFE_knowledge.cf
new/masterfiles-3.6.5/cfe_internal/CFE_knowledge.cf
--- old/masterfiles-3.6.4/cfe_internal/CFE_knowledge.cf 2015-01-26
17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/cfe_internal/CFE_knowledge.cf 2015-03-06
15:59:32.000000000 +0100
@@ -58,11 +58,13 @@
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)",
handle => "cfe_internal_setup_knowledge_files_doc_root_tmp",
create => "true",
depth_search => recurse_basedir("inf"),
- perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group));
+ perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group)),
+ comment => "Ensure permissions for $(cfe_internal_hub_vars.docroot)/tmp.
+ This is where scheduled reports generated by Mission Portal
+ (temp files to email)";
"$(cfe_internal_hub_vars.docroot)/application/logs/."
comment => "Make sure log folder has been created and has right
permisions",
@@ -114,13 +116,6 @@
depth_search => recurse_basedir("inf"),
perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group));
- "$(cfe_internal_hub_vars.docroot)/tmp/."
- create => "true",
- perms => mog("0644",$(def.cf_apache_user),$(def.cf_apache_group)),
- 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",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/def.cf new/masterfiles-3.6.5/def.cf
--- old/masterfiles-3.6.4/def.cf 2015-01-26 17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/def.cf 2015-03-06 15:59:32.000000000 +0100
@@ -151,6 +151,10 @@
# CFEngine's own log files
"cfe_log_files" slist => { @(base_log_files), @(enterprise_log_files),
@(hub_log_files) };
+ # Number of days to keep scheduled reports before purging
+ "purge_scheduled_reports_older_than_days" -> { "Mission Portal",
"CFEngine Enterprise" }
+ int => "30";
+
!enterprise::
# CFEngine's own log files
"cfe_log_files" slist => { @(base_log_files) };
@@ -162,7 +166,7 @@
"$(sys.workdir)/reports",
};
- # enable_cfengine_enterprise_hub_ha is defined below
+ # enable_cfengine_enterprise_hub_ha is defined below
# Disabled by default
enable_cfengine_enterprise_hub_ha::
@@ -171,6 +175,7 @@
!enable_cfengine_enterprise_hub_ha::
"policy_servers" slist => {"$(sys.policy_hub)"};
+
classes:
### Enable special features policies. Set to "any" to enable.
@@ -238,6 +243,7 @@
comment => "If reports are not collected for an extended period of time
the disk may fill up or cause additional collection
issues.";
+
}
bundle common inventory_control
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/inventory/any.cf
new/masterfiles-3.6.5/inventory/any.cf
--- old/masterfiles-3.6.4/inventory/any.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/inventory/any.cf 2015-03-06 15:59:32.000000000
+0100
@@ -408,32 +408,38 @@
debian::
"cfe_internal_non_existing_package"
package_policy => "add",
- package_method => inventory_apt_get($(refresh));
+ package_method => inventory_apt_get($(refresh)),
+ action => if_elapsed_day;
redhat::
"cfe_internal_non_existing_package"
package_policy => "add",
- package_method => inventory_yum_rpm($(refresh));
+ package_method => inventory_yum_rpm($(refresh)),
+ action => if_elapsed_day;
suse::
"cfe_internal_non_existing_package"
package_policy => "add",
- package_method => inventory_zypper($(refresh));
+ package_method => inventory_zypper($(refresh)),
+ action => if_elapsed_day;
aix::
"cfe_internal_non_existing_package"
package_policy => "add",
- package_method => inventory_lslpp($(refresh));
+ package_method => inventory_lslpp($(refresh)),
+ action => if_elapsed_day;
gentoo::
"cfe_internal_non_existing_package"
package_policy => "add",
- package_method => emerge;
+ package_method => emerge,
+ action => if_elapsed_day;
!redhat.!debian.!gentoo.!suse.!aix::
"cfe_internal_non_existing_package"
package_policy => "add",
- package_method => generic;
+ package_method => generic,
+ action => if_elapsed_day;
reports:
inform_mode::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/lib/3.5/bundles.cf
new/masterfiles-3.6.5/lib/3.5/bundles.cf
--- old/masterfiles-3.6.4/lib/3.5/bundles.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/lib/3.5/bundles.cf 2015-03-06 15:59:32.000000000
+0100
@@ -131,6 +131,9 @@
depth_search => recurse_with_base($(depth)),
delete => tidy;
+ "$(name)/."
+ delete => tidy;
+
!isdir::
"$(name)" delete => tidy;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/lib/3.5/paths.cf
new/masterfiles-3.6.5/lib/3.5/paths.cf
--- old/masterfiles-3.6.4/lib/3.5/paths.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/lib/3.5/paths.cf 2015-03-06 15:59:32.000000000
+0100
@@ -167,13 +167,16 @@
netbsd|freebsd.!(freebsd_9_3|freebsd_10|freebsd_11)::
"path[ping]" string => "/usr/bin/ping";
-
+
freebsd_9_3|freebsd_10|freebsd_11::
"path[ping]" string => "/sbin/ping";
freebsd::
"path[getfacl]" string => "/bin/getfacl";
+ "path[dtrace]" string => "/usr/sbin/dtrace";
+ "path[zpool]" string => "/sbin/zpool";
+ "path[zfs]" string => "/sbin/zfs";
openbsd::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/lib/3.6/bundles.cf
new/masterfiles-3.6.5/lib/3.6/bundles.cf
--- old/masterfiles-3.6.4/lib/3.6/bundles.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/lib/3.6/bundles.cf 2015-03-06 15:59:32.000000000
+0100
@@ -156,6 +156,9 @@
depth_search => recurse_with_base($(depth)),
delete => tidy;
+ "$(name)/."
+ delete => tidy;
+
!isdir::
"$(name)" delete => tidy;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/lib/3.6/files.cf
new/masterfiles-3.6.5/lib/3.6/files.cf
--- old/masterfiles-3.6.4/lib/3.6/files.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/lib/3.6/files.cf 2015-03-06 15:59:32.000000000
+0100
@@ -64,6 +64,19 @@
# edit_line bundles
###################################################
+bundle edit_line insert_before_if_no_line(before, string)
+# @brief Insert `string` before `before` if `string` is not found in the file
+# @param before The regular expression matching the line which `string` will be
+# inserted before
+# @param string The string to be prepended
+#
+{
+ insert_lines:
+ "$(string)"
+ location => before($(before)),
+ comment => "Prepend a line to the file if it doesn't already exist";
+}
+
bundle edit_line insert_lines(lines)
# @brief Append `lines` if they don't exist in the file
# @param lines The lines to be appended
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/lib/3.6/paths.cf
new/masterfiles-3.6.5/lib/3.6/paths.cf
--- old/masterfiles-3.6.4/lib/3.6/paths.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/lib/3.6/paths.cf 2015-03-06 15:59:32.000000000
+0100
@@ -201,13 +201,13 @@
"path[tr]" string => "/usr/bin/tr";
freebsd.!(freebsd_9_3|freebsd_10|freebsd_11)|netbsd|openbsd::
-
+
"path[ping]" string => "/usr/bin/ping";
-
+
freebsd_9_3|freebsd_10|freebsd_11::
-
+
"path[ping]" string => "/sbin/ping";
-
+
freebsd|netbsd::
"path[cksum]" string => "/usr/bin/cksum";
@@ -216,6 +216,9 @@
freebsd::
"path[getfacl]" string => "/bin/getfacl";
+ "path[dtrace]" string => "/usr/sbin/dtrace";
+ "path[zpool]" string => "/sbin/zpool";
+ "path[zfs]" string => "/sbin/zfs";
openbsd::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/promises.cf
new/masterfiles-3.6.5/promises.cf
--- old/masterfiles-3.6.4/promises.cf 2015-01-26 17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/promises.cf 2015-03-06 15:59:32.000000000 +0100
@@ -71,7 +71,7 @@
};
- version => "CFEngine Promises.cf 3.6.4";
+ version => "CFEngine Promises.cf 3.6.5";
# Uncomment to connect to the hub using latest protocol.
#protocol_version => "latest";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/build-rpm-repo
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/build-rpm-repo
--- old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/build-rpm-repo
2015-01-26 17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/build-rpm-repo
2015-03-06 15:59:32.000000000 +0100
@@ -51,4 +51,6 @@
cp ~/rpmbuild/RPMS/"$ARCH"/test-package-$i-1.0-2."$ARCH".rpm rpm_repo
done
-createrepo --no-database --simple-md-filenames rpm_repo
+# Not all createrepo versions support the below arguments, but if they do
+# then they must be included.
+createrepo --no-database --simple-md-filenames rpm_repo || createrepo rpm_repo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/package-inventory.cf
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/package-inventory.cf
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/package-inventory.cf
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/package-inventory.cf
2015-03-06 15:59:32.000000000 +0100
@@ -22,7 +22,8 @@
meta:
"test_skip_needs_work" string => "!redhat.!debian";
# RedHat 4 RPM has a bug which corrupts the RPM DB during our tests, so
it is untestable.
- "test_skip_unsupported" string => "redhat_4";
+ # And available patches is an Enterprise feature.
+ "test_skip_unsupported" string => "redhat_4|!enterprise";
methods:
"any" usebundle => clear_packages;
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/filelists.xml.gz
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/filelists.xml.gz
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/other.xml.gz
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/other.xml.gz
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/primary.xml.gz
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/primary.xml.gz
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/repomd.xml
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/repomd.xml
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/repomd.xml
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/repodata/repomd.xml
2015-03-06 15:59:32.000000000 +0100
@@ -2,20 +2,20 @@
<repomd xmlns="http://linux.duke.edu/metadata/repo";>
<data type="other">
<location href="repodata/other.xml.gz"/>
- <checksum type="sha">533831daf33dbedeee5255ad69a6d45b368963de</checksum>
- <timestamp>1400742764</timestamp>
- <open-checksum
type="sha">4f487aecbcb1a5c4da96a96aad2b5821a000eba2</open-checksum>
+ <checksum type="sha">7126c6d560f2c8f1ccfa8858644d6220420ae1e6</checksum>
+ <timestamp>1424693429</timestamp>
+ <open-checksum
type="sha">fd0e207e40eae90d2cd194f8915ff9300ea6b388</open-checksum>
</data>
<data type="filelists">
<location href="repodata/filelists.xml.gz"/>
- <checksum type="sha">f3e8877e5db752fb45e6f4a09093248fb792b8d9</checksum>
- <timestamp>1400742764</timestamp>
- <open-checksum
type="sha">8793b4bc69eec4f618430510583c6e5de5967092</open-checksum>
+ <checksum type="sha">6b9f24451020bbe84c38d4f9ac1fb1bff395ee22</checksum>
+ <timestamp>1424693429</timestamp>
+ <open-checksum
type="sha">8165bf7d1f7b2213db6a0a9c830c86c2bc06d08e</open-checksum>
</data>
<data type="primary">
<location href="repodata/primary.xml.gz"/>
- <checksum type="sha">a2471abaed67181281284df9f2811e1a76907b36</checksum>
- <timestamp>1400742764</timestamp>
- <open-checksum
type="sha">37f2d17189073b8369eb1bcb8b108cc34283d0fc</open-checksum>
+ <checksum type="sha">b078f0af6fb2de3db9c3e68c6daad2849562bc7f</checksum>
+ <timestamp>1424693429</timestamp>
+ <open-checksum
type="sha">91bd4365c1d1cf261eaba336717c8e9c74e3fbb8</open-checksum>
</data>
</repomd>
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-1.i386.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-1.i386.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-1.x86_64.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-1.x86_64.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-2.i386.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-2.i386.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-2.x86_64.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-alpha-1.0-2.x86_64.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-1.i386.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-1.i386.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-1.x86_64.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-1.x86_64.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-2.i386.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-2.i386.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-2.x86_64.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-beta-1.0-2.x86_64.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-1.i386.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-1.i386.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-1.x86_64.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-1.x86_64.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-2.i386.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-2.i386.rpm
differ
Files
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-2.x86_64.rpm
and
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/rpm_repo/test-package-charlie-1.0-2.x86_64.rpm
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-1.spec
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-1.spec
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-1.spec
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-1.spec
2015-03-06 15:59:32.000000000 +0100
@@ -35,5 +35,4 @@
%files
%defattr(-,root,root)
-%dir /
/*.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-2.spec
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-2.spec
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-2.spec
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-alpha-1.0-2.spec
2015-03-06 15:59:32.000000000 +0100
@@ -35,5 +35,4 @@
%files
%defattr(-,root,root)
-%dir /
/*.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-1.spec
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-1.spec
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-1.spec
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-1.spec
2015-03-06 15:59:32.000000000 +0100
@@ -35,5 +35,4 @@
%files
%defattr(-,root,root)
-%dir /
/*.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-2.spec
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-2.spec
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-2.spec
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-beta-1.0-2.spec
2015-03-06 15:59:32.000000000 +0100
@@ -35,5 +35,4 @@
%files
%defattr(-,root,root)
-%dir /
/*.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-1.spec
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-1.spec
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-1.spec
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-1.spec
2015-03-06 15:59:32.000000000 +0100
@@ -35,5 +35,4 @@
%files
%defattr(-,root,root)
-%dir /
/*.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-2.spec
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-2.spec
---
old/masterfiles-3.6.4/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-2.spec
2015-01-26 17:18:37.000000000 +0100
+++
new/masterfiles-3.6.5/tests/acceptance/17_packages/unsafe/test-package-charlie-1.0-2.spec
2015-03-06 15:59:32.000000000 +0100
@@ -35,5 +35,4 @@
%files
%defattr(-,root,root)
-%dir /
/*.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/promises/autorun-D.cf
new/masterfiles-3.6.5/tests/acceptance/promises/autorun-D.cf
--- old/masterfiles-3.6.4/tests/acceptance/promises/autorun-D.cf
2015-01-26 17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/tests/acceptance/promises/autorun-D.cf
2015-03-06 15:59:32.000000000 +0100
@@ -15,7 +15,14 @@
{
commands:
"$(G.make) install DESTDIR=$(G.testdir)"
- contain => in_dir_shell("$(this.promise_dirname)/../../..");
+ contain => in_dir_shell("$(this.promise_dirname)/../../..");
+ vars:
+ # If masterfiles are installed with --prefix=/other/prefix then we
+ # need to figure out where did "make install DESTDIR=..." has put
+ # the files.
+ "promises_cf_slist" slist =>
+ findfiles("$(G.testdir)/**/promises.cf");
+ "promises_cf_path" string => nth(promises_cf_slist, 0);
}
#######################################################
@@ -25,6 +32,6 @@
methods:
"" usebundle => dcs_passif_output(".*R: hello_world_autorun: Hello, this
is an automatically loaded bundle.*",
"",
- "$(sys.cf_agent) -Dservices_autorun -v
-f $(G.testdir)/var/cfengine/masterfiles/promises.cf | $(G.grep) Hello",
+ "$(sys.cf_agent) -Dservices_autorun -v
-f $(init.promises_cf_path) | $(G.grep) Hello",
$(this.promise_filename));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/masterfiles-3.6.4/tests/acceptance/promises/autorun.cf
new/masterfiles-3.6.5/tests/acceptance/promises/autorun.cf
--- old/masterfiles-3.6.4/tests/acceptance/promises/autorun.cf 2015-01-26
17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/tests/acceptance/promises/autorun.cf 2015-03-06
15:59:32.000000000 +0100
@@ -15,13 +15,23 @@
{
commands:
"$(G.make) install DESTDIR=$(G.testdir)"
- contain => in_dir_shell("$(this.promise_dirname)/../../..");
+ contain => in_dir_shell("$(this.promise_dirname)/../../..");
+ vars:
+ # If masterfiles are installed with --prefix=/other/prefix then we
+ # need to figure out where did "make install DESTDIR=..." has put
+ # the files.
+ "promises_cf_slist" slist =>
+ findfiles("$(G.testdir)/**/promises.cf");
+ "promises_cf_path" string => nth(promises_cf_slist, 0);
+
+ "masterfiles_path" string => dirname("$(promises_cf_path)");
+ "def_cf_path" string => concat("$(masterfiles_path)", "/def.cf");
}
bundle agent test
{
files:
- "$(G.testdir)/var/cfengine/masterfiles/def.cf" edit_line =>
enable_autorun;
+ "$(init.def_cf_path)" edit_line => enable_autorun;
}
bundle edit_line enable_autorun
@@ -37,6 +47,6 @@
methods:
"" usebundle => dcs_passif_output(".*R: hello_world_autorun: Hello, this
is an automatically loaded bundle.*",
"",
- "$(sys.cf_agent) -v -f
$(G.testdir)/var/cfengine/masterfiles/promises.cf | $(G.grep) Hello",
+ "$(sys.cf_agent) -v -f
$(init.promises_cf_path) | $(G.grep) Hello",
$(this.promise_filename));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/update/update_bins.cf
new/masterfiles-3.6.5/update/update_bins.cf
--- old/masterfiles-3.6.4/update/update_bins.cf 2015-01-26 17:18:37.000000000
+0100
+++ new/masterfiles-3.6.5/update/update_bins.cf 2015-03-06 15:59:32.000000000
+0100
@@ -145,67 +145,8 @@
#
- processes:
-
- bin_newpkg.!bin_update_success.enterprise::
-
- "$(cf_components)" signals => { "$(stop_signal)" },
- comment => "Stop cfengine running processes before binary update",
- handle => "cfe_internal_update_bins_processes_stop_cfengine",
- classes => u_if_repaired("stopped_cfprocs");
-
- bin_newpkg.!bin_update_success.!windows.enterprise::
-
- "cf-execd" signals => { "$(stop_signal)" },
- comment => "Stop cf-execd running process before binary update",
- handle => "cfe_internal_update_bins_processes_stop_cf_execd",
- classes => u_if_repaired("stopped_cfprocs");
-
- #
-
packages:
- # update packages after all CFEngine have been killed
-
- stopped_cfprocs.linux.enterprise::
-
- "$(novapkg)"
- comment => "Update Nova package to a newer version",
- handle => "cfe_internal_update_bins_packages_nova_update_linux",
- package_policy => "update",
- package_select => "==", # picks the newest Nova available
- package_architectures => { "$(pkgarch)" },
- package_version => "$(update_def.current_version)-1",
- package_method => u_generic( "$(local_software_dir)" ),
- ifvarclass => "nova_edition.have_software_dir",
- classes => u_if_else("bin_update_success", "bin_update_fail");
-
- stopped_cfprocs.(solaris|solarisx86).enterprise::
-
- "$(novapkg)"
- comment => "Update Nova package to a newer version",
- handle => "cfe_internal_update_bins_packages_nova_update_solaris",
- package_policy => "update",
- package_select => "==", # picks the newest Nova available
- package_architectures => { "$(pkgarch)" },
- package_version => "$(update_def.current_version)",
- package_method => u_generic( "$(local_software_dir)" ),
- ifvarclass => "nova_edition.have_software_dir",
- classes => u_if_else("bin_update_success", "bin_update_fail");
-
- stopped_cfprocs.windows.enterprise::
-
- "$(novapkg)"
- comment => "Update Nova package to a newer version",
- handle => "cfe_internal_update_bins_packages_nova_update_windows_only",
- package_policy => "update",
- package_select => "==", # picks the newest Nova available
- package_architectures => { "$(pkgarch)" },
- package_version => "$(update_def.current_version)",
- package_method => u_generic( "$(local_software_dir)" ),
- ifvarclass => "nova_edition.have_software_dir",
- classes => u_if_else("bin_update_success", "bin_update_fail");
-
!am_policy_hub.linux.enterprise::
"$(novapkg)"
@@ -342,19 +283,6 @@
comment => "Create an empty file after successfully upgrade the binary",
handle => "cfe_internal_update_bins_files_update_from_log",
create => "true";
-
- #
-
- services:
-
- bin_newpkg.windows.enterprise::
-
- "CfengineNovaExec"
- service_policy => "stop",
- comment => "Stop the executor windows service before updating Cfengine",
- handle => "cfe_internal_update_bins_services_stop_cf_execd_windows",
- classes => u_if_repaired("stopped_cfprocs");
-
}
################################################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/update/update_processes.cf
new/masterfiles-3.6.5/update/update_processes.cf
--- old/masterfiles-3.6.4/update/update_processes.cf 2015-01-26
17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/update/update_processes.cf 2015-03-06
15:59:32.000000000 +0100
@@ -61,14 +61,14 @@
methods:
- am_policy_hub.enterprise::
+ am_policy_hub.enterprise.!systemd::
"TAKING CARE CFE HUB PROCESSES"
usebundle => maintain_cfe_hub_process,
comment => "Call a bundle to maintian HUB processes",
handle => "cfe_internal_update_processes_methods_maintain_hub";
- !windows::
+ !windows.!systemd::
"DISABLING CFE AGENTS"
usebundle => disable_cfengine_agents("$(agents_to_be_disabled)"),
@@ -93,6 +93,12 @@
comment => "Call a bundle to maintain CFEngine on Windows",
handle => "cfe_internal_update_processes_methods_maintain_windows";
+ systemd::
+ "CFENGINE systemd service"
+ usebundle => maintain_cfe_systemd,
+ comment => "Call a bundle to maintain CFEngine with systemd",
+ handle => "cfe_internal_update_processes_methods_maintain_systemd";
+
reports:
"The process $(all_agents) is persistently disabled. Run with
'-Dclear_persistent_disable_$(cprocess)' to re-enable it or move it to the
agents_to_be_disabled list if you want it permanently disabled."
ifvarclass => canonify("persistent_disable_$(all_agents)");
@@ -373,6 +379,22 @@
}
+bundle agent maintain_cfe_systemd
+{
+ classes:
+ systemd::
+ "restart_cfe"
+ not => returnszero("/usr/bin/systemctl -q is-active cfengine3",
"noshell"),
+ comment => "Check running status of CFEngine using systemd",
+ handle => "cfe_internal_maintain_cfe_systemd_classes_restart_cfe";
+
+ commands:
+ restart_cfe::
+ "/usr/bin/systemctl -q start cfengine3"
+ comment => "Start CFEngine using systemd",
+ handle => "cfe_internal_maintain_cfe_systemd_commands_start_cfe";
+}
+
body classes u_clear_always(theclass)
{
cancel_kept => { $(theclass) };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/masterfiles-3.6.4/update.cf
new/masterfiles-3.6.5/update.cf
--- old/masterfiles-3.6.4/update.cf 2015-01-26 17:18:37.000000000 +0100
+++ new/masterfiles-3.6.5/update.cf 2015-03-06 15:59:32.000000000 +0100
@@ -45,7 +45,7 @@
{
vars:
- "current_version" string => "3.6.4";
+ "current_version" string => "3.6.5";
"input_name_patterns" slist => { ".*\.cf",".*\.dat",".*\.txt",
".*\.conf", ".*\.mustache",
"cf_promises_release_id", ".*\.json" },
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
