idk/sam-forwarder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed error in tunconf

Browse Source
This commit is contained in:
idk
2018-08-16 17:51:08 -04:00
parent a8d92dd711
commit d3a1bb31b0
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -17,5 +17,4 @@ RUN install -m755 bin/eephttpd /usr/bin/eephttpd
USER $user USER $user
WORKDIR /opt/$user/ WORKDIR /opt/$user/
COPY $path /opt/$user/www COPY $path /opt/$user/www
#VOLUME /opt/$user/
CMD eephttpd -f /usr/src/eephttpd/etc/eephttpd/eephttpd.conf -s /opt/$user/ -sh=$samhost -sp=$samport $args CMD eephttpd -f /usr/src/eephttpd/etc/eephttpd/eephttpd.conf -s /opt/$user/ -sh=$samhost -sp=$samport $args

12
Makefile
View File

@ -95,7 +95,13 @@ gendoc: all
docker-build: docker-build:
docker build --build-arg user=$(eephttpd) --build-arg path=example/www -f Dockerfile -t eyedeekay/$(eephttpd) . docker build --build-arg user=$(eephttpd) --build-arg path=example/www -f Dockerfile -t eyedeekay/$(eephttpd) .
docker-run: docker-volume:
docker run -i -t -d \
--name $(eephttpd)-volume \
--volume $(eephttpd):/home/$(eephttpd)/ \
eyedeekay/$(eephttpd); true
docker-run: docker-volume
docker rm -f eephttpd; true docker rm -f eephttpd; true
docker run -i -t -d \ docker run -i -t -d \
--network $(network) \ --network $(network) \
@ -106,9 +112,11 @@ docker-run:
--hostname $(eephttpd) \ --hostname $(eephttpd) \
--name $(eephttpd) \ --name $(eephttpd) \
--restart always \ --restart always \
--volume $(eephttpd):/home/$(eephttpd)/www \ --volumes-from $(eephttpd)-volume \
eyedeekay/$(eephttpd) eyedeekay/$(eephttpd)
docker: docker-build docker-volume docker-run
docker-cmd: docker-cmd:
@echo "### build in docker" >> USAGE.md @echo "### build in docker" >> USAGE.md
@echo "" >> USAGE.md @echo "" >> USAGE.md

16
README.md.asc
View File

@ -181,12 +181,12 @@ It would be really awesome if I could make this run on Android. So I'll make
that happen eventually. that happen eventually.
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlt17gEACgkQ11wDs5te iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlt18ckACgkQ11wDs5te
FOFYRAgAidXc5JFoIep6QyCWTeS0c+MNUkEDSG+t8+Cjy13WVVN7zumIUS4st/nS FOFrFgf/cih5E2gyUEBR7OMrDYkr8T9pwsqLhkzQUfxcZPLM6DSeRUO9EPUThJAx
qU1cmQK4+ESH3Qr4/eSTI5uUYq5CfjD01YHGZk+TR0yehVQPIuz7ZsSiND4YmSS5 wi0kRI9/q+V8QcnKd9mFWmPAGZgx/ha6PxWfdWR98SdiLQzVd2DIrarIcxp/c0bH
LSo95IOxCT4vg1nxtbCzclyZzTlxm3HhV85JhJIyU8oS8cdYL195eojXVdCJsFcK UoJHhPU7tuSohYvZfzDBgNtliAUE0Nmbwtxl9gOwbVc83ebb0IxMRKTZAY1PqlOL
JVBf45RgdkvT12XzB2I8naNrJ2SWMvpnpAVLUwHOlCt0j2rh8SnU5Eaqk3toQMFE zcEdQnmdb7FPG85EZOpiMnQcGOYiGS5XxvWZuA60ADzgMVPMX59drty6uoX6RjOt
GIGVzqF1f6gqMn4+4FuFDNoWFPboJc0KIOzv1ByHZkJ9EoDG84JcDZ4k14aDhv/2 AMpfTDD7WnXuD2bV22IITofLH1fkSR6qB0Lvrc7wbbHvNiuI5Yw0b0q9mPVq8mtv
ar4SC22fyxr+ghOrLl70EtjPH3t9yg== JtEwNcm19oIUS0ug8GjRi0A6ZfJguQ==
=g7NX =3W77
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

4
config/tunconf.go
View File

@ -694,9 +694,9 @@ func (c *Conf) SetOutLength() {
// SetInQuantity sets the inbound tunnel quantity from config file // SetInQuantity sets the inbound tunnel quantity from config file
func (c *Conf) SetInQuantity() { func (c *Conf) SetInQuantity() {
if v, ok := c.config.GetInt("inbound.quantity"); ok { if v, ok := c.config.GetInt("inbound.quantity"); ok {
c.OutQuantity = v c.InQuantity = v
} else { } else {
c.OutQuantity = 5 c.InQuantity = 5
} }
} }