Browse Source

burp: Get server settings from pillar.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 3 years ago
parent
commit
b156628fd2
2 changed files with 3 additions and 3 deletions
  1. 2 2
      burp/burp.conf.tmpl
  2. 1 1
      burp/client.sls

+ 2 - 2
burp/burp.conf.tmpl

@@ -6,7 +6,7 @@ mode = client
 port = 4971
 status_port = 4972
 
-server = 10.132.251.71
+server = {{ burp_server_name }}
 
 password = {{ burp_password }}
 cname = {{ grains.id }}
@@ -15,7 +15,7 @@ cname = {{ grains.id }}
 ssl_cert_ca = /etc/ssl/certs/ffho-cacert.pem
 ssl_cert = /etc/ssl/certs/{{ grains.id }}.cert.pem
 ssl_key = /etc/ssl/private/{{ grains.id }}.key.pem
-ssl_dhfile = /etc/ssl/dhfile.pem
+ssl_dhfile = /etc/ssl/dhparam.pem
 
 ssl_peer_cn = {{ burp_server_name }}
 

+ 1 - 1
burp/client.sls

@@ -17,5 +17,5 @@ burp-client:
   file.managed:
     - source: salt://burp/burp.conf.tmpl
     - template: jinja
-      burp_server_name: "hamster.in.ffho.net"
+      burp_server_name: {{ salt['pillar.get']('burp:server:fqdn') }}
       burp_password: {{ salt['pillar.get']('nodes:' ~ grains.id ~ ':burp:password') }}