summaryrefslogtreecommitdiffstats
path: root/tv/2configs/nginx/public_html.nix
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2016-12-23 18:38:28 +0100
committerlassulus <lass@lassul.us>2016-12-23 18:38:28 +0100
commitb8975f6ed4cde4af3e72f0f83624221ee6351885 (patch)
tree53f0207a1b3009999b42b19c6c919b7c95b0a02b /tv/2configs/nginx/public_html.nix
parent1d2c9377bc7b21ff7d27c6c04873a46df083d655 (diff)
parentc208b3fa19fc161f44c52433a4e266daade4ce53 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs/nginx/public_html.nix')
-rw-r--r--tv/2configs/nginx/public_html.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index 4c74d2250..9744da1e8 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -3,20 +3,18 @@
with import <stockholm/lib>;
{
- krebs.nginx = {
+ services.nginx = {
enable = true;
- servers.default = {
- server-names = [
+ virtualHosts.default = {
+ serverAliases = [
"localhost"
"${config.krebs.build.host.name}"
"${config.krebs.build.host.name}.r"
"${config.krebs.build.host.name}.retiolum"
];
- locations = [
- (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
- alias /home/$1/public_html$2;
- '')
- ];
+ locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
+ alias /home/$1/public_html$2;
+ '';
};
};
tv.iptables.input-internet-accept-tcp = singleton "http";