pumpio service: adjust upload directory config for 3.0.0
These changes are backwards compatible.
This commit is contained in:
parent
252e58a95e
commit
f1a1490135
@ -57,7 +57,8 @@ let
|
|||||||
smtpfrom = cfg.smtpFrom;
|
smtpfrom = cfg.smtpFrom;
|
||||||
|
|
||||||
nologger = false;
|
nologger = false;
|
||||||
uploaddir = "${dataDir}/uploads";
|
enableUploads = cfg.enableUploads;
|
||||||
|
datadir = dataDir;
|
||||||
debugClient = false;
|
debugClient = false;
|
||||||
firehose = cfg.firehose;
|
firehose = cfg.firehose;
|
||||||
disableRegistration = cfg.disableRegistration;
|
disableRegistration = cfg.disableRegistration;
|
||||||
@ -152,6 +153,15 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enableUploads = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = ''
|
||||||
|
If you want to disable file uploads, set this to false. Uploaded files will be stored
|
||||||
|
in ${dataDir}/uploads.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
sslKey = mkOption {
|
sslKey = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
example = "${dataDir}/myserver.key";
|
example = "${dataDir}/myserver.key";
|
||||||
@ -341,7 +351,15 @@ in
|
|||||||
{ description = "pump.io social network stream server";
|
{ description = "pump.io social network stream server";
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
preStart = ''
|
||||||
|
mkdir -p ${dataDir}/uploads
|
||||||
|
chown pumpio:pumpio ${dataDir}/uploads
|
||||||
|
chmod 770 ${dataDir}/uploads
|
||||||
|
'';
|
||||||
|
|
||||||
serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json";
|
serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json";
|
||||||
|
PermissionsStartOnly = true;
|
||||||
serviceConfig.User = if cfg.port < 1024 then "root" else user;
|
serviceConfig.User = if cfg.port < 1024 then "root" else user;
|
||||||
serviceConfig.Group = user;
|
serviceConfig.Group = user;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user