From 6a425334c78fe6eb30f21f9757554905f09436fa Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 22 Oct 2015 13:43:20 +0200 Subject: m 2 reaktor/random-emoji: html-decode output using xmlstarlet --- makefu/2configs/Reaktor/random-emoji.nix | 1 + makefu/2configs/Reaktor/random-emoji.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'makefu') diff --git a/makefu/2configs/Reaktor/random-emoji.nix b/makefu/2configs/Reaktor/random-emoji.nix index b2d99b36b..3113a826b 100644 --- a/makefu/2configs/Reaktor/random-emoji.nix +++ b/makefu/2configs/Reaktor/random-emoji.nix @@ -12,6 +12,7 @@ let coreutils gnused gnugrep + xmlstarlet curl]); in { # TODO: make origin a variable, <- module is generic enough to handle different origins, not only stockholm diff --git a/makefu/2configs/Reaktor/random-emoji.sh b/makefu/2configs/Reaktor/random-emoji.sh index 913d615be..386aa68b9 100644 --- a/makefu/2configs/Reaktor/random-emoji.sh +++ b/makefu/2configs/Reaktor/random-emoji.sh @@ -2,4 +2,5 @@ curl http://emojicons.com/random -s | \ grep data-text | \ sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \ - head -n 1 + head -n 1 | \ + xmlstarlet unesc -- cgit v1.2.3 From 9be59a04001698e8e34ae4e2a49e2dea920765b1 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 22 Oct 2015 15:26:54 +0200 Subject: krebs 3 modules: bepasty-server is a krebs module --- makefu/3modules/bepasty-server.nix | 164 ------------------------------------- makefu/3modules/default.nix | 1 - 2 files changed, 165 deletions(-) delete mode 100644 makefu/3modules/bepasty-server.nix (limited to 'makefu') diff --git a/makefu/3modules/bepasty-server.nix b/makefu/3modules/bepasty-server.nix deleted file mode 100644 index ff32eea60..000000000 --- a/makefu/3modules/bepasty-server.nix +++ /dev/null @@ -1,164 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - gunicorn = pkgs.pythonPackages.gunicorn; - bepasty = pkgs.pythonPackages.bepasty-server; - gevent = pkgs.pythonPackages.gevent; - python = pkgs.pythonPackages.python; - cfg = config.krebs.bepasty; - - out = { - options.krebs.bepasty = api; - config = mkIf cfg.enable (mkMerge [(mkIf cfg.serveNginx nginx-imp) imp ]) ; - }; - - api = { - enable = mkEnableOption "Bepasty Servers"; - serveNginx = mkEnableOption "Serve Bepasty Servers with Nginx"; - - servers = mkOption { - type = with types; attrsOf optionSet; - options = singleton { - nginx = mkOption { - # TODO use the correct type - type = with types; attrsOf unspecified; - description = '' - additional nginx configuration. see krebs.nginx for all options - '' ; - }; - - secretKey = mkOption { - type = types.str; - description = '' - server secret for safe session cookies, must be set. - ''; - default = ""; - }; - - # we create a wsgi socket in $workDir/gunicorn-${name}.wsgi - workDir = mkOption { - type = types.str; - description = '' - Path to the working directory (used for sockets and pidfile). - Defaults to the users home directory. Must be accessible to nginx, - permissions will be set to 755 - ''; - default = config.users.extraUsers.bepasty.home; - }; - - dataDir = mkOption { - type = types.str; - description = '' - Defaults to the new users home dir which defaults to - /var/lib/bepasty-server/data - ''; - default = "${config.users.extraUsers.bepasty.home}/data"; - }; - - extraConfig = mkOption { - type = types.str; - default = ""; - # TODO configure permissions in separate - example = '' - PERMISSIONS = { - 'myadminsecret': 'admin,list,create,read,delete', - } - MAX_ALLOWED_FILE_SIZE = 5 * 1000 * 1000 - ''; - }; - - defaultPermissions = mkOption { - # TODO: listOf str - type = types.str; - description = '' - default permissions for all unauthenticated users. - ''; - example = "read,create,delete"; - default = "read"; - }; - - }; - default = {}; - }; - - }; - - imp = { - # Configures systemd services for each configured server - # environment.systemPackages = [ bepasty gunicorn gevent ]; - systemd.services = mapAttrs' (name: server: - nameValuePair ("bepasty-server-${name}") - ({ - description = "Bepasty Server ${name}"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - restartIfChanged = true; - environment = { - BEPASTY_CONFIG = "${server.workDir}/bepasty-${name}.conf"; - PYTHONPATH= "${bepasty}/lib/${python.libPrefix}/site-packages:${gevent}/lib/${python.libPrefix}/site-packages"; - }; - serviceConfig = { - Type = "simple"; - PrivateTmp = true; - - ExecStartPre = assert server.secretKey != ""; pkgs.writeScript "bepasty-server.${name}-init" '' - #!/bin/sh - mkdir -p "${server.dataDir}" "${server.workDir}" - chown bepasty:bepasty "${server.workDir}" "${server.dataDir}" - cat > "${server.workDir}/bepasty-${name}.conf" < Date: Thu, 22 Oct 2015 15:33:05 +0200 Subject: krebs 3 tinc_graphs: mv from makefu 3 tinc_graphs --- makefu/1systems/wry.nix | 2 +- makefu/3modules/default.nix | 1 - makefu/3modules/tinc_graphs.nix | 145 ---------------------------------------- 3 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 makefu/3modules/tinc_graphs.nix (limited to 'makefu') diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 63b1f47f7..6627d87b5 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -40,7 +40,7 @@ in { krebs.retiolum-bootstrap.enable = true; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - makefu.tinc_graphs = { + krebs.tinc_graphs = { enable = true; nginx = { enable = true; diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix index 598365c39..a8a1f69d0 100644 --- a/makefu/3modules/default.nix +++ b/makefu/3modules/default.nix @@ -2,7 +2,6 @@ _: { imports = [ - ./tinc_graphs.nix ]; } diff --git a/makefu/3modules/tinc_graphs.nix b/makefu/3modules/tinc_graphs.nix deleted file mode 100644 index 1f87f00cc..000000000 --- a/makefu/3modules/tinc_graphs.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.makefu.tinc_graphs; - internal_dir = "${cfg.workingDir}/internal"; - external_dir = "${cfg.workingDir}/external"; - - out = { - options.makefu.tinc_graphs = api; - config = mkIf cfg.enable imp ; - }; - - api = { - enable = mkEnableOption "tinc graphs"; - - geodbPath = mkOption { - type = types.str; - description = "Path to geocitydb, defaults to geolite-legacy"; - default = "${pkgs.geolite-legacy}/share/GeoIP/GeoIPCity.dat"; - }; - - nginx = { - enable = mkEnableOption "enable tinc_graphs to be served with nginx"; - - anonymous = { - server-names = mkOption { - type = with types; listOf str; - description = "hostnames which serve anonymous graphs"; - default = [ "graphs.${config.krebs.build.host.name}" ]; - }; - - listen = mkOption { - # use the type of the nginx listen option - type = with types; listOf str; - description = "listen address for anonymous graphs"; - default = [ "80" ]; - }; - - }; - - complete = { - server-names = mkOption { - type = with types; listOf str; - description = "hostname which serves complete graphs"; - default = [ "graphs.${config.krebs.build.host.name}" ]; - }; - - listen = mkOption { - type = with types; listOf str; - description = "listen address for complete graphs"; - default = [ "127.0.0.1:80" ]; - }; - - }; - }; - - workingDir = mkOption { - type = types.str; - description = '' - Path to working dir, will create interal and external/. - Defaults to the new users home dir which defaults to - /var/cache/tinc_graphs''; - default = config.users.extraUsers.tinc_graphs.home; - }; - - timerConfig = mkOption { - type = with types; attrsOf str; - default = { - OnCalendar = "*:0/15"; - }; - }; - }; - - imp = { - environment.systemPackages = [ pkgs.tinc_graphs]; - systemd.timers.tinc_graphs = { - description = "Build Tinc Graphs via via timer"; - wantedBy = [ "timers.target"]; - timerConfig = cfg.timerConfig; - }; - systemd.services.tinc_graphs = { - description = "Build Tinc Graphs"; - environment = { - EXTERNAL_FOLDER = external_dir; - INTERNAL_FOLDER = internal_dir; - GEODB = cfg.geodbPath; - TINC_HOSTPATH=config.krebs.retiolum.hosts; - }; - - restartIfChanged = true; - - serviceConfig = { - Type = "simple"; - - ExecStartPre = pkgs.writeScript "tinc_graphs-init" '' - #!/bin/sh - if ! test -e "${cfg.workingDir}/internal/index.html"; then - cp -fr "$(${pkgs.tinc_graphs}/bin/tincstats-static-dir)/internal/" "${internal_dir}" - fi - ''; - - ExecStart = "${pkgs.tinc_graphs}/bin/all-the-graphs"; - - ExecStartPost = pkgs.writeScript "tinc_graphs-post" '' - #!/bin/sh - # TODO: this may break if workingDir is set to something stupid - # this is needed because homedir is created with 700 - chmod 755 "${cfg.workingDir}" - ''; - PrivateTmp = "yes"; - - User = "root"; # tinc cannot be queried as user, - # seems to be a tinc-pre issue - }; - }; - - users.extraUsers.tinc_graphs = { - uid = 3925439960; #genid tinc_graphs - home = "/var/spool/tinc_graphs"; - createHome = true; - }; - - krebs.nginx.servers = mkIf cfg.nginx.enable { - tinc_graphs_complete = mkMerge [ cfg.nginx.complete { - locations = [ - (nameValuePair "/" '' - autoindex on; - root ${internal_dir}; - '') - ]; - }] ; - tinc_graphs_anonymous = mkMerge [ cfg.nginx.anonymous { - locations = [ - (nameValuePair "/" '' - autoindex on; - root ${external_dir}; - '') - ]; - }]; - }; - }; - -in -out -- cgit v1.2.3