summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/prism.nix12
-rw-r--r--lass/2configs/default.nix1
-rw-r--r--lass/2configs/websites/domsen.nix7
-rw-r--r--lass/5pkgs/default.nix1
-rw-r--r--lass/5pkgs/pop/default.nix10
5 files changed, 31 insertions, 0 deletions
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 270bb6fc2..77d72a5ac 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -223,6 +223,18 @@ in {
mk_sql_pair
];
}
+ {
+ users.users.tv = {
+ uid = genid "tv";
+ home = "/home/tv";
+ group = "users";
+ createHome = true;
+ useDefaultShell = true;
+ openssh.authorizedKeys.keys = [
+ config.krebs.users.tv.pubkey
+ ];
+ };
+ }
];
krebs.build.host = config.krebs.hosts.prism;
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index b8c50f1aa..81abff3ed 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -113,6 +113,7 @@ with config.krebs.lib;
#neat utils
krebspaste
pciutils
+ pop
psmisc
q
rs
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 8a2161e45..07df2e8de 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -78,6 +78,12 @@ in {
])
];
+ krebs.nginx.servers."ubikmedia.de".locations = [
+ (lib.nameValuePair "/piwik" ''
+ try_files $uri $uri/ /index.php?$args;
+ '')
+ ];
+
lass.mysqlBackup.config.all.databases = [
"ubikmedia_de"
"o_ubikmedia_de"
@@ -121,6 +127,7 @@ in {
options = ''
extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
sendmail_path = "${sendmail} -t -i"
+ always_populate_raw_post_data = -1
'';
} ''
cat ${pkgs.php}/etc/php-recommended.ini > $out
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index c48188f9d..0beda7481 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -13,6 +13,7 @@
};
mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
+ pop = pkgs.callPackage ./pop/default.nix {};
q = pkgs.callPackage ./q {};
rs = pkgs.callPackage ./rs/default.nix {};
untilport = pkgs.callPackage ./untilport/default.nix {};
diff --git a/lass/5pkgs/pop/default.nix b/lass/5pkgs/pop/default.nix
new file mode 100644
index 000000000..cec22e3b1
--- /dev/null
+++ b/lass/5pkgs/pop/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+pkgs.writeScriptBin "pop" ''
+ #! ${pkgs.bash}/bin/bash
+
+ file=$1
+
+ head -1 $file
+ sed -i 1d $file
+''