diff options
| author | Renato Botelho <renato@netgate.com> | 2015-07-16 09:50:39 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-07-16 09:50:39 -0300 |
| commit | 447ac905e062c158e4f85661d60057ba434c4d54 (patch) | |
| tree | 05f379f3ab4838fa7d10cf83ab3d9c50d1d5e0e4 | |
| parent | a50dc43bf9d0c08429eaf25c7647069fa25f07ee (diff) | |
| parent | dc9c42db566fa60030393b4433c94467d390721e (diff) | |
| download | pfsense-packages-447ac905e062c158e4f85661d60057ba434c4d54.tar.gz pfsense-packages-447ac905e062c158e4f85661d60057ba434c4d54.tar.bz2 pfsense-packages-447ac905e062c158e4f85661d60057ba434c4d54.zip | |
Merge pull request #894 from djmarcin/stunnel
| -rw-r--r-- | config/stunnel/stunnel.inc | 1 | ||||
| -rw-r--r-- | config/stunnel/stunnel.xml | 8 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/config/stunnel/stunnel.inc b/config/stunnel/stunnel.inc index fdc72bf2..552603b6 100644 --- a/config/stunnel/stunnel.inc +++ b/config/stunnel/stunnel.inc @@ -123,6 +123,7 @@ function stunnel_save($config) { if(!is_array($config['installedpackages']['stunnel']['config'])) { $config['installedpackages']['stunnel']['config']=Array(); } foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) { fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n"); + if($pkgconfig['client']) fwrite($fout, "client = yes" . "\n"); if($pkgconfig['certificate']) { if(file_exists('/usr/local/etc/stunnel/'.$pkgconfig['certificate'].'.key') and file_exists('/usr/local/etc/stunnel/'.$pkgconfig['certificate'].'.chain')) { diff --git a/config/stunnel/stunnel.xml b/config/stunnel/stunnel.xml index 21e023a9..11334000 100644 --- a/config/stunnel/stunnel.xml +++ b/config/stunnel/stunnel.xml @@ -116,6 +116,12 @@ <type>input</type> </field> <field> + <fielddescr>Client Mode?</fielddescr> + <fieldname>client</fieldname> + <description>Use client mode for this tunnel (i.e. connect to an SSL server, do not act as an SSL server)</description> + <type>checkbox</type> + </field> + <field> <fielddescr>Listen on IP</fielddescr> <fieldname>localip</fieldname> <description>Enter the local IP address to bind this redirection to.</description> @@ -158,7 +164,7 @@ </fields> <service> <name>stunnel</name> - <rcfile>/usr/local/etc/rc.d/stunnel.sh</rcfile> + <rcfile>stunnel.sh</rcfile> <executable>stunnel</executable> </service> <include_file>/usr/local/pkg/stunnel.inc</include_file> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 3023763d..63e70208 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -930,7 +930,7 @@ <descr>An SSL encryption wrapper between remote client and local or remote servers. </descr> <category>Network Management</category> <depends_on_package_pbi>stunnel-5.07-##ARCH##.pbi</depends_on_package_pbi> - <version>5.07</version> + <version>5.07.1</version> <status>Stable</status> <pkginfolink>https://doc.pfsense.org/index.php/Stunnel_package</pkginfolink> <required_version>2.2</required_version> |