Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions content/api/enterprise-api-ref/build-api.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ A project is a set of CFEngine Build modules and custom files/json/policy files.
- **sshKeyId** _(integer)_
Generated SSH private key ID by [SSH keys API][SSH keys API#Generate SSH key] for authentication to the repository.
Required when authentication type is `private_key` and `sshPrivateKey` is not set.
- **classic_policy_set** _(boolean)_
The flag that indicates whether the build project is classic policy set (not cfbs) or not.

**Note:** the SSH key is expected to be in openssh(rfc4716) format as generated by [SSH Keys API][SSH keys API#Generate SSH key] or a command line like:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ vars:

"master_location" string => "/var/cfengine/masterfiles";

"policy_server" string => "10.20.30.123";
"policy_server" string => "10.20.30.123",
comment => "IP address to locate your policy host.";

files:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bundle agent main

packages:
"ssh"
policy => "present";
policy => "present",
package_module => apt_get;

services:
Expand Down Expand Up @@ -95,7 +95,7 @@ bundle agent main
{
packages:
"ssh"
policy => "present";
policy => "present",
package_module => apt_get;

vars:
Expand Down
20 changes: 10 additions & 10 deletions content/reference/macros.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ The contained policy is only included if the version is greater than or equal to
bundle agent extractor
{
@if minimum_version(3.8)
# the function `new_function_3_8()` was introduced in 3.8
vars: "container" data => new_function_3_8();
# This block is only parsed on CFEngine 3.8 or later
vars: "container" data => parsejson('{}');
@endif
}
```
Expand All @@ -49,7 +49,7 @@ bundle agent extractor
@if maximum_version(3.15)
# This policy will only be parsed on versions 3.15 and earlier
vars:
"container" data => old_function_3_15();
"container" data => parsejson('{}');
@endif
}
```
Expand All @@ -70,7 +70,7 @@ bundle agent extractor
@if at_version(3.15)
# This policy will only be parsed on 3.15 clients
vars:
"container" data => old_function_3_15();
"container" data => parsejson('{}');
@endif
}
```
Expand All @@ -91,7 +91,7 @@ bundle agent extractor
@if between_versions(3.12, 3.15)
# Policy specific to 3.12, 3.13, 3.14, 3.15
vars:
"container" data => workaround_3_12_3_15();
"container" data => parsejson('{}');
@endif
}
```
Expand All @@ -113,7 +113,7 @@ bundle agent extractor
# Policy to work around issue which was fixed in 3.15
vars:
"container"
data => workaround_pre_3_15();
data => parsejson('{}');
@endif
}
```
Expand All @@ -135,7 +135,7 @@ bundle agent extractor
# This policy is only parsed on 3.16+
vars:
"container"
data => not_neded_on_3_15();
data => parsejson('{}');
@endif
}
```
Expand All @@ -159,12 +159,12 @@ bundle agent extractor
# Implementation for 3.16+
vars:
"container"
data => classfiltercsv();
data => classfiltercsv("/tmp/data.csv", "true", "any");
@else
# Implementation for versions before 3.16
vars:
"container"
data => readcsv();
data => readcsv("/tmp/data.csv");
@endif
}
```
Expand All @@ -182,7 +182,7 @@ bundle agent extractor
{
@if feature(xml)
# the yaml library may not be compiled in
vars: "container" data => parseyaml();
vars: "container" data => parseyaml("---");
@endif
}
```
Expand Down
2 changes: 1 addition & 1 deletion content/reference/special-variables/this.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ bundle agent example
services:

"www"
service_policy => "start";
service_policy => "start",
service_method => non_standard_services;
}
body service_method non_standard_services
Expand Down
2 changes: 1 addition & 1 deletion content/resources/additional-topics/hierarchies.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ bundle agent child_bundle
{
methods:
"extend_method"
use => base_bundle(parameter1,parameter2);
usebundle => base_bundle(parameter1,parameter2);
}
```

Expand Down
Loading