From ab2ff68cbef3ec5293f8826acb3522abd703b636 Mon Sep 17 00:00:00 2001 From: David Butenhof Date: Thu, 16 Mar 2023 18:27:57 -0400 Subject: [PATCH] Config file changes (#3349) Remove some obsolete config settings from the default and canned config files. --- server/lib/config/pbench-server-default.cfg | 11 ----------- .../pbenchinacan/etc/pbench-server/pbench-server.cfg | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/server/lib/config/pbench-server-default.cfg b/server/lib/config/pbench-server-default.cfg index 7bed42c4cd..e5eed70514 100644 --- a/server/lib/config/pbench-server-default.cfg +++ b/server/lib/config/pbench-server-default.cfg @@ -29,17 +29,11 @@ mailfrom=%(user)s@localhost # Token expiration duration in minutes, can be overridden in the main config file, defaults to 60 mins token_expiration_duration = 60 -# Maximum number of days an unpacked tar ball directory hierarchy will be -# kept around. -max-unpacked-age = 30 - # Server settings for dataset retention in days; the default can be overridden # by user metadata, bounded by the server maximum. maximum-dataset-retention-days = 3650 default-dataset-retention-days = 730 -# See pbench-server-setup documentation for filesystem setup. - # WARNING - the pbench-server.cfg file should provide a definition of # pbench-top-dir, e.g.: # pbench-top-dir = /srv/pbench @@ -70,11 +64,6 @@ workers = 3 # Set the gunicorn worker timeout. Setting it to 0 has the effect of infinite timeouts worker_timeout = 9000 -# WARNING - the pbench-server.cfg file should provide a definition of -# pbench-backup-dir, e.g.: -# pbench-backup-dir = %(pbench-local-dir)s/archive.backup -# We won't define it here by default to avoid unintended behaviors. - # Default roles this pbench server takes on, see crontab roles below. roles = pbench-results diff --git a/server/pbenchinacan/etc/pbench-server/pbench-server.cfg b/server/pbenchinacan/etc/pbench-server/pbench-server.cfg index e83bc4f8d7..c3ef8790a1 100644 --- a/server/pbenchinacan/etc/pbench-server/pbench-server.cfg +++ b/server/pbenchinacan/etc/pbench-server/pbench-server.cfg @@ -7,13 +7,11 @@ install-dir = /opt/pbench-server ########################################################################### [pbench-server] pbench-top-dir = /srv/pbench -pbench-backup-dir = %(pbench-top-dir)s/pbench.archive.backup environment = container realhost = pbenchinacan -max-unpacked-age = 36500 maximum-dataset-retention-days = 36500 default-dataset-retention-days = 730 -roles = pbench-results, pbench-backup +roles = pbench-results [Indexing] index_prefix = container-pbench