Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2021-11-09 04:56:44 +0300
committerBenjamin Neff <benjamin@coding4coffee.ch>2021-11-23 03:48:33 +0300
commit96493b4a5c19072763ce8cb58f3a18ae0fa89d4c (patch)
tree7bbf39b4a62fb87cc773c01394bb952ef126fcbc /config
parent1eb2c59cce90c50f8ec862ee161a273525509c8f (diff)
Refactory archive concurrency so the same logic can be reused
Diffstat (limited to 'config')
-rw-r--r--config/defaults.yml2
-rw-r--r--config/diaspora.toml.example8
2 files changed, 5 insertions, 5 deletions
diff --git a/config/defaults.yml b/config/defaults.yml
index fed76531f..3b3919f00 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -97,7 +97,7 @@ defaults:
suggest_email:
typhoeus_verbose: false
typhoeus_concurrency: 20
- export_concurrency: 1
+ archive_jobs_concurrency: 1
username_blacklist:
- 'admin'
- 'administrator'
diff --git a/config/diaspora.toml.example b/config/diaspora.toml.example
index c6c4fbea2..6304fb3fe 100644
--- a/config/diaspora.toml.example
+++ b/config/diaspora.toml.example
@@ -344,10 +344,10 @@
## of your Sidekiq workers.
#typhoeus_concurrency = 20
-## Maximum number of parallel user data export jobs (default=1)
-## Be careful, exports of big/old profiles can use a lot of memory, running
-## many of them in parallel can be a problem for small servers.
-#export_concurrency = 1
+## Maximum number of parallel user data import/export jobs (default=1)
+## Be careful, imports and exports of big/old profiles can use a lot of memory,
+## running many of them in parallel can be a problem for small servers.
+#archive_jobs_concurrency = 1
## Welcome Message settings
[configuration.settings.welcome_message]