remove ospinio

auto-flake-update
Yorick van Pelt 2016-12-08 15:33:35 +01:00
parent 8b1ad3db8c
commit 1d9b3abe2c
4 changed files with 23 additions and 133 deletions

View File

@ -1,9 +1,5 @@
with (import <secrets>).hostnames; {
network.description = "yorick's stuff";
ospinio = {
imports = [./ospinio/configuration.nix];
deployment.targetHost = ospinio;
};
frumar = {
imports = [./frumar/configuration.nix];
deployment.targetHost = frumar;

View File

@ -1,75 +0,0 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
let yoricc = import ../packages/yori-cc.nix;
in
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
../roles/common.nix
];
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
# Define on which hard drive you want to install Grub.
# boot.loader.grub.device = "/dev/sda";
networking.hostName = (import <secrets>).hostnames.ospinio;
# Enable the OpenSSH daemon.
services.openssh.enable = true;
# The NixOS release to be compatible with for stateful data such as databases.
system.stateVersion = "16.03";
services.nginx = {
enable = true;
httpConfig = ''
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log logs/access.log main;
sendfile on;
#tcp_nopush on;
#keepalive_timeout 0;
keepalive_timeout 65;
gzip on;
server {
listen 80;
server_name "";
location / {
root ${pkgs.nginx}/usr/share/nginx/html;
index index.html index.htm;
}
location = /50x.html {
root ${pkgs.nginx}/usr/share/nginx/html;
}
}
server {
listen 80;
server_name yori.cc;
server_tokens off;
location / {
root ${yoricc}/web;
}
}
'';
};
networking.firewall.allowedTCPPorts = [22 80];
}

View File

@ -1,29 +0,0 @@
{ config, lib, pkgs, ... }:
let
ipconf = (import <secrets>).ipconf.${config.networking.hostName};
in
{
imports = [ ../modules/nixos-in-place.nix ];
"nixos-in-place" = {
enable = true;
rootfs = "/dev/mapper/CAC_VG-CAC_LV";
swapfs = "/dev/disk/by-uuid/be7625e5-2e2c-41f2-8d5f-331f90980b9e";
};
boot = {
loader.grub.device = "/dev/sda";
initrd.availableKernelModules = [ "ata_piix" "vmw_pvscsi" "floppy" ];
};
networking = {
interfaces.enp2s0 = {
useDHCP = false;
inherit (ipconf) ip4 ip6;
};
inherit (ipconf) nameservers;
defaultGateway = ipconf.gateway4;
#defaultGateway6 = ipconf.gateway6;
};
nix.maxJobs = 1;
}

View File

@ -1,28 +1,26 @@
-----BEGIN PGP MESSAGE-----
Version: GnuPG v2
hQEMAwEAjpZflP7cAQf/WInyFwbeVLTT2OzoiabhI8ZQIteC8iz4BgU3BoMbhmzU
i8Rivtwy9p6sYepzNXQ7DOxkCc+28IXD5JF7gFlPv9Km0r//JU3YaYBMxHyH+iN1
iyf+PeiBgiLmvF7uPTILxFlPhUhi2s26JUmCDtZZFBEmuuPz1MFIu1kw/ryV74kI
d+4TUbNG2xhu2Rogu6xzXkun0Uy2XR6Qa2CImpUFJ5dwJfWye3UtAxMknQEbCXO5
ZxNwQU9jXEMgjGK57lTYSX6uBbLK8BweeV+spPI5wKA5BA0RCuOWKTQyREy7e38b
a2ZL1jjGOiN8PI9x89MQcE7IQVDb+L9/Vxp8dFjbTdLpAfE2XNzPx+m5h3gNr0I+
M9b/oTHfUFH3NN+NKQCSZPRbDfri3CgrhBLuaIvVsswnfqYJRiBPkp73JP3NpM14
uFaENf5ii1zxfmH4du7vmzP7Utcx0PebL2P0NQc1dIMFlG6Aht8m7ACPVUziXfxd
er9PFjPHKY6V7hR1wsD2bXCzFZK8StJCNnU6hge91KOx4jV/9+Y08kZwJDvFPooo
g3HnYT8KoVzoBkW4M5AiPSUeBy5w60WwbN2wLSHLT1aNjODASvqv41dFhO3up3/v
gMFmeIg3DjNa6qvFjbJEjefmfSzgkwgS9CEVfNAg3BBrXIM5Cw9+LvWin2gRlR9n
taiTy7MWzsLSkRALoVZ8WOvUgEZwW+WPHIDORTBrqBpR5g+qP94t9Myu/mfG6lqe
TC1I2jQlP8zu2YDc3yvDaK9AeCJIyxu8NwYZAotZwPwzapRiQmMIM6Tfld+YSC/+
/K68Uno2YH/X43y9pKx0w18azbYE+UzpX29NZnHChduxFmg4WueIaFhQJkJCeu6j
2bBjvVXalI56flFhx+dJk8VjXTwmVjf3tGY0WkpQ7wPvFNynZ2srV4wdhuN8sXDl
rRGwiafOp6zIiaHtoHsBdP6XHqMputKYOQobuGV+lfK324XUAFYMKS2RrYry1Mfo
YdLqbz9WovTn2G74VaYE72jAZNm53AZeP0ggufgAIAe6kcqion76Cq5bU6PC/j9I
7dbdzybOa2pNatSEBrDPVOdbhWrb0ifFMQp/CBAGDLaiTeyjPnjVSx9tqmGnQ+vn
bWdS/lNxvxWturdoR5zEx7nyEMYhOzjylNke8sTJQOxNS8gh6CQ+FjOm11XvkEnL
RlBtIIQEhRxdymUfKAvmc9D4A8zi602bJgEn7uqr4xjnf+F41WA0E8U53WAYK0cM
Z+bOuiKYzWkLlKIP1Qa48jhmdVV/9MgLWZf1uf3MgsTqKErjx/fKtFLdOhcL6wsI
tloEz+5ID1xzo5CtS1vhuKvvG25EXkyerlfC4wGkR4xFiiks9Ei2DBG/MLMjJcrk
1FJroBTZqPB4xAwpM7WC84CcNNW+qm8=
=8zHI
hQEMAwEAjpZflP7cAQgAuUQH4GHZsM4Qh+zUBK9nMQ+Cl+jetPLYv8QFzsTWFOge
gAPdZs5NRi+ncvaoA/jnZtNfo8awtZ7UPT2wh3j102cGB5rB3flsVD61wQuiu1rG
v3wh4875vjHpRZy6JaJuRTHvno0usoebg1dwiVaiFI10oXRzrEtiM+M6CiDeUFGM
aUl356YxRbLgkYHw/R6C5WdssOt4jOuQkXV1Jv+b3Td5HJYLL+Ae9Dwg7MVfGzas
aSboFHatQ2HqS/pTyNLz3zJzoxPWhQPaIFV5V3BpmQvC6qnBp824T2tHz4G9vqND
G3UI6sI1Um/KuPg9pgDdO30O8+1n1E9LxLjwm4vVKNLpASVp/SY8UrJmx5bGFr/0
qkCuVVPcJm0rr9VAHSGrDwXanE4HFG5W+LFb1EL/gEa2rlcYvv7YsOxMTXjYKBRC
cY9w8NNTsxgGTm1Mn76cCS5sUSLeoPYlYTbgsmGrMO7EEYdOQhFsK1IHv8ANoDA+
OnciOCLOKCb85cCO5w8zM63Fdz0sK8uDs0W/XUWBmk0vyeqv1dFFExzZ06Y2l4yh
pKwuIb4hEniv0i+T5ElN93PM2nMaxfPj8M4T8DEsIA5kRiO96ITXCJLLEsCxkF2s
fJZ4U4bF7jxj3rErLJthPsA2Xw62vq0I60g7+BcZt/g8Sj0TGmYRR+MvvOeXUuIT
JtqeIFx2c6NbOT5rKqu7HbI5AlRZ1pmjDgfYF0CF6U/0fq5PHbh7ntyRU79Ca8Hn
tr9SU/g3Uq/WMpPzFbZ21+kCXrwBkti4urUkOfUzUO04fUS7SUj/FzgyyBCh3nHG
cRSrcy49f9mvSvV1hxpu0ukWJID8UiDyoM0RqQ8Qab7BrKsCgodUnKFHWIKuYxgX
defCwQzuEq/A4kmB1pPF6F56cfa4wyKVjXgreQzgQxqG4LtjsZGzA84Q/R+2xVxj
LBJzuKzBmuDgwCKw6/9q872Vz8+r1MdeXdpkxEUS8knMbmhHMKw0Pb7vwI5t3JQy
5DziTWV0M6rAuBjXJ0h876XARDwVUue0mNf9FovMvnak4af/cXPWuBCZ+ZDJzL7Y
d5FXz5/Tb5Lqw+qoJtjullDR3Vtntmm4MOUTytVBFWz5NXw5NlVm3KmpLUHK4KbY
grHphnz87JZJ7jA2o1WXPsj8FwzmNpIYqTbB/mp/Gtr4vfarD2Org1uyc16n9e0e
AIePoJIR5Rsrkb51WSuJ4kV+5A1M+YH+k400qYmTcPKeenZvn8RJvjeD7R4ErpK7
vc3RsAFEdBvsUVidrKM0DmWmMSxeNYU72Bubr8TfHcDOe3ZSotokh1v3JE2gdICQ
LO0PkA3txVH+gjOa02Y9ZiDm0eqWQiwGx5g6TeiKD4jx9zpNfCt7
=u9KE
-----END PGP MESSAGE-----