diff options
Diffstat (limited to 'config/openbgpd')
| -rw-r--r-- | config/openbgpd/openbgpd.inc | 6 | ||||
| -rw-r--r-- | config/openbgpd/openbgpd.xml | 5 | ||||
| -rw-r--r-- | config/openbgpd/openbgpd_neighbors.xml | 12 | ||||
| -rw-r--r-- | config/openbgpd/openbgpd_status.php | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc index 8e64c683..c786f0d9 100644 --- a/config/openbgpd/openbgpd.inc +++ b/config/openbgpd/openbgpd.inc @@ -79,6 +79,10 @@ function openbgpd_install_conf() { if($neighbor['groupname'] == $group['name']) { $conffile .= " neighbor {$neighbor['neighbor']} {\n"; $conffile .= " descr \"{$neighbor['descr']}\"\n"; + if($neighbor['md5sigpass']) + $conffile .= " tcp md5sig password {$neighbor['md5sigpass']}\n"; + if($neighbor['md5sigkey']) + $conffile .= " tcp md5sig key {$neighbor['md5sigkey']}\n"; foreach($neighbor['row'] as $row) { $conffile .= " {$row['paramaters']} {$row['parmvalue']} \n"; } @@ -130,7 +134,7 @@ function openbgpd_install_conf() { $fd = fopen("/usr/local/etc/rc.d/bgpd.sh","w"); fwrite($fd, "#!/bin/sh\n\n"); fwrite($fd, "# This file was created by the pfSense package manager. Do not edit!\n\n"); - fwrite($fd, "bgpd\n"); + fwrite($fd, "/usr/local/sbin/bgpd -f /usr/local/etc/bgpd.conf\n"); fclose($fd); exec("chmod a+rx /usr/local/etc/rc.d/bgpd.sh"); exec("chmod a-rw /usr/local/etc/bgpd.conf"); diff --git a/config/openbgpd/openbgpd.xml b/config/openbgpd/openbgpd.xml index 4b85dbd0..3bb37f7d 100644 --- a/config/openbgpd/openbgpd.xml +++ b/config/openbgpd/openbgpd.xml @@ -45,6 +45,11 @@ <version>1</version> <title>Services: OpenBGPD</title> <include_file>/usr/local/pkg/openbgpd.inc</include_file> + <service> + <name>bgpd</name> + <rcfile>bgpd.sh</rcfile> + <executable>bgpd</executable> + </service> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>077</chmod> diff --git a/config/openbgpd/openbgpd_neighbors.xml b/config/openbgpd/openbgpd_neighbors.xml index cc170c0b..28fa87ab 100644 --- a/config/openbgpd/openbgpd_neighbors.xml +++ b/config/openbgpd/openbgpd_neighbors.xml @@ -106,6 +106,18 @@ </options> </field> <field> + <fielddescr>MD5 Signature Password</fielddescr> + <fieldname>md5sigpass</fieldname> + <description></description> + <type>input</type> + </field> + <field> + <fielddescr>MD5 Signature Key</fielddescr> + <fieldname>md5sigkey</fieldname> + <description></description> + <type>input</type> + </field> + <field> <fielddescr>none</fielddescr> <fieldname>none</fieldname> <type>rowhelper</type> diff --git a/config/openbgpd/openbgpd_status.php b/config/openbgpd/openbgpd_status.php index 912539ce..5660734f 100644 --- a/config/openbgpd/openbgpd_status.php +++ b/config/openbgpd/openbgpd_status.php @@ -160,7 +160,5 @@ defCmdT("OpenBGPD Neighbors","bgpctl show neighbor"); <?php include("fend.inc"); ?> -<meta http-equiv="refresh" content="60;url=<?php print $_SERVER['SCRIPT_NAME']; ?>"> - </body> </html> |