Browse Source

nginx: add node.ffho.net and fix state

node.ffho.net provides an IP based redirect to the site specific gluon next-node address
Karsten Böddeker 7 years ago
parent
commit
6c6ecae890
2 changed files with 26 additions and 2 deletions
  1. 4 2
      nginx/init.sls
  2. 22 0
      nginx/node.ffho.net

+ 4 - 2
nginx/init.sls

@@ -18,7 +18,7 @@ nginx:
 nginx-dhparam:
   cmd.run:
     - name: openssl dhparam -out /etc/ssl/dhparam.pem 4096
-    - creates: /etc/ssl/dhparam
+    - creates: /etc/ssl/dhparam.pem
     - require_in:
       - serivce: nginx
 {% endif %}
@@ -34,7 +34,9 @@ nginx-dhparam:
 
 # Disable default configuration
 /etc/nginx/sites-enabled/default:
-  file.absent
+  file.absent:
+    - watch_in:
+      - service: nginx
 
 
 # Install website configuration files configured for this node

+ 22 - 0
nginx/node.ffho.net

@@ -0,0 +1,22 @@
+geo $url {
+	# default
+	default hochstift.freifunk.net;
+
+	# Legacy (ULA)
+	fdca:ffee:ff12:132::/64 node.legacy.ffho.net;
+
+{%- set sites = salt['pillar.get']('sites') %}
+{% for site_name, site in sites.items()|sort %}
+	# {{ site.name}}
+	{{ site.prefix_v6 }} node.{{ site_name }}.ffho.net;
+	{{ site.prefix_v4 }} node.{{ site_name }}.ffho.net;
+{% endfor %}
+}
+
+server {
+	listen 80;
+	listen [::]:80;
+
+	server_name ~^node.(srv\.)?(in\.)?ffho.net$;
+	return 302 http://$url;
+}