lib/server.haml in vpnmaker-0.0.0 vs lib/server.haml in vpnmaker-1.0.0

@@ -18,21 +18,47 @@
 - bridgednets.each do |net|
   push route #{net[:net]} #{net[:mask]}
 \
 user #{user}
 group #{group}
-dh #{root}/keys/dh.pem
-ca #{root}/keys/ca.crt
-cert #{root}/keys/server.crt
-key #{root}/keys/server.key
-crl-verify #{root}/keys/crl.pem
+- if type == :default
+
+  <dh>
+  #{dh}
+  </dh>
+
+  <ca>
+  #{ca}
+  </ca>
+
+  <cert>
+  #{cert}
+  </cert>
+
+  <key>
+  #{key}
+  </key>
+
+  <crl-verify>
+  #{crl}
+  </crl-verify>
+
+  <ta>
+  #{ta}
+  </ta>
+
+- else
+  dh #{root}/keys/dh.pem
+  ca #{root}/keys/ca.crt
+  cert #{root}/keys/server.crt
+  key #{root}/keys/server.key
+  crl-verify #{root}/keys/crl.pem
   
 keepalive 10 120
 
 log #{log}
 
 persist-tun
 persist-key
 
 tls-auth #{root}/keys/ta.key 0
-client-config-dir #{root}/ccd
 :plain