Skip to content

Commit

Permalink
Initial commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
brona committed Jul 20, 2014
0 parents commit 544f76f
Show file tree
Hide file tree
Showing 28 changed files with 1,127 additions and 0 deletions.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
debian/vyatta-sslh
debian/vyatta-sslh.debhelper.log
debian/vyatta-sslh.substvars
debian/files
tmp/*
/Makefile
/Makefile.in
/aclocal.m4
/autom4te.cache/
/config.*
/configure
/m4/
/stamp-h?
.deps/
.dirstamp
*.o
*~
INSTALL
config
build-stamp
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Dominik Malis <[email protected]>
Bronislav Robenek <[email protected]>
340 changes: 340 additions & 0 deletions COPYING

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ChangeLog
24 changes: 24 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
cfgdir = $(datadir)/vyatta-cfg/templates
opdir = $(datadir)/vyatta-op/templates
curverdir = $(sysconfdir)/config-migrate/current
bin_sudo_usersdir = $(bindir)/sudo-users

vprefix = /opt/vyatta
vsbindir = $(vprefix)/sbin

bin_SCRIPTS = scripts/vyatta-show-sslh.pl

sbin_SCRIPTS = scripts/vyatta-update-sslh.pl

bin_sudo_users_SCRIPTS =

curver_DATA =

cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd

install-exec-hook:
mkdir -p $(DESTDIR)$(cfgdir)
cd templates-cfg; $(cpiop) $(DESTDIR)$(cfgdir)
mkdir -p $(DESTDIR)$(opdir)
cd templates-op; $(cpiop) $(DESTDIR)$(opdir)
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is initial release.
3 changes: 3 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This package provides Vyatta/VyOS SSLH configuration, templates and scripts.

See README.md
138 changes: 138 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
# vyatta-sslh

This package provides Vyatta/VyOS [http://www.rutschle.net/tech/sslh.shtml](SSLH) configuration, templates and scripts.

SSLH is SSL multiplexer which provides port-sharing of same TCP port for multiple applications - more information at http://www.rutschle.net/tech/sslh.shtml

## Authors

* Bronislav Robenek <[email protected]>
* Dominik Malis <[email protected]>

Used software:

* Configuration script is derived from [ubnt-igmpproxy](http://www.ubnt.com/download/) script by Stig Thormodsrud from Ubiquiti Networks, Inc.
* Vyatta/VyOS package is based on [vyatta-dummy](https://github.com/vyos/vyatta-dummy) package by SO3 Group, including Daniil Baturin.

## Supported versions

Tested with:

* sslh (1.15-1) from jessie
* VyOS 1.0.4 hydrogen

## Usage

Example Vyatta/VyOS configuration:

service {
ssl-port-sharing {
mode select
port 443
protocol http {
address 192.168.1.5
port 443
}
protocol openvpn {
address 127.0.0.1
port 1194
}
protocol ssh {
address 192.168.1.10
port 22
}
}
}

## Installation of SSLH in VyOS/Vyatta

To easily install recent software including sslh add jessie and squeeze (optional) repository to VyOS/Vyatta.

# set system package repository jessie components 'main'
# set system package repository jessie distribution 'jessie'
# set system package repository jessie url 'http://mirrors.kernel.org/debian'

# set system package repository squeeze components 'main'
# set system package repository squeeze distribution 'squeeze'
# set system package repository squeeze url 'http://mirrors.kernel.org/debian'
# commit

To install only single package (eg. sslh) it is reasonable idea to pin current packages:

$ cat /etc/apt/preferences
Package: *
Pin: release n=hydrogen
Pin-Priority: 1000

$ cat /etc/apt/preferences.d/squeeze.pref
Package: *
Pin: release n=squeeze
Pin-Priority: 700

$ cat /etc/apt/preferences.d/jessie.pref
Package: *
Pin: release n=jessie
Pin-Priority: 90

Then update & upgrade system - be careful no packages should be upgraded.

# Should proceed with no problems
$ sudo apt-get update

# Verify priorities
$ sudo apt-cache policy

# Almost no or zero packages should be upgraded
$ sudo apt-get upgrade

A) Install sslh from jessie (with dependencies):

# You will be asked about installation/upgrade plan
$ sudo apt-get -t jessie install sslh

B) Install sslh from jessie (one by one package):

# You will have to selectively upgrade unmet dependencies (eg. libc6)
$ sudo apt-get install sslh/jessie

## Installation of vyatta-sslh in VyOS/Vyatta

### Disabling Debian sslh init.d script

$ sudo update-rc.d -f sslh remove

### A) Use custom repository
This repository is only temporary and is provided as-is with no guarantees. vyatta-sslh may be once integrated into VyOS community repository.

$ echo "deb http://packages.robenek.me debian/" > /etc/apt/sources.list.d/robenek.list
$ sudo apt-get update
$ sudo apt-get install vyatta-sslh

### B) Use downloaded .deb file

$ wget http://packages.robenek.me/debian/vyatta-sslh_1.0.0_all.deb
$ sudo dpkg -i vyatta-sslh_1.0.0_all.deb

### C) Compile from source

$ aptitude install build-essential devscripts debhelper autotools-dev autoconf fakeroot automake
$ git clone https://github.com/brona/vyatta-sslh
$ cd vyatta-sslh
$ debuild -us -uc

## Technical details

This package is just a wrapper for sslh.

Configuration is written to /etc/sslh.conf.

sslh is started using `start-stop-daemon`.

## Unsupported features / future development
We would like to encourage anyone to contribute to this package. We will be glad to accept any pull-requests.

Currently these features are missing:

* sslh is binding to 0.0.0.0 only (there is no option).
* There is no support for transparent mode of sslh.

32 changes: 32 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)

m4_define([VERSION_ID], [m4_esyscmd([
if test -f .version ; then
head -n 1 .version | tr -d \\n
else
echo -n 2.4
fi])])
AC_INIT([vyatta-sslh], VERSION_ID, [[email protected]])

test -n "$VYATTA_VERSION" || VYATTA_VERSION=$PACKAGE_VERSION

AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2 subdir-objects])
AC_PREFIX_DEFAULT([/opt/vyatta])

AC_ARG_ENABLE([nostrip],
AC_HELP_STRING([--enable-nostrip],
[include -nostrip option during packaging]),
[NOSTRIP=-nostrip], [NOSTRIP=])

AC_CONFIG_FILES([Makefile])

AC_SUBST(NOSTRIP)

AC_PROG_CC
AC_PROG_CXX
AM_PROG_AS
AM_PROG_CC_C_O
AC_OUTPUT

6 changes: 6 additions & 0 deletions debian/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
The Debian Package vyatta-sslh
-------------------------------

This package provides configuration for sslh in Vyatta/VyOS.

-- Bronislav Robenek <[email protected]> Sun, 20 Jul 2014 23:27:05 +0200
10 changes: 10 additions & 0 deletions debian/autogen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

rm -rf config
rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL

autoreconf --force --install

rm -f config.sub config.guess
ln -s /usr/share/misc/config.sub .
ln -s /usr/share/misc/config.guess .
5 changes: 5 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
vyatta-sslh (1.0.0) internal; urgency=low

* Initial Release.

-- Bronislav Robenek <[email protected]> Sun, 20 Jul 2014 23:27:05 +0200
1 change: 1 addition & 0 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5
16 changes: 16 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Source: vyatta-sslh
Section: contrib/net
Priority: extra
Maintainer: Bronislav Robenek <[email protected]>
Standards-Version: 3.9.1
Build-Depends: debhelper (>= 5), autotools-dev, autoconf

Package: vyatta-sslh
Architecture: all
Depends: vyatta-cfg-system,
vyatta-cfg,
vyatta-op,
sslh (>= 1.15),
${misc:Depends}
Description: Vyos/Vyatta SSLH configuration utilities
Vyos/Vyatta SSLH configuration utilities, templates and scripts.
37 changes: 37 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
This package was debianized by Bronislav Robenek <[email protected]> on
Sun, 20 Jul 2014.

It's original content from the GIT repository
<https://github.com/brona/vyatta-sslh>

Upstream Author:

<[email protected]>
<[email protected]>

Copyright:

Copyright (C) 2014 Bronislav Robenek and Dominik Malis
All Rights Reserved.

License:

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.

This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.

A copy of the GNU General Public License is available as
`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
You can also obtain it by writing to the Free Software Foundation,
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA.

The Debian packaging is (C) 2014, Bronislav Robenek <[email protected]> and
is licensed under the GPL, see above.
1 change: 1 addition & 0 deletions debian/docs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
README
2 changes: 2 additions & 0 deletions debian/lintian
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
vyatta-sslh: file-in-unusual-dir
vyatta-sslh: dir-or-file-in-opt
Loading

0 comments on commit 544f76f

Please sign in to comment.