Merge pull request #165481 from talyz/discourse-2.9.0.beta3
discourse: 2.9.0.beta1 -> 2.9.0.beta3
This commit is contained in:
@@ -609,6 +609,7 @@ in
|
||||
connection_reaper_interval = 30;
|
||||
relative_url_root = null;
|
||||
message_bus_max_backlog_size = 100;
|
||||
message_bus_clear_every = 50;
|
||||
secret_key_base = cfg.secretKeyBaseFile;
|
||||
fallback_assets_path = null;
|
||||
|
||||
@@ -655,7 +656,12 @@ in
|
||||
long_polling_interval = null;
|
||||
};
|
||||
|
||||
services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost");
|
||||
services.redis.servers.discourse =
|
||||
lib.mkIf (lib.elem cfg.redis.host [ "localhost" "127.0.0.1" ]) {
|
||||
enable = true;
|
||||
bind = cfg.redis.host;
|
||||
port = cfg.backendSettings.redis_port;
|
||||
};
|
||||
|
||||
services.postgresql = lib.mkIf databaseActuallyCreateLocally {
|
||||
enable = true;
|
||||
@@ -696,12 +702,12 @@ in
|
||||
systemd.services.discourse = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [
|
||||
"redis.service"
|
||||
"redis-discourse.service"
|
||||
"postgresql.service"
|
||||
"discourse-postgresql.service"
|
||||
];
|
||||
bindsTo = [
|
||||
"redis.service"
|
||||
"redis-discourse.service"
|
||||
] ++ lib.optionals (cfg.database.host == null) [
|
||||
"postgresql.service"
|
||||
"discourse-postgresql.service"
|
||||
|
||||
Reference in New Issue
Block a user