Merge pull request #100495 from DianaOlympos/riak-cs-delete

riak-cs: delete

Changed files
+16 -547
nixos
doc
manual
release-notes
modules
pkgs
servers
nosql
top-level
+10
nixos/doc/manual/release-notes/rl-2103.xml
···
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
</para>
</listitem>
+
<listitem>
+
<para>
+
<package>riak-cs</package> package removed along with <varname>services.riak-cs</varname> module.
+
</para>
+
</listitem>
+
<listitem>
+
<para>
+
<package>stanchion</package> package removed along with <varname>services.stanchion</varname> module.
+
</para>
+
</listitem>
</itemizedlist>
</section>
+4 -4
nixos/modules/misc/ids.nix
···
hound = 259;
leaps = 260;
ipfs = 261;
-
stanchion = 262;
-
riak-cs = 263;
+
# stanchion = 262; # unused, removed 2020-10-14
+
# riak-cs = 263; # unused, removed 2020-10-14
infinoted = 264;
sickbeard = 265;
headphones = 266;
···
hound = 259;
leaps = 260;
ipfs = 261;
-
stanchion = 262;
-
riak-cs = 263;
+
# stanchion = 262; # unused, removed 2020-10-14
+
# riak-cs = 263; # unused, removed 2020-10-14
infinoted = 264;
sickbeard = 265;
headphones = 266;
-2
nixos/modules/module-list.nix
···
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
-
./services/databases/riak-cs.nix
-
./services/databases/stanchion.nix
./services/databases/victoriametrics.nix
./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix
-202
nixos/modules/services/databases/riak-cs.nix
···
-
{ config, lib, pkgs, ... }:
-
-
with lib;
-
-
let
-
-
cfg = config.services.riak-cs;
-
-
in
-
-
{
-
-
###### interface
-
-
options = {
-
-
services.riak-cs = {
-
-
enable = mkEnableOption "riak-cs";
-
-
package = mkOption {
-
type = types.package;
-
default = pkgs.riak-cs;
-
defaultText = "pkgs.riak-cs";
-
example = literalExample "pkgs.riak-cs";
-
description = ''
-
Riak package to use.
-
'';
-
};
-
-
nodeName = mkOption {
-
type = types.str;
-
default = "riak-cs@127.0.0.1";
-
description = ''
-
Name of the Erlang node.
-
'';
-
};
-
-
anonymousUserCreation = mkOption {
-
type = types.bool;
-
default = false;
-
description = ''
-
Anonymous user creation.
-
'';
-
};
-
-
riakHost = mkOption {
-
type = types.str;
-
default = "127.0.0.1:8087";
-
description = ''
-
Name of riak hosting service.
-
'';
-
};
-
-
listener = mkOption {
-
type = types.str;
-
default = "127.0.0.1:8080";
-
description = ''
-
Name of Riak CS listening service.
-
'';
-
};
-
-
stanchionHost = mkOption {
-
type = types.str;
-
default = "127.0.0.1:8085";
-
description = ''
-
Name of stanchion hosting service.
-
'';
-
};
-
-
stanchionSsl = mkOption {
-
type = types.bool;
-
default = true;
-
description = ''
-
Tell stanchion to use SSL.
-
'';
-
};
-
-
distributedCookie = mkOption {
-
type = types.str;
-
default = "riak";
-
description = ''
-
Cookie for distributed node communication. All nodes in the
-
same cluster should use the same cookie or they will not be able to
-
communicate.
-
'';
-
};
-
-
dataDir = mkOption {
-
type = types.path;
-
default = "/var/db/riak-cs";
-
description = ''
-
Data directory for Riak CS.
-
'';
-
};
-
-
logDir = mkOption {
-
type = types.path;
-
default = "/var/log/riak-cs";
-
description = ''
-
Log directory for Riak CS.
-
'';
-
};
-
-
extraConfig = mkOption {
-
type = types.lines;
-
default = "";
-
description = ''
-
Additional text to be appended to <filename>riak-cs.conf</filename>.
-
'';
-
};
-
-
extraAdvancedConfig = mkOption {
-
type = types.lines;
-
default = "";
-
description = ''
-
Additional text to be appended to <filename>advanced.config</filename>.
-
'';
-
};
-
};
-
-
};
-
-
###### implementation
-
-
config = mkIf cfg.enable {
-
-
environment.systemPackages = [ cfg.package ];
-
environment.etc."riak-cs/riak-cs.conf".text = ''
-
nodename = ${cfg.nodeName}
-
distributed_cookie = ${cfg.distributedCookie}
-
-
platform_log_dir = ${cfg.logDir}
-
-
riak_host = ${cfg.riakHost}
-
listener = ${cfg.listener}
-
stanchion_host = ${cfg.stanchionHost}
-
-
anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"}
-
-
${cfg.extraConfig}
-
'';
-
-
environment.etc."riak-cs/advanced.config".text = ''
-
${cfg.extraAdvancedConfig}
-
'';
-
-
users.users.riak-cs = {
-
name = "riak-cs";
-
uid = config.ids.uids.riak-cs;
-
group = "riak";
-
description = "Riak CS server user";
-
};
-
-
systemd.services.riak-cs = {
-
description = "Riak CS Server";
-
-
wantedBy = [ "multi-user.target" ];
-
after = [ "network.target" ];
-
-
path = [
-
pkgs.utillinux # for `logger`
-
pkgs.bash
-
];
-
-
environment.HOME = "${cfg.dataDir}";
-
environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}";
-
environment.RIAK_CS_LOG_DIR = "${cfg.logDir}";
-
environment.RIAK_CS_ETC_DIR = "/etc/riak";
-
-
preStart = ''
-
if ! test -e ${cfg.logDir}; then
-
mkdir -m 0755 -p ${cfg.logDir}
-
chown -R riak-cs ${cfg.logDir}
-
fi
-
-
if ! test -e ${cfg.dataDir}; then
-
mkdir -m 0700 -p ${cfg.dataDir}
-
chown -R riak-cs ${cfg.dataDir}
-
fi
-
'';
-
-
serviceConfig = {
-
ExecStart = "${cfg.package}/bin/riak-cs console";
-
ExecStop = "${cfg.package}/bin/riak-cs stop";
-
StandardInput = "tty";
-
User = "riak-cs";
-
Group = "riak-cs";
-
PermissionsStartOnly = true;
-
# Give Riak a decent amount of time to clean up.
-
TimeoutStopSec = 120;
-
LimitNOFILE = 65536;
-
};
-
-
unitConfig.RequiresMountsFor = [
-
"${cfg.dataDir}"
-
"${cfg.logDir}"
-
"/etc/riak"
-
];
-
};
-
};
-
}
-194
nixos/modules/services/databases/stanchion.nix
···
-
{ config, lib, pkgs, ... }:
-
-
with lib;
-
-
let
-
-
cfg = config.services.stanchion;
-
-
in
-
-
{
-
-
###### interface
-
-
options = {
-
-
services.stanchion = {
-
-
enable = mkEnableOption "stanchion";
-
-
package = mkOption {
-
type = types.package;
-
default = pkgs.stanchion;
-
defaultText = "pkgs.stanchion";
-
example = literalExample "pkgs.stanchion";
-
description = ''
-
Stanchion package to use.
-
'';
-
};
-
-
nodeName = mkOption {
-
type = types.str;
-
default = "stanchion@127.0.0.1";
-
description = ''
-
Name of the Erlang node.
-
'';
-
};
-
-
adminKey = mkOption {
-
type = types.str;
-
default = "";
-
description = ''
-
Name of admin user.
-
'';
-
};
-
-
adminSecret = mkOption {
-
type = types.str;
-
default = "";
-
description = ''
-
Name of admin secret
-
'';
-
};
-
-
riakHost = mkOption {
-
type = types.str;
-
default = "127.0.0.1:8087";
-
description = ''
-
Name of riak hosting service.
-
'';
-
};
-
-
listener = mkOption {
-
type = types.str;
-
default = "127.0.0.1:8085";
-
description = ''
-
Name of Riak CS listening service.
-
'';
-
};
-
-
stanchionHost = mkOption {
-
type = types.str;
-
default = "127.0.0.1:8085";
-
description = ''
-
Name of stanchion hosting service.
-
'';
-
};
-
-
distributedCookie = mkOption {
-
type = types.str;
-
default = "riak";
-
description = ''
-
Cookie for distributed node communication. All nodes in the
-
same cluster should use the same cookie or they will not be able to
-
communicate.
-
'';
-
};
-
-
dataDir = mkOption {
-
type = types.path;
-
default = "/var/db/stanchion";
-
description = ''
-
Data directory for Stanchion.
-
'';
-
};
-
-
logDir = mkOption {
-
type = types.path;
-
default = "/var/log/stanchion";
-
description = ''
-
Log directory for Stanchion.
-
'';
-
};
-
-
extraConfig = mkOption {
-
type = types.lines;
-
default = "";
-
description = ''
-
Additional text to be appended to <filename>stanchion.conf</filename>.
-
'';
-
};
-
};
-
};
-
-
###### implementation
-
-
config = mkIf cfg.enable {
-
-
environment.systemPackages = [ cfg.package ];
-
-
environment.etc."stanchion/advanced.config".text = ''
-
[{stanchion, []}].
-
'';
-
-
environment.etc."stanchion/stanchion.conf".text = ''
-
listener = ${cfg.listener}
-
-
riak_host = ${cfg.riakHost}
-
-
${optionalString (cfg.adminKey == "") "#"} admin.key=${optionalString (cfg.adminKey != "") cfg.adminKey}
-
${optionalString (cfg.adminSecret == "") "#"} admin.secret=${optionalString (cfg.adminSecret != "") cfg.adminSecret}
-
-
platform_bin_dir = ${pkgs.stanchion}/bin
-
platform_data_dir = ${cfg.dataDir}
-
platform_etc_dir = /etc/stanchion
-
platform_lib_dir = ${pkgs.stanchion}/lib
-
platform_log_dir = ${cfg.logDir}
-
-
nodename = ${cfg.nodeName}
-
-
distributed_cookie = ${cfg.distributedCookie}
-
-
${cfg.extraConfig}
-
'';
-
-
users.users.stanchion = {
-
name = "stanchion";
-
uid = config.ids.uids.stanchion;
-
group = "stanchion";
-
description = "Stanchion server user";
-
};
-
-
users.groups.stanchion.gid = config.ids.gids.stanchion;
-
-
systemd.tmpfiles.rules = [
-
"d '${cfg.logDir}' - stanchion stanchion --"
-
"d '${cfg.dataDir}' 0700 stanchion stanchion --"
-
];
-
-
systemd.services.stanchion = {
-
description = "Stanchion Server";
-
-
wantedBy = [ "multi-user.target" ];
-
after = [ "network.target" ];
-
-
path = [
-
pkgs.utillinux # for `logger`
-
pkgs.bash
-
];
-
-
environment.HOME = "${cfg.dataDir}";
-
environment.STANCHION_DATA_DIR = "${cfg.dataDir}";
-
environment.STANCHION_LOG_DIR = "${cfg.logDir}";
-
environment.STANCHION_ETC_DIR = "/etc/stanchion";
-
-
serviceConfig = {
-
ExecStart = "${cfg.package}/bin/stanchion console";
-
ExecStop = "${cfg.package}/bin/stanchion stop";
-
StandardInput = "tty";
-
User = "stanchion";
-
Group = "stanchion";
-
# Give Stanchion a decent amount of time to clean up.
-
TimeoutStopSec = 120;
-
LimitNOFILE = 65536;
-
};
-
-
unitConfig.RequiresMountsFor = [
-
"${cfg.dataDir}"
-
"${cfg.logDir}"
-
"/etc/stanchion"
-
];
-
};
-
};
-
}
-70
pkgs/servers/nosql/riak-cs/2.1.1.nix
···
-
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
-
, Carbon ? null, Cocoa ? null }:
-
-
stdenv.mkDerivation {
-
name = "riak_cs-2.1.1";
-
-
buildInputs = [
-
which unzip erlang git wget
-
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
-
++ lib.optional stdenv.isLinux [ pam ];
-
-
src = fetchurl {
-
url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz";
-
sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5";
-
};
-
-
-
postPatch = ''
-
sed -i deps/node_package/priv/base/env.sh \
-
-e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \
-
-e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-
-e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-
-e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \
-
-e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
-
-
sed -i ./Makefile \
-
-e 's@rel: deps compile@rel: deps compile-src@'
-
'';
-
-
preBuild = ''
-
patchShebangs .
-
'';
-
-
buildPhase = ''
-
runHook preBuild
-
-
make locked-deps
-
make rel
-
-
runHook postBuild
-
'';
-
-
doCheck = false;
-
-
installPhase = ''
-
runHook preInstall
-
-
mkdir $out
-
mv rel/riak-cs/etc rel/riak-cs/riak-etc
-
mkdir -p rel/riak-cs/etc
-
mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs
-
mv rel/riak-cs/* $out
-
-
for prog in $out/bin/*; do
-
substituteInPlace $prog \
-
--replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
-
". $out/lib/env.sh"
-
done
-
-
runHook postInstall
-
'';
-
-
meta = with lib; {
-
description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility";
-
platforms = [ "x86_64-linux" "x86_64-darwin" ];
-
license = licenses.asl20;
-
maintainers = with maintainers; [ mdaiter ];
-
knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ];
-
};
-
}
-65
pkgs/servers/nosql/riak-cs/stanchion.nix
···
-
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
-
, Carbon ? null, Cocoa ? null }:
-
-
stdenv.mkDerivation {
-
name = "stanchion-2.1.1";
-
-
buildInputs = [
-
which unzip erlang git wget
-
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
-
++ lib.optional stdenv.isLinux [ pam ];
-
-
src = fetchurl {
-
url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
-
sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja";
-
};
-
-
-
postPatch = ''
-
sed -i deps/node_package/priv/base/env.sh \
-
-e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \
-
-e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-
-e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-
-e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \
-
-e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
-
'';
-
-
preBuild = ''
-
patchShebangs .
-
'';
-
-
buildPhase = ''
-
runHook preBuild
-
-
make rel
-
-
runHook postBuild
-
'';
-
-
doCheck = false;
-
-
installPhase = ''
-
runHook preInstall
-
-
mkdir $out
-
mv rel/stanchion/etc rel/stanchion/riak-etc
-
mkdir -p rel/stanchion/etc
-
mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion
-
mv rel/stanchion/* $out
-
-
for prog in $out/bin/*; do
-
substituteInPlace $prog \
-
--replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
-
". $out/lib/env.sh"
-
done
-
-
runHook postInstall
-
'';
-
-
meta = with lib; {
-
maintainers = with maintainers; [ mdaiter ];
-
description = "Manager for Riak CS";
-
platforms = [ "x86_64-linux" "x86_64-darwin" ];
-
license = licenses.asl20;
-
};
-
}
+2
pkgs/top-level/aliases.nix
···
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
+
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";
···
sqliteInteractive = sqlite-interactive; # added 2014-12-06
squid4 = squid; # added 2019-08-22
sshfsFuse = sshfs-fuse; # added 2016-09
+
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
surf-webkit2 = surf; # added 2017-04-02
sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
-10
pkgs/top-level/all-packages.nix
···
erlang = erlang_basho_R16B02;
-
riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
-
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-
erlang = erlang_basho_R16B02;
-
};
-
-
stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix {
-
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-
erlang = erlang_basho_R16B02;
-
};
-
influxdb = callPackage ../servers/nosql/influxdb { };
mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {