onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-15 17:39:01 +02:00
Code Issues Releases Wiki Activity

added installer commands for ProCurve, using the same code for Cisco and ProCurve

Browse Source
This commit is contained in:
Vadim Kurland
2010-05-12 21:45:32 +00:00
parent 4a246aa75c
commit 1378ab08b3
8 changed files with 95 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2898
#define BUILD_NUM 2899
doc/ChangeLog
+6
View File
@@ -1,5 +1,11 @@
2010-05-12 vadim <vadim@vk.crocodile.org>
* configlets/procurve/installer_commands_pre_config: commands
for the installer for ProCurve
* instDialog.cpp (instDialog::isCiscoFamily): Using the same
built-in installer for Cisco and for ProCurve.
* procurveaclAdvancedDialog.cpp (procurveaclAdvancedDialog::procurveaclAdvancedDialog):
fixed #1449 options for ACL remarks and comments for ProCurve
src/gui/instDialog.cpp
+4 -1
View File
@@ -553,7 +553,10 @@ bool instDialog::checkSSHPathConfiguration(Firewall *fw)
bool instDialog::isCiscoFamily()
{
string platform = cnf.fwobj->getStr("platform");
return (platform=="pix" || platform=="fwsm" || platform=="iosacl");
return (platform=="pix" ||
platform=="fwsm" ||
platform=="iosacl" ||
platform=="procurve_acl");
}
/*
src/gui/procurveacladvanceddialog_q.ui
+2 -2
View File
@@ -23,7 +23,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="compiler_tab">
<attribute name="title">
@@ -607,7 +607,7 @@ First, create temporary access list to permit connections from the management su
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Instead of running generated configuration on the router line by line, installer can use scp to copy the file and then &quot;copy file running-config&quot; command to activate it. Ssh v2 and scp servers should be configured on the router for this to work. This method works for IOS v12.4 or later and is much faster than running configuration line by line.</string>
<string>Instead of running generated configuration on the router line by line, installer can use scp to copy the file and then &quot;copy file running-config&quot; command to activate it. Ssh v2 and scp servers should be configured on the router for this to work. This method is much faster than running configuration line by line.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
src/res/configlets/procurve/installer_commands_post_config
+22
View File
@@ -0,0 +1,22 @@
## -*- mode: shell-script; -*-
##
## Lines that start with "##" will be removed before this code is
## added to the generated script.
##
## These are commands built-in policy installer runs on the firewall
##
## Variables:
##
## {{$rbtimeout}} -- rollback timeout
## {{$test}} -- doing installation in test mode
##
{{if cancel_rollback}}
reload cancel
{{endif}}
{{if run}}
wr mem
{{endif}}
src/res/configlets/procurve/installer_commands_pre_config
+23
View File
@@ -0,0 +1,23 @@
## -*- mode: shell-script; -*-
##
## Lines that start with "##" will be removed before this code is
## added to the generated script.
##
## These are commands built-in policy installer runs on the firewall
##
## Variables:
##
## {{$rbtimeout}} -- rollback timeout (min)
## {{$rbtimeout_sec}} -- rollback timeout (sec)
## {{$test}} -- doing installation in test mode
##
terminal width 256
terminal length 0
{{if schedule_rollback}}
reload in {{$rbtimeout}}
{{endif}}
src/res/configlets/procurve/installer_commands_reg_user
+28
View File
@@ -0,0 +1,28 @@
## -*- mode: shell-script; -*-
##
## Lines that start with "##" will be removed before this code is
## added to the generated script. Regular shell comments can be added
## using single "#", these will appear in the script.
##
##
## These are commands built-in policy installer runs on the firewall if
## installation is performed using regular user account for authentication
##
## Variables:
##
## {{$fwbprompt}} -- "magic" prompt that installer uses to detect when it is logged in
## {{$fwdir}} -- directory on the firewall ("flash:" or "nvram:" or similar)
## {{$fwscript}} -- script name on the firewall
## {{$rbtimeout}} -- rollback timeout
## {{$rbtimeout_sec}} -- rollback timeout (sec)
##
{{if using_scp}}
copy {{$fwdir}}{{$fwscript}} running-config
{{endif}}
{{if not_using_scp}}
config term
{{$fwbuilder_generated_configuration_lines}}
exit
{{endif}}
test/procurve_acl/objects-for-regression-tests.fwb
+9 -8
View File
@@ -3199,7 +3199,7 @@
<Option name="verify_interfaces">true</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id4722X40592" host_OS="procurve" inactive="False" lastCompiled="1273699659" lastInstalled="0" lastModified="1273546094" platform="procurve_acl" version="K.13" name="testhp3" comment="Using &quot;safety net&quot; script option" ro="False">
<Firewall id="id4722X40592" host_OS="procurve" inactive="False" lastCompiled="1273700581" lastInstalled="0" lastModified="1273700578" platform="procurve_acl" version="K.13" name="testhp3" comment="Using &quot;safety net&quot; script option" ro="False">
<NAT id="id5018X40592" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@@ -3718,8 +3718,8 @@
<Option name="compiler"></Option>
<Option name="configure_interfaces">true</Option>
<Option name="eliminate_duplicates">true</Option>
<Option name="filesystem">/etc</Option>
<Option name="firewall_dir">/etc</Option>
<Option name="filesystem"></Option>
<Option name="firewall_dir"></Option>
<Option name="firewall_is_part_of_any_and_networks">true</Option>
<Option name="freebsd_ip_forward">1</Option>
<Option name="ignore_empty_groups">False</Option>
@@ -3787,23 +3787,24 @@
<Option name="procurve_acl_assume_fw_part_of_any">true</Option>
<Option name="procurve_acl_epilog_script"></Option>
<Option name="procurve_acl_generate_logging_commands">False</Option>
<Option name="procurve_acl_include_comments">true</Option>
<Option name="procurve_acl_include_comments">True</Option>
<Option name="procurve_acl_logging_buffered">False</Option>
<Option name="procurve_acl_logging_buffered_level">4</Option>
<Option name="procurve_acl_logging_buffered_level">6</Option>
<Option name="procurve_acl_logging_console">False</Option>
<Option name="procurve_acl_logging_console_level">4</Option>
<Option name="procurve_acl_logging_console_level">6</Option>
<Option name="procurve_acl_logging_timestamp">False</Option>
<Option name="procurve_acl_logging_trap_level">4</Option>
<Option name="procurve_acl_logging_trap_level">6</Option>
<Option name="procurve_acl_prolog_script"></Option>
<Option name="procurve_acl_syslog_facility"></Option>
<Option name="procurve_acl_syslog_host"></Option>
<Option name="procurve_acl_use_acl_remarks">False</Option>
<Option name="prompt1">$ </Option>
<Option name="prompt2"> # </Option>
<Option name="scpArgs"></Option>
<Option name="solaris_ip_forward">1</Option>
<Option name="sshArgs"></Option>
<Option name="ulog_nlgroup">1</Option>
<Option name="use_scp">False</Option>
<Option name="use_scp">True</Option>
<Option name="verify_interfaces">true</Option>
</FirewallOptions>
</Firewall>