Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2016-10-22 14:24:20 +02:00
commit 0c464bb3cf
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefu/1systems/gum.nix
View File

@ -11,9 +11,9 @@ in {
../2configs/fs/simple-swap.nix ../2configs/fs/simple-swap.nix
../2configs/fs/single-partition-ext4.nix ../2configs/fs/single-partition-ext4.nix
../2configs/smart-monitor.nix ../2configs/smart-monitor.nix
# ../2configs/iodined.nix ../2configs/iodined.nix
../2configs/git/cgit-retiolum.nix ../2configs/git/cgit-retiolum.nix
../2configs/mattermost-docker.nix # ../2configs/mattermost-docker.nix
../2configs/nginx/euer.test.nix ../2configs/nginx/euer.test.nix
../2configs/nginx/update.connector.one.nix ../2configs/nginx/update.connector.one.nix
../2configs/deployment/mycube.connector.one.nix ../2configs/deployment/mycube.connector.one.nix

4
makefu/1systems/vbob.nix
View File

@ -40,7 +40,7 @@
fortclientsslvpn ppp xclip fortclientsslvpn ppp xclip
get get
logstash logstash
docker # docker
devpi-web devpi-web
devpi-client devpi-client
]; ];
@ -53,8 +53,6 @@
8010 8010
]; ];
virtualisation.docker.enable = false;
fileSystems."/media/share" = { fileSystems."/media/share" = {
fsType = "vboxsf"; fsType = "vboxsf";
device = "share"; device = "share";

9
makefu/1systems/x.nix
View File

@ -13,6 +13,7 @@
# Krebs # Krebs
#../2configs/disable_v6.nix #../2configs/disable_v6.nix
../2configs/rad1o.nix
# applications # applications
@ -38,19 +39,21 @@
../2configs/fs/sda-crypto-root-home.nix ../2configs/fs/sda-crypto-root-home.nix
# ../2configs/mediawiki.nix # ../2configs/mediawiki.nix
#../2configs/wordpress.nix #../2configs/wordpress.nix
../2configs/nginx/public_html.nix #../2configs/nginx/public_html.nix
../2configs/nginx/icecult.nix
../2configs/tinc/retiolum.nix ../2configs/tinc/retiolum.nix
# temporary modules # temporary modules
../2configs/temp/share-samba.nix ../2configs/temp/share-samba.nix
../2configs/laptop-backup.nix ../2configs/laptop-backup.nix
# ../2configs/temp/elkstack.nix ../2configs/temp/elkstack.nix
# ../2configs/temp/sabnzbd.nix # ../2configs/temp/sabnzbd.nix
../2configs/tinc/siem.nix ../2configs/tinc/siem.nix
#../2configs/torrent.nix #../2configs/torrent.nix
]; ];
makefu.full-populate = true; makefu.full-populate = true;
nixpkgs.config.allowUnfree = true;
krebs.nginx = { krebs.nginx = {
default404 = false; default404 = false;
servers.default.listen = [ "80 default_server" ]; servers.default.listen = [ "80 default_server" ];
@ -59,7 +62,7 @@
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ]; environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
virtualisation.docker.enable = true; # virtualisation.docker.enable = true;
# configure pulseAudio to provide a HDMI sink as well # configure pulseAudio to provide a HDMI sink as well
networking.firewall.enable = true; networking.firewall.enable = true;

3
makefu/2configs/default.nix
View File

@ -23,7 +23,8 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu; user = config.krebs.users.makefu;
source = let source = let
inherit (config.krebs.build) host user; inherit (config.krebs.build) host user;
ref = "b8ede35"; # stable @ 2016-10-19 # ref = "b8ede35"; # stable @ 2016-10-19
ref = "31c72ce"; # stable @ 2016-10-21 (dirtycow)
in { in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{ {