Skip to content

Commit 542affd

Browse files
committed
Add support for OpenVPN client specific overrides
1 parent abfe67b commit 542affd

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

bbcode.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,12 @@ def output_bbcode(doc, stream):
229229
output_bbcode_table(stream, ('Option', 'Value'), openvpn_client.items())
230230
stream.write("\n")
231231

232+
if hasattr_r(doc.pfsense, 'openvpn.openvpn_csc'):
233+
stream.write(h2("OpenVPN client specific overrides\n"))
234+
cscs = [obj_to_list(csc, ('server_list', 'common_name', 'description', 'tunnel_network')) for csc in doc.pfsense.openvpn.openvpn_csc]
235+
output_bbcode_table(stream, ('VPN IDs', 'Common Name', 'Description', 'Tunnel Network'), cscs)
236+
stream.write("\n")
237+
232238
if hasattr_r(doc.pfsense, 'syslog'):
233239
stream.write(h2("Syslog configuration\n"))
234240
syslog = obj_to_dict(doc.pfsense.syslog, ('enable', 'logall', 'logfilesize', 'nentries', 'remoteserver', 'remoteserver2', 'remoteserver3', 'sourceip', 'ipproto'))

markdown.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,12 @@ def output_markdown(doc, stream):
200200
output_markdown_table(stream, ('Option', 'Value'), openvpn_client.items())
201201
stream.write("\n")
202202

203+
if hasattr_r(doc.pfsense, 'openvpn.openvpn_csc'):
204+
stream.write("## OpenVPN client specific overrides\n")
205+
cscs = [obj_to_list(csc, ('server_list', 'common_name', 'description', 'tunnel_network')) for csc in doc.pfsense.openvpn.openvpn_csc]
206+
output_markdown_table(stream, ('VPN IDs', 'Common Name', 'Description', 'Tunnel Network'), cscs)
207+
stream.write("\n")
208+
203209
if hasattr_r(doc.pfsense, 'syslog'):
204210
stream.write("## Syslog configuration\n")
205211
syslog = obj_to_dict(doc.pfsense.syslog, ('enable', 'logall', 'logfilesize', 'nentries', 'remoteserver', 'remoteserver2', 'remoteserver3', 'sourceip', 'ipproto'))

pfsense.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,16 @@ class PfSenseOpenVpnServer(PfSenseNode):
313313
_description = PfSenseString
314314
_custom_options = PfSenseString
315315

316+
class PfSenseOpenVpnCsc(PfSenseNode):
317+
_server_list = PfSenseString
318+
_common_name = PfSenseString
319+
_description = PfSenseString
320+
_tunnel_network = PfSenseString
321+
316322
class PfSenseOpenVpn(PfSenseNode):
317323
_openvpn_server = [PfSenseOpenVpnServer]
318324
_openvpn_client = [PfSenseOpenVpnClient]
325+
_openvpn_csc = [PfSenseOpenVpnCsc]
319326

320327
class PfSenseRoute(PfSenseNode):
321328
_network = PfSenseString

0 commit comments

Comments
 (0)