Skip to content

Commit b0b0496

Browse files
edewataedewata
committed
Fix container startup scripts
The container startup scripts have been updated to no longer update the file and folder permissions to avoid conflicts with upgrade scripts that update the permissions.
1 parent 9a97673 commit b0b0496

19 files changed

Lines changed: 441 additions & 439 deletions

‎.github/workflows/acme-existing-nssdb-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ jobs:
183183
lrwxrwxrwx pkiuser pkiuser lib -> /usr/share/pki/server/lib
184184
lrwxrwxrwx pkiuser pkiuser logs -> /var/log/pki/pki-tomcat
185185
drwxr-x--- pkiuser pkiuser temp
186-
drwxrwx--- pkiuser pkiuser webapps
186+
drwxr-x--- pkiuser pkiuser webapps
187187
drwxr-x--- pkiuser pkiuser work
188188
EOF
189189

‎.github/workflows/ca-container-basic-test.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -96,29 +96,29 @@ jobs:
9696
# everything should be owned by runner group
9797
# TODO: review owners/permissions
9898
cat > expected_old << EOF
99-
drwxrwxrwx runner Catalina
100-
drwxrwxrwx runner alias
101-
drwxrwxrwx runner ca
102-
-rw-rw-rw- runner catalina.policy
99+
drwxrwx--- runner Catalina
100+
drwxrwx--- runner alias
101+
drwxrwx--- runner ca
102+
-rw-rw---- runner catalina.policy
103103
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
104-
drwxrwxrwx runner certs
104+
drwxrwx--- runner certs
105105
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
106-
-rw-rw-rw- runner jss.conf
106+
-rw-rw---- runner jss.conf
107107
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
108-
-rw-rw-rw- runner password.conf
109-
-rw-rw-rw- runner server.xml
110-
-rw-rw-rw- runner serverCertNick.conf
111-
-rw-rw-rw- runner tomcat.conf
108+
-rw-rw---- runner password.conf
109+
-rw-rw---- runner server.xml
110+
-rw-rw---- runner serverCertNick.conf
111+
-rw-rw---- runner tomcat.conf
112112
lrwxrwxrwx runner web.xml -> /etc/tomcat/web.xml
113113
EOF
114114
115115
cat > expected_new << EOF
116-
drwxrwxrwx runner Catalina
117-
drwxrwxrwx runner alias
118-
drwxrwxrwx runner ca
116+
drwxrwx--- runner Catalina
117+
drwxrwx--- runner alias
118+
drwxrwx--- runner ca
119119
-rw-rw---- runner catalina.policy
120120
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
121-
drwxrwxrwx runner certs
121+
drwxrwx--- runner certs
122122
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
123123
-rw-rw---- runner jss.conf
124124
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
@@ -145,18 +145,18 @@ jobs:
145145
# TODO: review owners/permissions
146146
cat > expected_old << EOF
147147
-rw-rw---- runner CS.cfg
148-
-rw-rw-rw- runner adminCert.profile
148+
-rw-rw---- runner adminCert.profile
149149
drwxrwxrwx runner archives
150-
-rw-rw-rw- runner caAuditSigningCert.profile
151-
-rw-rw-rw- runner caCert.profile
152-
-rw-rw-rw- runner caOCSPCert.profile
153-
drwxrwxrwx runner emails
154-
-rw-rw-rw- runner flatfile.txt
155-
drwxrwxrwx runner profiles
156-
-rw-rw-rw- runner proxy.conf
150+
-rw-rw---- runner caAuditSigningCert.profile
151+
-rw-rw---- runner caCert.profile
152+
-rw-rw---- runner caOCSPCert.profile
153+
drwxrwx--- runner emails
154+
-rw-rw---- runner flatfile.txt
155+
drwxrwx--- runner profiles
156+
-rw-rw---- runner proxy.conf
157157
-rw-rw---- runner registry.cfg
158-
-rw-rw-rw- runner serverCert.profile
159-
-rw-rw-rw- runner subsystemCert.profile
158+
-rw-rw---- runner serverCert.profile
159+
-rw-rw---- runner subsystemCert.profile
160160
EOF
161161
162162
cat > expected_new << EOF
@@ -166,9 +166,9 @@ jobs:
166166
-rw-rw---- runner caAuditSigningCert.profile
167167
-rw-rw---- runner caCert.profile
168168
-rw-rw---- runner caOCSPCert.profile
169-
drwxrwxrwx runner emails
169+
drwxrwx--- runner emails
170170
-rw-rw---- runner flatfile.txt
171-
drwxrwxrwx runner profiles
171+
drwxrwx--- runner profiles
172172
-rw-rw---- runner proxy.conf
173173
-rw-rw---- runner registry.cfg
174174
-rw-rw---- runner serverCert.profile
@@ -191,11 +191,11 @@ jobs:
191191
# everything should be owned by runner group
192192
# TODO: review owners/permissions
193193
cat > expected << EOF
194-
drwxrwxrwx runner backup
195-
drwxrwxrwx runner ca
196-
-rw-rw-rw- runner localhost.$DATE.log
194+
drwxrwx--- runner backup
195+
drwxrwx--- runner ca
196+
-rw-rw---- runner localhost.$DATE.log
197197
-rw-rw-rw- runner localhost_access_log.$DATE.txt
198-
drwxrwxrwx runner pki
198+
drwxrwx--- runner pki
199199
EOF
200200
201201
diff expected output
@@ -214,14 +214,14 @@ jobs:
214214
# everything should be owned by runner group
215215
# TODO: review owners/permissions
216216
cat > expected_old << EOF
217-
drwxrwxrwx runner backup
218-
drwxrwxrwx runner ca
217+
drwxrwx--- runner backup
218+
drwxrwx--- runner ca
219219
-rw-rw-rw- runner localhost_access_log.$DATE.txt
220220
EOF
221221
222222
cat > expected_new << EOF
223-
drwxrwxrwx runner backup
224-
drwxrwxrwx runner ca
223+
drwxrwx--- runner backup
224+
drwxrwx--- runner ca
225225
-rw-rw-rw- runner localhost_access_log.$DATE.txt
226226
EOF
227227

‎.github/workflows/ca-container-existing-certs-test.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -202,29 +202,29 @@ jobs:
202202
# everything should be owned by runner group
203203
# TODO: review owners/permissions
204204
cat > expected_old << EOF
205-
drwxrwxrwx runner Catalina
206-
drwxrwxrwx runner alias
207-
drwxrwxrwx runner ca
208-
-rw-rw-rw- runner catalina.policy
205+
drwxrwx--- runner Catalina
206+
drwxrwx--- runner alias
207+
drwxrwx--- runner ca
208+
-rw-rw---- runner catalina.policy
209209
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
210-
drwxrwxrwx runner certs
210+
drwxrwx--- runner certs
211211
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
212-
-rw-rw-rw- runner jss.conf
212+
-rw-rw---- runner jss.conf
213213
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
214-
-rw-rw-rw- runner password.conf
215-
-rw-rw-rw- runner server.xml
216-
-rw-rw-rw- runner serverCertNick.conf
217-
-rw-rw-rw- runner tomcat.conf
214+
-rw-rw---- runner password.conf
215+
-rw-rw---- runner server.xml
216+
-rw-rw---- runner serverCertNick.conf
217+
-rw-rw---- runner tomcat.conf
218218
lrwxrwxrwx runner web.xml -> /etc/tomcat/web.xml
219219
EOF
220220
221221
cat > expected_new << EOF
222-
drwxrwxrwx runner Catalina
223-
drwxrwxrwx runner alias
224-
drwxrwxrwx runner ca
222+
drwxrwx--- runner Catalina
223+
drwxrwx--- runner alias
224+
drwxrwx--- runner ca
225225
-rw-rw---- runner catalina.policy
226226
lrwxrwxrwx runner catalina.properties -> /usr/share/pki/server/conf/catalina.properties
227-
drwxrwxrwx runner certs
227+
drwxrwx--- runner certs
228228
lrwxrwxrwx runner context.xml -> /etc/tomcat/context.xml
229229
-rw-rw---- runner jss.conf
230230
lrwxrwxrwx runner logging.properties -> /usr/share/pki/server/conf/logging.properties
@@ -251,18 +251,18 @@ jobs:
251251
# TODO: review owners/permissions
252252
cat > expected_old << EOF
253253
-rw-rw---- runner CS.cfg
254-
-rw-rw-rw- runner adminCert.profile
254+
-rw-rw---- runner adminCert.profile
255255
drwxrwxrwx runner archives
256-
-rw-rw-rw- runner caAuditSigningCert.profile
257-
-rw-rw-rw- runner caCert.profile
258-
-rw-rw-rw- runner caOCSPCert.profile
259-
drwxrwxrwx runner emails
260-
-rw-rw-rw- runner flatfile.txt
261-
drwxrwxrwx runner profiles
262-
-rw-rw-rw- runner proxy.conf
256+
-rw-rw---- runner caAuditSigningCert.profile
257+
-rw-rw---- runner caCert.profile
258+
-rw-rw---- runner caOCSPCert.profile
259+
drwxrwx--- runner emails
260+
-rw-rw---- runner flatfile.txt
261+
drwxrwx--- runner profiles
262+
-rw-rw---- runner proxy.conf
263263
-rw-rw---- runner registry.cfg
264-
-rw-rw-rw- runner serverCert.profile
265-
-rw-rw-rw- runner subsystemCert.profile
264+
-rw-rw---- runner serverCert.profile
265+
-rw-rw---- runner subsystemCert.profile
266266
EOF
267267
268268
cat > expected_new << EOF
@@ -272,9 +272,9 @@ jobs:
272272
-rw-rw---- runner caAuditSigningCert.profile
273273
-rw-rw---- runner caCert.profile
274274
-rw-rw---- runner caOCSPCert.profile
275-
drwxrwxrwx runner emails
275+
drwxrwx--- runner emails
276276
-rw-rw---- runner flatfile.txt
277-
drwxrwxrwx runner profiles
277+
drwxrwx--- runner profiles
278278
-rw-rw---- runner proxy.conf
279279
-rw-rw---- runner registry.cfg
280280
-rw-rw---- runner serverCert.profile
@@ -297,11 +297,11 @@ jobs:
297297
# everything should be owned by runner group
298298
# TODO: review owners/permissions
299299
cat > expected << EOF
300-
drwxrwxrwx runner backup
301-
drwxrwxrwx runner ca
302-
-rw-rw-rw- runner localhost.$DATE.log
300+
drwxrwx--- runner backup
301+
drwxrwx--- runner ca
302+
-rw-rw---- runner localhost.$DATE.log
303303
-rw-rw-rw- runner localhost_access_log.$DATE.txt
304-
drwxrwxrwx runner pki
304+
drwxrwx--- runner pki
305305
EOF
306306
307307
diff expected output
@@ -320,14 +320,14 @@ jobs:
320320
# everything should be owned by runner group
321321
# TODO: review owners/permissions
322322
cat > expected_old << EOF
323-
drwxrwxrwx runner backup
324-
drwxrwxrwx runner ca
323+
drwxrwx--- runner backup
324+
drwxrwx--- runner ca
325325
-rw-rw-rw- runner localhost_access_log.$DATE.txt
326326
EOF
327327
328328
cat > expected_new << EOF
329-
drwxrwxrwx runner backup
330-
drwxrwxrwx runner ca
329+
drwxrwx--- runner backup
330+
drwxrwx--- runner ca
331331
-rw-rw-rw- runner localhost_access_log.$DATE.txt
332332
EOF
333333

0 commit comments

Comments
 (0)