Move nixos.org homepage
Eelco Dolstra committed
Jan 25, 2019 at 00:07 UTC
4e606174e891cc0e0e21c29ec9705b49f02eff43
1 file changed
+16
-7
nixos-org/webserver.nix
+16
-7
@@ -12,7 +12,7 @@ let
12
nixosVHostConfig =
13
{ hostName = "nixos.org";
14
serverAliases = [ "test.nixos.org" "test2.nixos.org" "ipv6.nixos.org" "localhost" ];
15
- documentRoot = "/home/eelco/nixos-homepage";
15
+ documentRoot = "/home/homepage/nixos-homepage";
16
enableUserDir = true;
17
servedDirs =
18
[ { urlPath = "/irc";
@@ -94,7 +94,7 @@ in
94
enable = true;
95
#multiProcessingModule = "worker";
96
logPerVirtualHost = true;
97
- adminAddr = "eelco.dolstra@logicblox.com";
97
+ adminAddr = "edolstra@gmail.com";
98
hostName = "localhost";
99
100
extraConfig =
@@ -193,7 +193,7 @@ in
193
];
194
};
195
196
- users.extraUsers.eelco =
196
+ users.users.eelco =
197
{ createHome = true;
198
description = "Eelco Dolstra";
199
extraGroups = [ "wheel" ];
@@ -205,7 +205,7 @@ in
205
uid = 1000;
206
};
207
208
- users.extraUsers.rbvermaa =
208
+ users.users.rbvermaa =
209
{ createHome = true;
210
description = "Rob Vermaas";
211
extraGroups = [ "wheel" ];
@@ -217,7 +217,7 @@ in
217
uid = 1001;
218
};
219
220
- users.extraUsers.irclogs =
220
+ users.users.irclogs =
221
{ createHome = true;
222
description = "#nixos IRC Logging";
223
group = "users";
@@ -229,18 +229,27 @@ in
229
uid = 1002;
230
};
231
232
+ users.users.homepage =
233
+ { createHome = true;
234
+ description = "nixos.org website";
235
+ group = "users";
236
+ home = "/home/homepage";
237
+ useDefaultShell = true;
238
+ openssh.authorizedKeys.keys = [ sshKeys.eelco sshKeys.rob ];
239
+ };
240
+
241
systemd.services.update-homepage =
242
{ description = "Update nixos.org Homepage";
243
# FIXME: gnutar/xz deps work around a Nix bug.
244
path = [ config.nix.package pkgs.git pkgs.bash pkgs.gnutar pkgs.xz ];
236
- serviceConfig.User = "eelco";
245
+ serviceConfig.User = "homepage";
246
environment.NIX_PATH = concatStringsSep ":" config.nix.nixPath;
247
environment.NIX_REMOTE = "daemon";
248
environment.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
249
serviceConfig.Type = "oneshot";
250
script =
251
''
243
- cd /home/eelco/nixos-homepage
252
+ cd ~/nixos-homepage
253
git pull
254
exec nix-shell --command 'make UPDATE=1'
255
'';