From 05fcb0db28279ae7c08b8c76c887f633f78a2947 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 17:38:01 +0200
Subject: cosmetics for server_config.pp

---
 .../site_openvpn/manifests/server_config.pp        | 66 +++++++++++-----------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 4a130d13..1af08b4a 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -1,52 +1,52 @@
 define site_openvpn::server_config($port, $proto) {
   $openvpn_configname=$name
-  notice("Creating OpenVPN $openvpn_configname:  
+  notice("Creating OpenVPN $openvpn_configname:
     Port: $port, Protocol: $proto")
 
-  file {                                           
-     "/etc/openvpn/${name}":                      
-         ensure  => directory,                    
-         require => Package["openvpn"];           
-  }                                                
+  file {
+    "/etc/openvpn/${name}":
+      ensure  => directory,
+      require => Package['openvpn'];
+  }
 
-  concat {                                                                    
-    "/etc/openvpn/${openvpn_configname}.conf":                                            
-        owner   => root,                                                    
-        group   => root,                                                    
-        mode    => 644,                                                     
-        warn    => true,                                                    
-        require => File["/etc/openvpn"],                                    
-        notify  => Service["openvpn"];                                      
-  }      
+  concat {
+    "/etc/openvpn/$openvpn_configname.conf":
+        owner   => root,
+        group   => root,
+        mode    => 644,
+        warn    => true,
+        require => File['/etc/openvpn'],
+        notify  => Service['openvpn'];
+  }
 
 
 
   openvpn::option {
-    "ca ${openvpn_configname}":
-        key     => "ca",
-        value   => "/etc/openvpn/ca.crt",
-        #require => Exec["initca ${openvpn_configname}"],
-        server  => "${openvpn_configname}";
-    "cert ${openvpn_configname}":
-        key     => "cert",
-        value   => "/etc/openvpn/${openvpn_configname}/server.crt",
-        #require => Exec["generate server cert ${openvpn_configname}"],
-        server  => "${openvpn_configname}";
-    "key ${openvpn_configname}":
+    "ca $openvpn_configname":
+        key     => 'ca',
+        value   => '/etc/openvpn/ca.crt',
+        #require => Exec["initca $openvpn_configname"],
+        server  => $openvpn_configname;
+    "cert $openvpn_configname":
+        key     => 'cert',
+        value   => "/etc/openvpn/$openvpn_configname/server.crt",
+        #require => Exec["generate server cert $openvpn_configname"],
+        server  => $openvpn_configname;
+    "key $openvpn_configname":
         key     => "key",
-        value   => "/etc/openvpn/${openvpn_configname}/server.key",
-        #require => Exec["generate server cert ${openvpn_configname}"],
-        server  => "${openvpn_configname}";
-    "dh ${openvpn_configname}":
+        value   => "/etc/openvpn/$openvpn_configname/server.key",
+        #require => Exec["generate server cert $openvpn_configname"],
+        server  => "$openvpn_configname";
+    "dh $openvpn_configname":
         key     => "dh",
         value   => "/etc/openvpn/dh1024.pem",
-        #require => Exec["generate dh param ${openvpn_configname}"],
-        server  => "${openvpn_configname}";
+        #require => Exec["generate dh param $openvpn_configname"],
+        server  => "$openvpn_configname";
     "dev $openvpn_configname":
         key    => "dev",
         value  => "tun",
         server => "$openvpn_configname";
-    "mode ${openvpn_configname}":            
+    "mode $openvpn_configname":            
        key    => 'mode',      
        value  => 'server',    
        server => $openvpn_configname;       
-- 
cgit v1.2.3


From c067421f34d375c2b39e88a5994353c71ac4c9af Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 22:36:48 +0200
Subject: include openvpn keys

---
 .../site_openvpn/manifests/server_config.pp        | 23 ++++++----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 1af08b4a..5a47954a 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -1,14 +1,9 @@
 define site_openvpn::server_config($port, $proto) {
-  $openvpn_configname=$name
+  $openvpn_configname = $name
+
   notice("Creating OpenVPN $openvpn_configname:
     Port: $port, Protocol: $proto")
 
-  file {
-    "/etc/openvpn/${name}":
-      ensure  => directory,
-      require => Package['openvpn'];
-  }
-
   concat {
     "/etc/openvpn/$openvpn_configname.conf":
         owner   => root,
@@ -19,28 +14,22 @@ define site_openvpn::server_config($port, $proto) {
         notify  => Service['openvpn'];
   }
 
-
-
   openvpn::option {
     "ca $openvpn_configname":
         key     => 'ca',
-        value   => '/etc/openvpn/ca.crt',
-        #require => Exec["initca $openvpn_configname"],
+        value   => '/etc/openvpn/keys/ca.crt',
         server  => $openvpn_configname;
     "cert $openvpn_configname":
         key     => 'cert',
-        value   => "/etc/openvpn/$openvpn_configname/server.crt",
-        #require => Exec["generate server cert $openvpn_configname"],
+        value   => "/etc/openvpn/keys/server.crt",
         server  => $openvpn_configname;
     "key $openvpn_configname":
         key     => "key",
-        value   => "/etc/openvpn/$openvpn_configname/server.key",
-        #require => Exec["generate server cert $openvpn_configname"],
+        value   => "/etc/openvpn/keys/server.key",
         server  => "$openvpn_configname";
     "dh $openvpn_configname":
         key     => "dh",
-        value   => "/etc/openvpn/dh1024.pem",
-        #require => Exec["generate dh param $openvpn_configname"],
+        value   => "/etc/openvpn/keys/dh1024.pem",
         server  => "$openvpn_configname";
     "dev $openvpn_configname":
         key    => "dev",
-- 
cgit v1.2.3


From b59ce36a29a770847368773db543b38c62ea55cf Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 23:05:32 +0200
Subject: adopted most static parameters

---
 .../site_openvpn/manifests/server_config.pp        | 137 ++++++++++-----------
 1 file changed, 67 insertions(+), 70 deletions(-)

(limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 5a47954a..320a4add 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -1,8 +1,8 @@
 define site_openvpn::server_config($port, $proto) {
   $openvpn_configname = $name
 
-  notice("Creating OpenVPN $openvpn_configname:
-    Port: $port, Protocol: $proto")
+  #notice("Creating OpenVPN $openvpn_configname:
+  #  Port: $port, Protocol: $proto")
 
   concat {
     "/etc/openvpn/$openvpn_configname.conf":
@@ -21,81 +21,78 @@ define site_openvpn::server_config($port, $proto) {
         server  => $openvpn_configname;
     "cert $openvpn_configname":
         key     => 'cert',
-        value   => "/etc/openvpn/keys/server.crt",
+        value   => '/etc/openvpn/keys/server.crt',
         server  => $openvpn_configname;
     "key $openvpn_configname":
-        key     => "key",
-        value   => "/etc/openvpn/keys/server.key",
-        server  => "$openvpn_configname";
+        key     => 'key',
+        value   => '/etc/openvpn/keys/server.key',
+        server  => $openvpn_configname;
     "dh $openvpn_configname":
-        key     => "dh",
-        value   => "/etc/openvpn/keys/dh1024.pem",
-        server  => "$openvpn_configname";
+        key     => 'dh',
+        value   => '/etc/openvpn/keys/dh1024.pem',
+        server  => $openvpn_configname;
+
     "dev $openvpn_configname":
-        key    => "dev",
-        value  => "tun",
-        server => "$openvpn_configname";
-    "mode $openvpn_configname":            
-       key    => 'mode',      
-       value  => 'server',    
-       server => $openvpn_configname;       
-    "script-security $openvpn_configname":
-        key    => "script-security",
-        value  => "3",
-        server => "$openvpn_configname";
-    "daemon $openvpn_configname":
-        key    => "daemon",
-        server => "$openvpn_configname";
+        key    => 'dev',
+        value  => 'tun',
+        server => $openvpn_configname;
+    "duplicate-cn $openvpn_configname":
+        key    => 'duplicate-cn',
+        server => $openvpn_configname;
     "keepalive $openvpn_configname":
-        key    => "keepalive",
-        value  => "10 60",
-        server => "$openvpn_configname";
-    "ping-timer-rem $openvpn_configname":
-        key    => "ping-timer-rem",
-        server => "$openvpn_configname";
-    "persist-tun $openvpn_configname":
-        key    => "persist-tun",
-        server => "$openvpn_configname";
-    "persist-key $openvpn_configname":
-        key    => "persist-key",
-        server => "$openvpn_configname";
-    "proto $openvpn_configname":
-        key    => "proto",
-        value  => "$proto",
-        server => "$openvpn_configname";
-    "cipher $openvpn_configname":
-        key    => "cipher",
-        value  => "BF-CBC",
-        server => "$openvpn_configname";
+        key    => 'keepalive',
+        value  => '5 20',
+        server => $openvpn_configname;
     "local $openvpn_configname":
-        key    => "local",
-        value  => $ipaddress,
-        server => "$openvpn_configname";
-    "tls-server $openvpn_configname":
-        key    => "tls-server",
-        server => "$openvpn_configname";
-    #"server $openvpn_configname":
-    #    key    => "server",
-    #    value  => "$server",
-    #    server => "$openvpn_configname";
-    "lport $openvpn_configname":
-        key    => "lport",
-        value  => "$port",
-        server => "$openvpn_configname";
+        key    => 'local',
+        value  => $::ipaddress,
+        server => $openvpn_configname;
+    "mute $openvpn_configname":
+        key    => 'mute',
+        value  => '5',
+        server => $openvpn_configname;
+    "mute-replay-warnings $openvpn_configname":
+        key    => 'mute-replay-warnings',
+        server => $openvpn_configname;
     "management $openvpn_configname":
-        key    => "management",
-        value  => "/var/run/openvpn-$openvpn_configname.sock unix",
-        server => "$openvpn_configname";
-    "comp-lzo $openvpn_configname":
-        key    => "comp-lzo",
-        server => "$openvpn_configname";
+        key    => 'management',
+        value  => '127.0.0.1 1000',
+        server => $openvpn_configname;
+    "proto $openvpn_configname":
+        key    => 'proto',
+        value  => $proto,
+        server => $openvpn_configname;
+    "push $openvpn_configname":
+        key    => 'push',
+        value  => "\"redirect-gateway def1\"",
+        server => $openvpn_configname;
+    "script-security $openvpn_configname":
+        key    => 'script-security',
+        value  => '2',
+        server => $openvpn_configname;
+    "server $openvpn_configname":
+        key    => 'server',
+        value  => "10.42.0.0 255.255.248.0",
+        server => $openvpn_configname;
+    "status $openvpn_configname":
+        key    => 'status',
+        value  => '/var/run/openvpn-status 10',
+        server => $openvpn_configname;
+    "status-version $openvpn_configname":
+        key    => 'status-version',
+        value  => '3',
+        server => $openvpn_configname;
     "topology $openvpn_configname":
-        key    => "topology",
-        value  => "subnet",
-        server => "$openvpn_configname";
-    #"client-to-client $openvpn_configname":
-    #    key    => "client-to-client",
-    #    server => "$openvpn_configname";
+        key    => 'topology',
+        value  => 'subnet',
+        server => $openvpn_configname;
+    "up $openvpn_configname":
+        key    => 'up',
+        value  => '/etc/openvpn/server-up.sh',
+        server => $openvpn_configname;
+    "verb $openvpn_configname":
+        key    => 'verb',
+        value  => '3',
+        server => $openvpn_configname;
   }
-
 }
-- 
cgit v1.2.3


From 1ec1b9b56bc821b81f3797ea158846b41cc03853 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 23:38:57 +0200
Subject: finished site_openvpn::server_config

---
 puppet/modules/site_openvpn/manifests/server_config.pp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 320a4add..784152b7 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -1,6 +1,8 @@
-define site_openvpn::server_config($port, $proto) {
+define site_openvpn::server_config ($port, $proto, $local, $server, $push ) {
+
   $openvpn_configname = $name
 
+
   #notice("Creating OpenVPN $openvpn_configname:
   #  Port: $port, Protocol: $proto")
 
@@ -45,7 +47,7 @@ define site_openvpn::server_config($port, $proto) {
         server => $openvpn_configname;
     "local $openvpn_configname":
         key    => 'local',
-        value  => $::ipaddress,
+        value  => $local,
         server => $openvpn_configname;
     "mute $openvpn_configname":
         key    => 'mute',
@@ -62,9 +64,13 @@ define site_openvpn::server_config($port, $proto) {
         key    => 'proto',
         value  => $proto,
         server => $openvpn_configname;
-    "push $openvpn_configname":
+    "push1 $openvpn_configname":
+        key    => 'push',
+        value  => $push,
+        server => $openvpn_configname;
+    "push2 $openvpn_configname":
         key    => 'push',
-        value  => "\"redirect-gateway def1\"",
+        value  => '"redirect-gateway def1"',
         server => $openvpn_configname;
     "script-security $openvpn_configname":
         key    => 'script-security',
@@ -72,7 +78,7 @@ define site_openvpn::server_config($port, $proto) {
         server => $openvpn_configname;
     "server $openvpn_configname":
         key    => 'server',
-        value  => "10.42.0.0 255.255.248.0",
+        value  => "$server",
         server => $openvpn_configname;
     "status $openvpn_configname":
         key    => 'status',
-- 
cgit v1.2.3


From c9b2c36a5e9327c011af1345bdf54a9c4b84d857 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 23:47:40 +0200
Subject: dh1204.pem -> dh.pen

---
 puppet/modules/site_openvpn/manifests/server_config.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 784152b7..d8a8bc0b 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -31,7 +31,7 @@ define site_openvpn::server_config ($port, $proto, $local, $server, $push ) {
         server  => $openvpn_configname;
     "dh $openvpn_configname":
         key     => 'dh',
-        value   => '/etc/openvpn/keys/dh1024.pem',
+        value   => '/etc/openvpn/keys/dh.pem',
         server  => $openvpn_configname;
 
     "dev $openvpn_configname":
-- 
cgit v1.2.3


From 97e5a3270df10b8fe699a13966ee6b34b864735e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 23:54:37 +0200
Subject: different parameter  for each config

---
 puppet/modules/site_openvpn/manifests/server_config.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')

diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index d8a8bc0b..441a21e3 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -1,4 +1,4 @@
-define site_openvpn::server_config ($port, $proto, $local, $server, $push ) {
+define site_openvpn::server_config ($port, $proto, $local, $server, $push, $management ) {
 
   $openvpn_configname = $name
 
@@ -58,7 +58,7 @@ define site_openvpn::server_config ($port, $proto, $local, $server, $push ) {
         server => $openvpn_configname;
     "management $openvpn_configname":
         key    => 'management',
-        value  => '127.0.0.1 1000',
+        value  => $management,
         server => $openvpn_configname;
     "proto $openvpn_configname":
         key    => 'proto',
-- 
cgit v1.2.3