Skip to content

Commit 02ddd47

Browse files
committed
Fixed indentation in policy style guide
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech> (cherry picked from commit 62ebc3e)
1 parent 33b64fc commit 02ddd47

1 file changed

Lines changed: 49 additions & 60 deletions

File tree

content/examples/tutorials/policy-writing/policy-style.markdown

Lines changed: 49 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,26 @@ a policy expert who is familiar with Normal ordering.
4848
bundle agent main
4949
{
5050
vars:
51-
52-
"sshd_config"
53-
string => "/etc/ssh/sshd_config";
51+
"sshd_config"
52+
string => "/etc/ssh/sshd_config";
5453
5554
files:
56-
57-
"$(sshd_config)"
58-
edit_line => insert_lines("PermitRootLogin no"),
59-
classes => results("bundle", "sshd_config");
55+
"$(sshd_config)"
56+
edit_line => insert_lines("PermitRootLogin no"),
57+
classes => results("bundle", "sshd_config");
6058
6159
packages:
62-
63-
"ssh"
64-
policy => "present";
65-
package_module => apt_get;
60+
"ssh"
61+
policy => "present";
62+
package_module => apt_get;
6663
6764
services:
68-
6965
sshd_config_repaired::
70-
71-
"ssh"
72-
service_policy => "restart",
73-
comment => "After the sshd config file has been repaired, the
74-
service must be reloaded in order for the new
75-
settings to take effect.";
66+
"ssh"
67+
service_policy => "restart",
68+
comment => "After the sshd config file has been repaired, the
69+
service must be reloaded in order for the new
70+
settings to take effect.";
7671
7772
}
7873
```
@@ -98,33 +93,27 @@ body common control
9893
9994
bundle agent main
10095
{
101-
10296
packages:
103-
104-
"ssh"
105-
policy => "present";
106-
package_module => apt_get;
97+
"ssh"
98+
policy => "present";
99+
package_module => apt_get;
107100
108101
vars:
109-
110-
"sshd_config"
111-
string => "/etc/ssh/sshd_config";
102+
"sshd_config"
103+
string => "/etc/ssh/sshd_config";
112104
113105
files:
114-
115-
"$(sshd_config)"
116-
edit_line => insert_lines("PermitRootLogin no"),
117-
classes => results("bundle", "sshd_config");
106+
"$(sshd_config)"
107+
edit_line => insert_lines("PermitRootLogin no"),
108+
classes => results("bundle", "sshd_config");
118109
119110
services:
120-
121111
sshd_config_repaired::
122-
123-
"ssh"
124-
service_policy => "restart",
125-
comment => "After the sshd config file has been repaired, the
126-
service must be reloaded in order for the new
127-
settings to take effect.";
112+
"ssh"
113+
service_policy => "restart",
114+
comment => "After the sshd config file has been repaired, the
115+
service must be reloaded in order for the new
116+
settings to take effect.";
128117
129118
}
130119
```
@@ -265,21 +254,22 @@ bundle agent example(param1)
265254
# param1 - string -
266255
{
267256
vars:
268-
"copy_of_param1" string => "$(param1)";
269-
270-
"jedi" slist => {
271-
"Obi-Wan Kenobi",
272-
"Luke Skywalker",
273-
"Yoda",
274-
"Darth Vader", # He used to be a Jedi, and since he
275-
# tossed the emperor into the Death
276-
# Star's reactor shaft we are including
277-
# him.
257+
"copy_of_param1" string => "$(param1)";
258+
259+
"jedi"
260+
slist => {
261+
"Obi-Wan Kenobi",
262+
"Luke Skywalker",
263+
"Yoda",
264+
"Darth Vader", # He used to be a Jedi, and since he
265+
# tossed the emperor into the Death
266+
# Star's reactor shaft we are including
267+
# him.
278268
};
279269
classes:
280-
# Most of the time we don't need differentiation of redhat and centos
281-
"EL5" or => { "centos_5", "redhat_5" };
282-
"EL6" or => { "centos_6", "redhat_6" };
270+
# Most of the time we don't need differentiation of redhat and centos
271+
"EL5" or => { "centos_5", "redhat_5" };
272+
"EL6" or => { "centos_6", "redhat_6" };
283273
}
284274
```
285275

@@ -538,7 +528,6 @@ bundle agent satellite_bootstrap_main
538528
"bootstrap rhel7 servers to satellite every 24 hours"
539529
usebundle => satellite_bootstrap,
540530
action => if_elapsed(1440);
541-
542531
}
543532
```
544533

@@ -553,20 +542,20 @@ Formatted parsed policy:
553542
```cf3
554543
bundle agent satellite_bootstrap_main()
555544
{
556-
meta:
557-
(!ubuntu&!vvlan&!sarcrole_satellite)::
558-
"tags" slist => {"autorun"};
545+
meta:
546+
(!ubuntu&!vvlan&!sarcrole_satellite)::
547+
"tags" slist => {"autorun"};
559548
560-
methods:
561-
any::
562-
"bootstrap rhel7 servers to satellite every 24 hours"
563-
usebundle => satellite_bootstrap,
564-
action => if_elapsed("1440");
549+
methods:
550+
any::
551+
"bootstrap rhel7 servers to satellite every 24 hours"
552+
usebundle => satellite_bootstrap,
553+
action => if_elapsed("1440");
565554
}
566555
567556
body file control()
568557
{
569-
inputs => { "$(sys.libdir)/stdlib.cf" };
558+
inputs => { "$(sys.libdir)/stdlib.cf" };
570559
}
571560
```
572561

0 commit comments

Comments
 (0)