nixos/virtuoso: drop
This commit is contained in:
parent
78411af65d
commit
31462e501e
|
@ -82,7 +82,7 @@ in
|
||||||
git = 41;
|
git = 41;
|
||||||
#fourstore = 42; # dropped in 20.03
|
#fourstore = 42; # dropped in 20.03
|
||||||
#fourstorehttp = 43; # dropped in 20.03
|
#fourstorehttp = 43; # dropped in 20.03
|
||||||
virtuoso = 44;
|
#virtuoso = 44; dropped module
|
||||||
#rtkit = 45; # dynamically allocated 2021-09-03
|
#rtkit = 45; # dynamically allocated 2021-09-03
|
||||||
dovecot2 = 46;
|
dovecot2 = 46;
|
||||||
dovenull2 = 47;
|
dovenull2 = 47;
|
||||||
|
|
|
@ -349,7 +349,6 @@
|
||||||
./services/databases/redis.nix
|
./services/databases/redis.nix
|
||||||
./services/databases/riak.nix
|
./services/databases/riak.nix
|
||||||
./services/databases/victoriametrics.nix
|
./services/databases/victoriametrics.nix
|
||||||
./services/databases/virtuoso.nix
|
|
||||||
./services/desktops/accountsservice.nix
|
./services/desktops/accountsservice.nix
|
||||||
./services/desktops/bamf.nix
|
./services/desktops/bamf.nix
|
||||||
./services/desktops/blueman.nix
|
./services/desktops/blueman.nix
|
||||||
|
|
|
@ -87,10 +87,9 @@ with lib;
|
||||||
(mkRemovedOptionModule [ "services" "racoon" ] ''
|
(mkRemovedOptionModule [ "services" "racoon" ] ''
|
||||||
The racoon module has been removed, because the software project was abandoned upstream.
|
The racoon module has been removed, because the software project was abandoned upstream.
|
||||||
'')
|
'')
|
||||||
|
|
||||||
(mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.")
|
||||||
|
|
||||||
(mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.")
|
(mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.")
|
||||||
|
(mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.")
|
||||||
|
|
||||||
# Do NOT add any option renames here, see top of the file
|
# Do NOT add any option renames here, see top of the file
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,99 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.virtuoso;
|
|
||||||
virtuosoUser = "virtuoso";
|
|
||||||
stateDir = "/var/lib/virtuoso";
|
|
||||||
in
|
|
||||||
with lib;
|
|
||||||
{
|
|
||||||
|
|
||||||
###### interface
|
|
||||||
|
|
||||||
options = {
|
|
||||||
|
|
||||||
services.virtuoso = {
|
|
||||||
|
|
||||||
enable = mkEnableOption "Virtuoso Opensource database server";
|
|
||||||
|
|
||||||
config = mkOption {
|
|
||||||
type = types.lines;
|
|
||||||
default = "";
|
|
||||||
description = "Extra options to put into Virtuoso configuration file.";
|
|
||||||
};
|
|
||||||
|
|
||||||
parameters = mkOption {
|
|
||||||
type = types.lines;
|
|
||||||
default = "";
|
|
||||||
description = "Extra options to put into [Parameters] section of Virtuoso configuration file.";
|
|
||||||
};
|
|
||||||
|
|
||||||
listenAddress = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "1111";
|
|
||||||
example = "myserver:1323";
|
|
||||||
description = "ip:port or port to listen on.";
|
|
||||||
};
|
|
||||||
|
|
||||||
httpListenAddress = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
example = "myserver:8080";
|
|
||||||
description = "ip:port or port for Virtuoso HTTP server to listen on.";
|
|
||||||
};
|
|
||||||
|
|
||||||
dirsAllowed = mkOption {
|
|
||||||
type = types.nullOr types.str; # XXX Maybe use a list in the future?
|
|
||||||
default = null;
|
|
||||||
example = "/www, /home/";
|
|
||||||
description = "A list of directories Virtuoso is allowed to access";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
###### implementation
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
|
|
||||||
users.users.${virtuosoUser} =
|
|
||||||
{ uid = config.ids.uids.virtuoso;
|
|
||||||
description = "virtuoso user";
|
|
||||||
home = stateDir;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.virtuoso = {
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
|
|
||||||
preStart = ''
|
|
||||||
mkdir -p ${stateDir}
|
|
||||||
chown ${virtuosoUser} ${stateDir}
|
|
||||||
'';
|
|
||||||
|
|
||||||
script = ''
|
|
||||||
cd ${stateDir}
|
|
||||||
${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
services.virtuoso.config = ''
|
|
||||||
[Database]
|
|
||||||
DatabaseFile=${stateDir}/x-virtuoso.db
|
|
||||||
TransactionFile=${stateDir}/x-virtuoso.trx
|
|
||||||
ErrorLogFile=${stateDir}/x-virtuoso.log
|
|
||||||
xa_persistent_file=${stateDir}/x-virtuoso.pxa
|
|
||||||
|
|
||||||
[Parameters]
|
|
||||||
ServerPort=${cfg.listenAddress}
|
|
||||||
RunAs=${virtuosoUser}
|
|
||||||
${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"}
|
|
||||||
${cfg.parameters}
|
|
||||||
|
|
||||||
[HTTPServer]
|
|
||||||
${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
|
|
||||||
'';
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in a new issue