Skip to content

Override for default port config #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrusty merged 1 commit into from
Aug 25, 2016
Merged

Override for default port config #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Override for default port config
  • Loading branch information
@ballbag22
ballbag22 committed Aug 25, 2016
commit 032b98182636f30ad8a9b0818761f77a824957db
43 changes: 39 additions & 4 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
$mysql_username = $openvpn_as::mysql_username,
$mysql_password = $openvpn_as::mysql_password,
$mysql_host = $openvpn_as::mysql_host,
$vpn_daemon_0_client_network = $openvpn_as::vpn_daemon_0_client_network,
$admin_ui_https_port = $openvpn_as::admin_ui_https_port,
$admin_users = $openvpn_as::admin_users,
$cs_https_port = $openvpn_as::cs_https_port,
$host_name = $openvpn_as::host_name,
$use_custom_port_config = $openvpn_as::use_custom_port_config,
$vpn_client_basic = $openvpn_as::vpn_client_basic,
$vpn_server_routing_private_network_0 = $openvpn_as::vpn_server_routing_private_network_0,
$vpn_client_routing_reroute_dns = $openvpn_as::vpn_client_routing_reroute_dns,
$vpn_client_routing_reroute_gw = $openvpn_as::vpn_client_routing_reroute_gw,
$vpn_daemon_0_client_network = $openvpn_as::vpn_daemon_0_client_network,
$vpn_server_google_auth_enable = $openvpn_as::vpn_server_google_auth_enable,
$host_name = $openvpn_as::host_name,
$admin_users = $openvpn_as::admin_users,
$vpn_server_port_share_service = $openvpn_as::vpn_server_port_share_service,
$vpn_server_routing_private_network_0 = $openvpn_as::vpn_server_routing_private_network_0,
) {

# Prepapre the database paths (MySQL or SQLite):
Expand Down Expand Up @@ -117,6 +121,37 @@
refreshonly => true,
}

# Optionally override the default port config:
if $use_custom_port_config {

# Tell OpenVPN that we'll use a custom port-config:
file { '/usr/local/openvpn_as/openvpn.vpn.server.port_share.service':
content => "${vpn_server_port_share_service}",
} ~>
exec {'openvpn-vpn-server-port-share-service':
command => "/usr/local/openvpn_as/scripts/confdba -mk vpn.server.port_share.service -v '${vpn_server_port_share_service}' && touch /tmp/openvpn.vpn.server.port_share.service",
refreshonly => true,
}

# Tell OpenVPN what the client-facing HTTPS port is:
file { '/usr/local/openvpn_as/openvpn.cs.https.port':
content => "${cs_https_port}",
} ~>
exec {'openvpn-cs-https-port':
command => "/usr/local/openvpn_as/scripts/confdba -mk cs.https.port -v '${cs_https_port}' && touch /tmp/openvpn.cs.https.port",
refreshonly => true,
}

# Tell OpenVPN what the admin-UI HTTPS port is:
file { '/usr/local/openvpn_as/openvpn.admin_ui.https.port':
content => "${admin_ui_https_port}",
} ~>
exec {'openvpn-admin-ui-https-port':
command => "/usr/local/openvpn_as/scripts/confdba -mk admin_ui.https.port -v '${admin_ui_https_port}' && touch /tmp/openvpn.admin_ui.https.port",
refreshonly => true,
}
}

# Mark users as being "admin" users (for loop please):
openvpn_as::config::mark_admin_users { $admin_users:; }

Expand Down
4 changes: 4 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
$mysql_username = 'openvpn',
$mysql_password = 'defaultpassword',
$mysql_host = 'localhost',
$admin_ui_https_port = '943',
$cs_https_port = '8443',
$use_custom_port_config = false,
$vpn_client_basic = 'false',
$vpn_daemon_0_client_network = '172.27.240.0',
$vpn_server_routing_private_network_0 = '10.0.0.0/24',
$vpn_client_routing_reroute_dns = 'false',
$vpn_client_routing_reroute_gw = 'false',
$vpn_server_google_auth_enable = 'false',
$vpn_server_port_share_service = 'custom',
$host_name = $hostname,
$admin_users = [],
) {
Expand Down
10 changes: 7 additions & 3 deletions templates/all-config-vars.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Variables from Puppet:
admin_ui_https_port = <%= @admin_ui_https_port %>
admin_users = <%= @admin_users %>
cs_https_port = <%= @cs_https_port %>
host_name = <%= @host_name %>
use_custom_port_config = <%= @use_custom_port_config %>
vpn_client_basic = <%= @vpn_client_basic %>
vpn_server_routing_private_network_0 = <%= @vpn_server_routing_private_network_0 %>
vpn_client_routing_reroute_dns = <%= @vpn_client_routing_reroute_dns %>
vpn_client_routing_reroute_gw = <%= @vpn_client_routing_reroute_gw %>
vpn_server_google_auth_enable = <%= @vpn_server_google_auth_enable %>
host_name = <%= @host_name %>
admin_users = <%= @admin_users %>
vpn_server_port_share_service = <%= @vpn_server_port_share_service %>
vpn_server_routing_private_network_0 = <%= @vpn_server_routing_private_network_0 %>