Set smaller default deletion delay for devenv

And make the deletion delay configurable
This commit is contained in:
Andrey Antukh 2024-04-10 09:47:59 +02:00
parent 7b7820952c
commit 34534c924f
3 changed files with 10 additions and 1 deletions

View file

@ -29,6 +29,8 @@ export PENPOT_FLAGS="\
enable-file-validation \ enable-file-validation \
enable-file-schema-validation"; enable-file-schema-validation";
# Default deletion delay for devenv
export PENPOT_DELETION_DELAY="24h"
# Setup default upload media file size to 100MiB # Setup default upload media file size to 100MiB
export PENPOT_MEDIA_MAX_FILE_SIZE=104857600 export PENPOT_MEDIA_MAX_FILE_SIZE=104857600

View file

@ -32,6 +32,9 @@ export OPTIONS="
-J-XX:+UnlockDiagnosticVMOptions \ -J-XX:+UnlockDiagnosticVMOptions \
-J-XX:+DebugNonSafepoints" -J-XX:+DebugNonSafepoints"
# Default deletion delay for devenv
export PENPOT_DELETION_DELAY="24h"
# Setup default upload media file size to 100MiB # Setup default upload media file size to 100MiB
export PENPOT_MEDIA_MAX_FILE_SIZE=104857600 export PENPOT_MEDIA_MAX_FILE_SIZE=104857600

View file

@ -101,6 +101,8 @@
(s/def ::audit-log-archive-uri ::us/string) (s/def ::audit-log-archive-uri ::us/string)
(s/def ::audit-log-http-handler-concurrency ::us/integer) (s/def ::audit-log-http-handler-concurrency ::us/integer)
(s/def ::deletion-delay ::dt/duration)
(s/def ::admins ::us/set-of-valid-emails) (s/def ::admins ::us/set-of-valid-emails)
(s/def ::file-change-snapshot-every ::us/integer) (s/def ::file-change-snapshot-every ::us/integer)
(s/def ::file-change-snapshot-timeout ::dt/duration) (s/def ::file-change-snapshot-timeout ::dt/duration)
@ -214,6 +216,7 @@
(s/keys :opt-un [::secret-key (s/keys :opt-un [::secret-key
::flags ::flags
::admins ::admins
::deletion-delay
::allow-demo-users ::allow-demo-users
::audit-log-archive-uri ::audit-log-archive-uri
::audit-log-http-handler-concurrency ::audit-log-http-handler-concurrency
@ -380,7 +383,8 @@
(defonce ^:dynamic flags (parse-flags config)) (defonce ^:dynamic flags (parse-flags config))
(def deletion-delay (def deletion-delay
(dt/duration {:days 7})) (or (c/get config :deletion-delay)
(dt/duration {:days 7})))
(defn get (defn get
"A configuration getter. Helps code be more testable." "A configuration getter. Helps code be more testable."