From 5df60aad95fcff99ef5837577b0a70435e99d1aa Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Thu, 10 Jan 2013 20:34:48 -0700
Subject: documentation, refactoring to make the dependency chain easier to
 follow

---
 templates/client.erb | 20 +++++++++++---------
 templates/server.erb | 12 ++++++++----
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'templates')

diff --git a/templates/client.erb b/templates/client.erb
index c343cd7..021ed61 100644
--- a/templates/client.erb
+++ b/templates/client.erb
@@ -5,20 +5,22 @@ key keys/<%= scope.lookupvar('name') %>.key
 dev <%= scope.lookupvar('dev') %>
 proto <%= scope.lookupvar('proto') %>
 remote <%= scope.lookupvar('remote_host') %> <%= scope.lookupvar('port') %>
+<% if scope.lookupvar('compression') != '' -%>
 <%= scope.lookupvar('compression') %>
+<% end -%>
 resolv-retry <%= scope.lookupvar('resolv_retry') %>
-<% if scope.lookupvar('nobind') %>
+<% if scope.lookupvar('nobind') -%>
 nobind
-<% end %>
-<% if scope.lookupvar('persist_key') %>
+<% end -%>
+<% if scope.lookupvar('persist_key') -%>
 persist-key
-<% end %>
-<% if scope.lookupvar('persist_tun') %>
+<% end -%>
+<% if scope.lookupvar('persist_tun') -%>
 persist-tun
-<% end %>
-<% if scope.lookupvar('mute_replay_warnings') %>
+<% end -%>
+<% if scope.lookupvar('mute_replay_warnings') -%>
 mute-replay-warnings
-<% end %>
-ns-cert-type <%= scope.lookupvar('ns_cert_type') %>
+<% end -%>
+ns-cert-type server
 verb <%= scope.lookupvar('verb') %>
 mute <%= scope.lookupvar('mute') %>
diff --git a/templates/server.erb b/templates/server.erb
index 540a786..b010cbd 100644
--- a/templates/server.erb
+++ b/templates/server.erb
@@ -6,17 +6,21 @@ key /etc/openvpn/<%= scope.lookupvar('name') %>/keys/server.key
 dh /etc/openvpn/<%= scope.lookupvar('name') %>/keys/dh1024.pem
 proto <%= scope.lookupvar('proto') %>
 port <%= scope.lookupvar('port') %>
+<% if scope.lookupvar('compression') != '' -%>
 <%= scope.lookupvar('compression') %>
+<% end -%>
 group <%= scope.lookupvar('group') %>
 user <%= scope.lookupvar('user') %>
 log-append <%= scope.lookupvar('logfile') %>
 status <%= scope.lookupvar('status_log') %>
 dev <%= scope.lookupvar('dev') %>
+<% if scope.lookupvar('local') != '' -%>
 local <%= scope.lookupvar('local') %>
-<% if scope.lookupvar('ipp') %>
+<% end -%>
+<% if scope.lookupvar('ipp') -%>
 ifconfig-pool-persist <%= scope.lookupvar('name') %>/vpn-ipp.txt
-<% end %>
+<% end -%>
 server <%= scope.lookupvar('server') %>
-<% scope.lookupvar('push').each do |item| %>
+<% scope.lookupvar('push').each do |item| -%>
 push <%= item %>
-<% end %>
+<% end -%>
-- 
cgit v1.2.3