Skip to content

Commit 5441816

Browse files
authored
Integrate FREEZE_TO_TAPE in build (#118)
Integrate `FREEZE_TO_TAPE` so that it can in fact be used with `migverifyarchives` cronjob as well as on show Archive page. Adjusted `Makefile` test-doc target to avoid the `!(migrid-http).env` construct which just fails here. Documented `FREEZE_TO_TAPE` option in conf variables.
2 parents 84a0e7e + 22526b8 commit 5441816

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

Dockerfile.rocky8

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ ARG ENABLE_SITESTATUS=True
106106
ARG STATUS_SYSTEM_MATCH="ANY"
107107
ARG ENABLE_FREEZE=False
108108
ARG PERMANENT_FREEZE=""
109+
ARG FREEZE_TO_TAPE=""
109110
ARG ENABLE_CRACKLIB=True
110111
ARG ENABLE_IMNOTIFY=False
111112
ARG ENABLE_NOTIFY=True
@@ -1098,6 +1099,7 @@ ARG ENABLE_SITESTATUS
10981099
ARG STATUS_SYSTEM_MATCH
10991100
ARG ENABLE_FREEZE
11001101
ARG PERMANENT_FREEZE
1102+
ARG FREEZE_TO_TAPE
11011103
ARG ENABLE_CRACKLIB
11021104
ARG ENABLE_IMNOTIFY
11031105
ARG ENABLE_NOTIFY
@@ -1325,7 +1327,8 @@ RUN ./generateconfs.py --source=. \
13251327
--enable_resources=${ENABLE_RESOURCES} --enable_events=${ENABLE_EVENTS} \
13261328
--enable_gravatars=${ENABLE_GRAVATARS} --enable_sitestatus=${ENABLE_SITESTATUS} \
13271329
--status_system_match="${STATUS_SYSTEM_MATCH}" --enable_freeze=${ENABLE_FREEZE} \
1328-
--permanent_freeze="${PERMANENT_FREEZE}" --enable_imnotify=${ENABLE_IMNOTIFY} \
1330+
--permanent_freeze="${PERMANENT_FREEZE}" --freeze_to_tape=${FREEZE_TO_TAPE} \
1331+
--enable_imnotify=${ENABLE_IMNOTIFY} \
13291332
--enable_cracklib=${ENABLE_CRACKLIB} --enable_twofactor=${ENABLE_TWOFACTOR} \
13301333
--enable_twofactor_strict_address=${ENABLE_TWOFACTOR_STRICT_ADDRESS} \
13311334
--twofactor_auth_apps="${TWOFACTOR_AUTH_APPS}" \

Dockerfile.rocky9

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ ARG ENABLE_SITESTATUS=True
107107
ARG STATUS_SYSTEM_MATCH="ANY"
108108
ARG ENABLE_FREEZE=False
109109
ARG PERMANENT_FREEZE=""
110+
ARG FREEZE_TO_TAPE=""
110111
ARG ENABLE_CRACKLIB=True
111112
ARG ENABLE_IMNOTIFY=False
112113
ARG ENABLE_NOTIFY=True
@@ -1003,6 +1004,7 @@ ARG ENABLE_SITESTATUS
10031004
ARG STATUS_SYSTEM_MATCH
10041005
ARG ENABLE_FREEZE
10051006
ARG PERMANENT_FREEZE
1007+
ARG FREEZE_TO_TAPE
10061008
ARG ENABLE_CRACKLIB
10071009
ARG ENABLE_IMNOTIFY
10081010
ARG ENABLE_NOTIFY
@@ -1214,7 +1216,8 @@ RUN ./generateconfs.py --source=. \
12141216
--enable_resources=${ENABLE_RESOURCES} --enable_events=${ENABLE_EVENTS} \
12151217
--enable_gravatars=${ENABLE_GRAVATARS} --enable_sitestatus=${ENABLE_SITESTATUS} \
12161218
--status_system_match="${STATUS_SYSTEM_MATCH}" --enable_freeze=${ENABLE_FREEZE} \
1217-
--permanent_freeze="${PERMANENT_FREEZE}" --enable_imnotify=${ENABLE_IMNOTIFY} \
1219+
--permanent_freeze="${PERMANENT_FREEZE}" --freeze_to_tape=${FREEZE_TO_TAPE} \
1220+
--enable_imnotify=${ENABLE_IMNOTIFY} \
12181221
--enable_cracklib=${ENABLE_CRACKLIB} --enable_twofactor=${ENABLE_TWOFACTOR} \
12191222
--enable_twofactor_strict_address=${ENABLE_TWOFACTOR_STRICT_ADDRESS} \
12201223
--twofactor_auth_apps="${TWOFACTOR_AUTH_APPS}" \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ wipesitedatawarning:
277277
# Test that all defined env variables are properly documented
278278
test-doc:
279279
@shopt -s extglob; \
280-
for i in $$( grep -hv '\(^#.*\|^$$\)' !(migrid-httpd).env | sed -E 's!^([^=]*)=.*$$!\1!g' | sort | uniq ) ; do \
280+
for i in $$( grep -hv '\(^#.*\|^$$\)' --exclude=migrid-httpd.env *.env | sed -E 's!^([^=]*)=.*$$!\1!g' | sort | uniq ) ; do \
281281
grep -q "$$i" doc/source/sections/configuration/variables.rst \
282282
|| missing+=( "$$i" ) ; \
283283
done; \

doc/source/sections/configuration/variables.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@ Variables
395395
* - PERMANENT_FREEZE
396396
-
397397
- Flavors of frozen archives to write-protect when user selects finalize.
398+
* - FREEZE_TO_TAPE
399+
-
400+
- If `PERMANENT_FREEZE` is set this value is the expected time before such finalized freeze archives are stored on tape.
398401
* - ENABLE_CRACKLIB
399402
- True
400403
- Enable the built-in cracklib password checking integration on user-supplied passwords

0 commit comments

Comments
 (0)