diff options
| -rw-r--r-- | lass/1systems/mors.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/baseX.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/chromium-patched.nix | 48 | ||||
| -rw-r--r-- | lass/2configs/downloading.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/websites/util.nix | 8 |
6 files changed, 8 insertions, 54 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 742d42bf8..99705cbf1 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -17,7 +17,6 @@ with import <stockholm/lib>; ../2configs/elster.nix ../2configs/steam.nix ../2configs/wine.nix - ../2configs/chromium-patched.nix ../2configs/git.nix ../2configs/skype.nix ../2configs/teamviewer.nix diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 4b05e3296..fbab23500 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -31,6 +31,7 @@ in { environment.systemPackages = with pkgs; [ acpi + dic dmenu gitAndTools.qgit lm_sensors diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 7422abdc8..e7fbccb77 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -36,7 +36,7 @@ in { }; builder_pre = '' # prepare grab_repo step for stockholm - grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental', alwaysUseLatest=True) + grab_repo = steps.Git(repourl=stockholm_repo, mode='full') # TODO: get nixpkgs/stockholm paths from krebs env_lass = { diff --git a/lass/2configs/chromium-patched.nix b/lass/2configs/chromium-patched.nix deleted file mode 100644 index d9d7760dd..000000000 --- a/lass/2configs/chromium-patched.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, pkgs, ... }: - -#settings to test: -# - #"ForceEphemeralProfiles": true, -let - masterPolicy = pkgs.writeText "master.json" '' - { - "PasswordManagerEnabled": false, - "DefaultGeolocationSetting": 2, - "RestoreOnStartup": 1, - "AutoFillEnabled": false, - "BackgroundModeEnabled": false, - "DefaultBrowserSettingEnabled": false, - "SafeBrowsingEnabled": false, - "ExtensionInstallForcelist": [ - "cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx", - "ihlenndgcmojhcghmfjfneahoeklbjjh;https://clients2.google.com/service/update2/crx" - ] - } - ''; - - master_preferences = pkgs.writeText "master_preferences" '' - { - "browser": { - "custom_chrome_frame": true - }, - - "extensions": { - "theme": { - "id": "", - "use_system": true - } - } - } - ''; -in { - environment.etc."chromium/policies/managed/master.json".source = pkgs.lib.mkForce masterPolicy; - - #environment.systemPackages = [ - # #pkgs.chromium - # (pkgs.lib.overrideDerivation pkgs.chromium (attrs: { - # buildCommand = attrs.buildCommand + '' - # touch $out/TEST123 - # ''; - # })) - #]; -} diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix index 79a609e2b..ca0aded78 100644 --- a/lass/2configs/downloading.nix +++ b/lass/2configs/downloading.nix @@ -14,8 +14,8 @@ with import <stockholm/lib>; ]; openssh.authorizedKeys.keys = with config.krebs.users; [ lass.pubkey - lass-uriel.pubkey lass-shodan.pubkey + lass-helios.pubkey makefu.pubkey ]; }; diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix index 3356fe9a8..0b2a6faac 100644 --- a/lass/2configs/websites/util.nix +++ b/lass/2configs/websites/util.nix @@ -88,6 +88,7 @@ rec { # set max upload size client_max_body_size 10G; fastcgi_buffers 64 4K; + fastcgi_read_timeout 120; # Disable gzip to avoid the removal of the ETag header gzip off; @@ -164,10 +165,11 @@ rec { user = nginx group = nginx pm = dynamic - pm.max_children = 5 + pm.max_children = 32 + pm.max_requests = 500 pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 3 + pm.min_spare_servers = 2 + pm.max_spare_servers = 5 listen.owner = nginx listen.group = nginx php_admin_value[error_log] = 'stderr' |