From 892c99706a1c997ae064e443c2162a5659b8a05e Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 8 Oct 2015 12:05:32 +0200 Subject: lass 2: add skype.nix --- lass/1systems/mors.nix | 1 + lass/2configs/skype.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 lass/2configs/skype.nix (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 5cc03501f..c0c33828b 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -24,6 +24,7 @@ ../2configs/bitlbee.nix ../2configs/firefoxPatched.nix ../2configs/realwallpaper.nix + ../2configs/skype.nix ]; krebs.build = { diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix new file mode 100644 index 000000000..7e4618a7b --- /dev/null +++ b/lass/2configs/skype.nix @@ -0,0 +1,30 @@ +{ config, pkgs, ... }: + +let + mainUser = config.users.extraUsers.mainUser; + +in { + imports = [ + ../3modules/per-user.nix + ]; + + users.extraUsers = { + skype = { + name = "skype"; + uid = 2259819492; #genid skype + description = "user for running skype"; + home = "/home/skype"; + useDefaultShell = true; + extraGroups = [ "audio" "video" ]; + createHome = true; + }; + }; + + lass.per-user.skype.packages = [ + pkgs.skype + ]; + + security.sudo.extraConfig = '' + ${mainUser.name} ALL=(skype) NOPASSWD: ALL + ''; +} -- cgit v1.2.3 From d2720415ac5404f3261a4dafbd97092c282dd169 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:06:22 +0200 Subject: lass 5: add go url shortener --- lass/5pkgs/default.nix | 1 + lass/5pkgs/go/default.nix | 61 ++++++++++++++++++++++++++++++++++++++++++++++ lass/5pkgs/go/packages.nix | 44 +++++++++++++++++++++++++++++++++ lass/5pkgs/go/result | 1 + 4 files changed, 107 insertions(+) create mode 100644 lass/5pkgs/go/default.nix create mode 100644 lass/5pkgs/go/packages.nix create mode 120000 lass/5pkgs/go/result (limited to 'lass') diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 7427cb620..e3e49e37e 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -13,4 +13,5 @@ rec { ublock = callPackage ./firefoxPlugins/ublock.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; }; + go = callPackage ./go/default.nix {}; } diff --git a/lass/5pkgs/go/default.nix b/lass/5pkgs/go/default.nix new file mode 100644 index 000000000..2ac809c33 --- /dev/null +++ b/lass/5pkgs/go/default.nix @@ -0,0 +1,61 @@ +{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }: + +with lib; + +let + np = nodePackages.override { + generated = ./packages.nix; + self = np; + }; + + node_env = buildEnv { + name = "node_env"; + paths = [ + np.redis + np."formidable" + ]; + pathsToLink = [ "/lib" ]; + ignoreCollisions = true; + }; + +in nodePackages.buildNodePackage { + name = "go"; + + src = fetchgit { + url = "http://cgit.echelon/go/"; + rev = "05d02740e0adbb36cc461323647f0c1e7f493156"; + sha256 = "6015c9a93317375ae8099c7ab982df0aa93a59ec2b48972e253887bb6ca0004f"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + deps = (filter (v: nixType v == "derivation") (attrValues np)); + + buildInputs = [ + nodejs + nodePackages.redis + np.formidable + makeWrapper + ]; + + installPhase = '' + mkdir -p $out/bin + + find ${node_env} + + cp index.js $out/ + cat > $out/go << EOF + ${nodejs}/bin/node $out/index.js + EOF + chmod +x $out/go + + wrapProgram $out/go \ + --prefix NODE_PATH : ${node_env}/lib/node_modules + + ln -s $out/go /$out/bin/go + ''; + +} diff --git a/lass/5pkgs/go/packages.nix b/lass/5pkgs/go/packages.nix new file mode 100644 index 000000000..9acfd7658 --- /dev/null +++ b/lass/5pkgs/go/packages.nix @@ -0,0 +1,44 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."formidable"."*" = + self.by-version."formidable"."1.0.17"; + by-version."formidable"."1.0.17" = self.buildNodePackage { + name = "formidable-1.0.17"; + version = "1.0.17"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + name = "formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "formidable" = self.by-version."formidable"."1.0.17"; + by-spec."redis"."*" = + self.by-version."redis"."2.1.0"; + by-version."redis"."2.1.0" = self.buildNodePackage { + name = "redis-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-2.1.0.tgz"; + name = "redis-2.1.0.tgz"; + sha1 = "38acb208f90750250f9451219b73ff08ae907f94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "redis" = self.by-version."redis"."2.1.0"; +} diff --git a/lass/5pkgs/go/result b/lass/5pkgs/go/result new file mode 120000 index 000000000..14893ca34 --- /dev/null +++ b/lass/5pkgs/go/result @@ -0,0 +1 @@ +/nix/store/nizallgwxcx4fz9awyfp9i17avfymlvx-nodejs-go \ No newline at end of file -- cgit v1.2.3 From 45acff36265352e168928399957241abf4eb0dc1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:07:44 +0200 Subject: lass 2 git: add go repo --- lass/2configs/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 595936da5..d63705ab6 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -31,6 +31,7 @@ let }; wai-middleware-time = {}; web-routes-wai-custom = {}; + go = {}; }; restricted-repos = mapAttrs make-restricted-repo ( -- cgit v1.2.3 From e4b27b52864cd40367b28c9967f1e375988a5445 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:08:27 +0200 Subject: lass 1 echelon: get hostName from build.host.name --- lass/1systems/echelon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index b301b504a..bf3ca8723 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -44,6 +44,6 @@ in { }; }; - networking.hostName = "echelon"; + networking.hostName = config.krebs.build.host.name; } -- cgit v1.2.3 From d478ed4e06dbf84688bb99aa00b95e1d8b09f3b1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:09:13 +0200 Subject: lass 2 ircd: change sid and hostname --- lass/2configs/ircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix index f71b769fd..fc0aeb84b 100644 --- a/lass/2configs/ircd.nix +++ b/lass/2configs/ircd.nix @@ -5,8 +5,8 @@ enable = true; config = '' serverinfo { - name = "ire.irc.retiolum"; - sid = "4z3"; + name = "${config.krebs.build.host.name}.irc.retiolum"; + sid = "1as"; description = "miep!"; network_name = "irc.retiolum"; network_desc = "Retiolum IRC Network"; -- cgit v1.2.3 From 20724bfcf7cb10a6e8ebf153e46ffac3d9ebbf67 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:10:15 +0200 Subject: lass 2: add redix.nix --- lass/2configs/redis.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lass/2configs/redis.nix (limited to 'lass') diff --git a/lass/2configs/redis.nix b/lass/2configs/redis.nix new file mode 100644 index 000000000..8dd8df5c3 --- /dev/null +++ b/lass/2configs/redis.nix @@ -0,0 +1,8 @@ +{ config, ... }: + +{ + config.services.redis = { + enable = true; + bind = "127.0.0.1"; + }; +} -- cgit v1.2.3 From 4752e4a75765faeea6a2d8aa26c78c106d266a1c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:11:29 +0200 Subject: lass 3: add go.nix --- lass/3modules/go.nix | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 lass/3modules/go.nix (limited to 'lass') diff --git a/lass/3modules/go.nix b/lass/3modules/go.nix new file mode 100644 index 000000000..aa900f118 --- /dev/null +++ b/lass/3modules/go.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with builtins; +with lib; + +let + cfg = config.lass.go; + + out = { + options.lass.go = api; + config = mkIf cfg.enable imp; + }; + + api = { + enable = mkEnableOption "Enable go url shortener"; + port = mkOption { + type = types.str; + default = "1337"; + description = "on which port go should run on"; + }; + redisKeyPrefix = mkOption { + type = types.str; + default = "go:"; + description = "change the Redis key prefix which defaults to `go:`"; + }; + }; + + imp = { + users.extraUsers.go = { + name = "go"; + uid = 42774411; #genid go + description = "go url shortener user"; + home = "/var/lib/go"; + createHome = true; + }; + + systemd.services.go = { + description = "go url shortener"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = with pkgs; [ + go + ]; + + environment = { + PORT = cfg.port; + REDIS_KEY_PREFIX = cfg.redisKeyPrefix; + }; + + restartIfChanged = true; + + serviceConfig = { + User = "go"; + Restart = "always"; + ExecStart = "${pkgs.go}/bin/go"; + }; + }; + }; + +in out -- cgit v1.2.3 From 8b42c0631e86da5e05a4659887d9c7958bf27636 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:23:45 +0200 Subject: lass 2 ircd: open port 6667 to retiolum --- lass/2configs/ircd.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix index fc0aeb84b..de96ad9d6 100644 --- a/lass/2configs/ircd.nix +++ b/lass/2configs/ircd.nix @@ -1,6 +1,9 @@ { config, pkgs, ... }: { + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-i retiolum -p tcp --dport 6667"; target = "ACCEPT"; } + ]; config.services.charybdis = { enable = true; config = '' -- cgit v1.2.3 From c8c2b254e5f633618b43be6b348c747e903f7577 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:24:13 +0200 Subject: lass 2: add go.nix --- lass/2configs/go.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 lass/2configs/go.nix (limited to 'lass') diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix new file mode 100644 index 000000000..30d3e6ae5 --- /dev/null +++ b/lass/2configs/go.nix @@ -0,0 +1,16 @@ +{ config, pkgs, ... }: + +{ + imports = [ + ../3modules/go.nix + ]; + environment.systemPackages = [ + pkgs.go + ]; + lass.go = { + enable = true; + }; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-i retiolum -p tcp --dport 1337"; target = "ACCEPT"; } + ]; +} -- cgit v1.2.3 From e21fdefcf1cec589db1aec4226bc52a65991b218 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:24:50 +0200 Subject: lass 1 echelon: import new stuff --- lass/1systems/echelon.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index bf3ca8723..1320e0782 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -14,6 +14,9 @@ in { ../2configs/realwallpaper-server.nix ../2configs/privoxy-retiolum.nix ../2configs/git.nix + ../2configs/redis.nix + ../2configs/go.nix + ../2configs/ircd.nix { networking.interfaces.enp2s1.ip4 = [ { -- cgit v1.2.3 From 4072a32f89b9cc1c1e7c3583ac5b9ce5dcb004af Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:31:42 +0200 Subject: lass 5 go: remove debug stuff --- lass/5pkgs/go/default.nix | 2 -- lass/5pkgs/go/result | 1 - 2 files changed, 3 deletions(-) delete mode 120000 lass/5pkgs/go/result (limited to 'lass') diff --git a/lass/5pkgs/go/default.nix b/lass/5pkgs/go/default.nix index 2ac809c33..3b4468d18 100644 --- a/lass/5pkgs/go/default.nix +++ b/lass/5pkgs/go/default.nix @@ -44,8 +44,6 @@ in nodePackages.buildNodePackage { installPhase = '' mkdir -p $out/bin - find ${node_env} - cp index.js $out/ cat > $out/go << EOF ${nodejs}/bin/node $out/index.js diff --git a/lass/5pkgs/go/result b/lass/5pkgs/go/result deleted file mode 120000 index 14893ca34..000000000 --- a/lass/5pkgs/go/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/nizallgwxcx4fz9awyfp9i17avfymlvx-nodejs-go \ No newline at end of file -- cgit v1.2.3