aboutsummaryrefslogtreecommitdiff
path: root/virtual/eldiron.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-10 23:29:52 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-10 23:29:52 +0100
commit54307da49e9975ca3cce0d45fd12ade016cf90d9 (patch)
tree5b9011f809e631f0a43bb21a1aa893c6279df8d6 /virtual/eldiron.nix
parent091ae73429b8853e6ab971bffaccd84bdd59f40d (diff)
downloadNix-54307da49e9975ca3cce0d45fd12ade016cf90d9.tar.gz
Nix-54307da49e9975ca3cce0d45fd12ade016cf90d9.tar.zst
Nix-54307da49e9975ca3cce0d45fd12ade016cf90d9.zip
Move some more configuration for websites
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r--virtual/eldiron.nix9
1 files changed, 2 insertions, 7 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index ad94fb2..fa5cb51 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -28,7 +28,7 @@
28 ./modules/gitolite.nix 28 ./modules/gitolite.nix
29 ./modules/gitweb.nix 29 ./modules/gitweb.nix
30 ./modules/databases.nix 30 ./modules/databases.nix
31 ./modules/websites.nix 31 ./modules/websites
32 ]; 32 ];
33 services.myGitolite.enable = true; 33 services.myGitolite.enable = true;
34 services.myGitweb.enable = true; 34 services.myGitweb.enable = true;
@@ -39,13 +39,8 @@
39 networking = { 39 networking = {
40 firewall = { 40 firewall = {
41 enable = true; 41 enable = true;
42 allowedTCPPorts = [ 22 80 443 9418 ]; 42 allowedTCPPorts = [ 22 9418 ];
43 }; 43 };
44 interfaces."eth0".ipv4.addresses = [
45 # 176.9.151.89 declared in nixops -> infra / tools
46 { address = myconfig.ips.production; prefixLength = 32; }
47 { address = myconfig.ips.integration; prefixLength = 32; }
48 ];
49 }; 44 };
50 45
51 deployment = { 46 deployment = {