From c2d57624c15dfaff038f9991f04ade46b5ad1d40 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 21 Nov 2012 17:45:44 +0100
Subject: move site_config::eip to site_openvpn (Feature #943)

---
 puppet/modules/site_config/manifests/eip.pp | 57 -----------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 puppet/modules/site_config/manifests/eip.pp

(limited to 'puppet/modules/site_config')

diff --git a/puppet/modules/site_config/manifests/eip.pp b/puppet/modules/site_config/manifests/eip.pp
deleted file mode 100644
index 4280fb67..00000000
--- a/puppet/modules/site_config/manifests/eip.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-class site_config::eip {
-
-  # parse hiera config
-  $ip_address                 = hiera('ip_address')
-  $interface                  = hiera('interface')
-  #$gateway_address           = hiera('gateway_address')
-  $openvpn_config             = hiera('openvpn')
-  $openvpn_gateway_address    = $openvpn_config['gateway_address']
-  $openvpn_tcp_network_prefix = '10.1.0'
-  $openvpn_tcp_netmask        = '255.255.248.0'
-  $openvpn_tcp_cidr           = '21'
-  $openvpn_udp_network_prefix = '10.2.0'
-  $openvpn_udp_netmask        = '255.255.248.0'
-  $openvpn_udp_cidr           = '21'
-
-  include site_openvpn
-  
-  # deploy ca + server keys
-  include site_openvpn::keys
-
-  # create 2 openvpn config files, one for tcp, one for udp
-  site_openvpn::server_config { 'tcp_config':
-    port        => '1194',
-    proto       => 'tcp',
-    local       => $openvpn_gateway_address,
-    server      => "$openvpn_tcp_network_prefix.0 $openvpn_tcp_netmask",
-    push        => "\"dhcp-option DNS $openvpn_tcp_network_prefix.1\"",
-    management  => '127.0.0.1 1000'
-  }
-  site_openvpn::server_config { 'udp_config':
-    port        => '1194',
-    proto       => 'udp',
-    server      => "$openvpn_udp_network_prefix.0 $openvpn_udp_netmask",
-    push        => "\"dhcp-option DNS $openvpn_udp_network_prefix.1\"",
-    local       => $openvpn_gateway_address,
-    management  => '127.0.0.1 1001'
-  }
-
-  # add second IP on given interface
-  file { '/usr/local/bin/leap_add_second_ip.sh':
-    content => "#!/bin/sh
-ip addr show dev $interface | grep -q ${openvpn_gateway_address}/24 || ip addr add ${openvpn_gateway_address}/24 dev $interface",
-    mode    => '0755',
-  }
-
-  exec { '/usr/local/bin/leap_add_second_ip.sh':
-    subscribe   => File['/usr/local/bin/leap_add_second_ip.sh'],
-  }
-
-  cron { 'leap_add_second_ip.sh':
-    command => "/usr/local/bin/leap_add_second_ip.sh",
-    user    => 'root',
-    special => 'reboot',
-  }
-
-  include site_shorewall::eip
-}
-- 
cgit v1.2.3