Skip to content

Commit 6a16ced

Browse files
committed
Run cfbs pretty on cfbs.json
The file was not formatted according to cfbs pretty. Signed-off-by: Ole Petter <ole.orhagen@northern.tech>
1 parent 154153f commit 6a16ced

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

cfbs.json

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
"conditional-installer": {
3232
"description": "Allows you to specify packages you want installed and conditions for where you want them installed, as well as a list of packages you generally want uninstalled.",
3333
"subdirectory": "security/conditional-installer",
34+
"steps": [
35+
"copy main.cf services/cfbs/modules/conditional-installer/main.cf",
36+
"input ./input.json def.json",
37+
"bundles conditional_installer:main",
38+
"policy_files services/cfbs/modules/conditional-installer/main.cf"
39+
],
3440
"input": [
3541
{
3642
"type": "string",
@@ -69,12 +75,24 @@
6975
],
7076
"while": "Do you want to specify more packages to be installed?"
7177
}
72-
],
78+
]
79+
},
80+
"delete-home-dotrhosts": {
81+
"description": "Ensure that ~/.rhosts files are not present, as they present a security risk.",
82+
"subdirectory": "security/delete-home-dotrhosts",
7383
"steps": [
74-
"copy main.cf services/cfbs/modules/conditional-installer/main.cf",
75-
"input ./input.json def.json",
76-
"bundles conditional_installer:main",
77-
"policy_files services/cfbs/modules/conditional-installer/main.cf"
84+
"copy policy/main.cf services/cfbs/delete-home-dotrhosts/",
85+
"policy_files services/cfbs/delete-home-dotrhosts/",
86+
"bundles delete_home_dotrhosts:main"
87+
]
88+
},
89+
"delete-home-dotshosts": {
90+
"description": "Ensure that ~/.shosts files are not present, as they present a security risk.",
91+
"subdirectory": "security/delete-home-dotshots",
92+
"steps": [
93+
"copy policy/main.cf services/cfbs/delete-home-dotshots/",
94+
"policy_files services/cfbs/delete-home-dotshots/",
95+
"bundles delete_home_dotshosts:main"
7896
]
7997
},
8098
"demo": {
@@ -97,6 +115,16 @@
97115
"subdirectory": "management/every-minute",
98116
"steps": ["json def.json def.json"]
99117
},
118+
"inventory-unshadowed-users": {
119+
"description": "Adds reporting data (inventory) on local users in /etc/passwd not using /etc/shadow for their password.",
120+
"subdirectory": "security/inventory-unshadowed-users",
121+
"dependencies": ["library-parsed-local-users"],
122+
"steps": [
123+
"copy policy/main.cf services/cfbs/inventory-unshadowed-users/",
124+
"policy_files services/cfbs/inventory-unshadowed-users/",
125+
"bundles inventory_unshadowed_users:main"
126+
]
127+
},
100128
"library-for-promise-types-in-bash": {
101129
"description": "Library enabling promise types implemented in bash.",
102130
"subdirectory": "libraries/bash",
@@ -118,35 +146,35 @@
118146
},
119147
"promise-type-ansible": {
120148
"description": "Promise type to manage systemd services.",
121-
"dependencies": ["library-for-promise-types-in-python"],
122149
"subdirectory": "promise-types/ansible",
150+
"dependencies": ["library-for-promise-types-in-python"],
123151
"steps": [
124152
"copy ansible_promise.py modules/promises/",
125153
"append enable.cf services/init.cf"
126154
]
127155
},
128156
"promise-type-git": {
129157
"description": "Promise type to manage git repos.",
130-
"dependencies": ["library-for-promise-types-in-python"],
131158
"subdirectory": "promise-types/git",
159+
"dependencies": ["library-for-promise-types-in-python"],
132160
"steps": [
133161
"copy git.py modules/promises/",
134162
"append enable.cf services/init.cf"
135163
]
136164
},
137165
"promise-type-groups": {
138166
"description": "Experimental promise type to manage local user groups.",
139-
"dependencies": ["library-for-promise-types-in-python"],
140167
"subdirectory": "promise-types/groups",
168+
"dependencies": ["library-for-promise-types-in-python"],
141169
"steps": [
142170
"copy groups.py modules/promises/",
143171
"append enable.cf services/init.cf"
144172
]
145173
},
146174
"promise-type-systemd": {
147175
"description": "Promise type to manage systemd services.",
148-
"dependencies": ["library-for-promise-types-in-python"],
149176
"subdirectory": "promise-types/systemd",
177+
"dependencies": ["library-for-promise-types-in-python"],
150178
"steps": [
151179
"copy systemd.py modules/promises/",
152180
"append enable.cf services/init.cf"
@@ -155,6 +183,12 @@
155183
"uninstall-packages": {
156184
"description": "Allows you to specify a list of packages you want uninstalled on your hosts.",
157185
"subdirectory": "security/uninstall-packages",
186+
"steps": [
187+
"copy uninstall-packages.cf services/cfbs/modules/uninstall-packages/uninstall-packages.cf",
188+
"input uninstall-packages/input.json def.json",
189+
"bundles uninstall_packages:uninstall_packages",
190+
"policy_files services/cfbs/modules/uninstall-packages/uninstall-packages.cf"
191+
],
158192
"input": [
159193
{
160194
"type": "list",
@@ -179,12 +213,6 @@
179213
],
180214
"while": "Do you want to specify more packages to be uninstalled?"
181215
}
182-
],
183-
"steps": [
184-
"copy uninstall-packages.cf services/cfbs/modules/uninstall-packages/uninstall-packages.cf",
185-
"input uninstall-packages/input.json def.json",
186-
"bundles uninstall_packages:uninstall_packages",
187-
"policy_files services/cfbs/modules/uninstall-packages/uninstall-packages.cf"
188216
]
189217
},
190218
"uninstall-rsh-server": {
@@ -195,34 +223,6 @@
195223
"bundles uninstall_rsh_server",
196224
"policy_files services/cfbs/modules/uninstall-rsh-server/uninstall-rsh-server.cf"
197225
]
198-
},
199-
"inventory-unshadowed-users": {
200-
"description": "Adds reporting data (inventory) on local users in /etc/passwd not using /etc/shadow for their password.",
201-
"dependencies": ["library-parsed-local-users"],
202-
"subdirectory": "security/inventory-unshadowed-users",
203-
"steps": [
204-
"copy policy/main.cf services/cfbs/inventory-unshadowed-users/",
205-
"policy_files services/cfbs/inventory-unshadowed-users/",
206-
"bundles inventory_unshadowed_users:main"
207-
]
208-
},
209-
"delete-home-dotrhosts": {
210-
"description": "Ensure that ~/.rhosts files are not present, as they present a security risk.",
211-
"subdirectory": "security/delete-home-dotrhosts",
212-
"steps": [
213-
"copy policy/main.cf services/cfbs/delete-home-dotrhosts/",
214-
"policy_files services/cfbs/delete-home-dotrhosts/",
215-
"bundles delete_home_dotrhosts:main"
216-
]
217-
},
218-
"delete-home-dotshosts": {
219-
"description": "Ensure that ~/.shosts files are not present, as they present a security risk.",
220-
"subdirectory": "security/delete-home-dotshots",
221-
"steps": [
222-
"copy policy/main.cf services/cfbs/delete-home-dotshots/",
223-
"policy_files services/cfbs/delete-home-dotshots/",
224-
"bundles delete_home_dotshosts:main"
225-
]
226226
}
227227
}
228228
}

0 commit comments

Comments
 (0)