added file-based configuration. Is default in dockerfile. overrides args.

This commit is contained in:
idk
2018-08-08 23:29:26 -04:00
parent a4b49a0b5e
commit 7730225a13
6 changed files with 40 additions and 35 deletions

View File

@ -18,4 +18,4 @@ USER $user
WORKDIR /opt/$user/ WORKDIR /opt/$user/
COPY $path /opt/$user/www COPY $path /opt/$user/www
#VOLUME /opt/$user/ #VOLUME /opt/$user/
CMD eephttpd -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

View File

@ -152,3 +152,10 @@ focus a bit more.
I've written a handful of example tools, but some of them might be better as I've written a handful of example tools, but some of them might be better as
their own projects. An i2p-native static site generator in the style of jekyll their own projects. An i2p-native static site generator in the style of jekyll
(but in go) could be cool. (but in go) could be cool.
Haha. Well shit. I migrated colluding\_sites\_attack to auto-configure using
the forwarder and the X-I2p-Dest* headers aren't passed through. Implies some
interesting arrangements, but also makes my software useless in it's present
state. I mean I know what I did with si-i2p-plugin works, so it's not that
important. I'll have to look for a way to make this behavior configurable
though.

View File

@ -155,14 +155,21 @@ focus a bit more.
I've written a handful of example tools, but some of them might be better as I've written a handful of example tools, but some of them might be better as
their own projects. An i2p-native static site generator in the style of jekyll their own projects. An i2p-native static site generator in the style of jekyll
(but in go) could be cool. (but in go) could be cool.
Haha. Well shit. I migrated colluding\_sites\_attack to auto-configure using
the forwarder and the X-I2p-Dest* headers aren't passed through. Implies some
interesting arrangements, but also makes my software useless in it's present
state. I mean I know what I did with si-i2p-plugin works, so it's not that
important. I'll have to look for a way to make this behavior configurable
though.
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAltre0MACgkQ11wDs5te iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAltrtRMACgkQ11wDs5te
FOHkKAgAkUPsYHtvhFTYDofOvsqV3DIKQzQv3B/tw5sQNb1ZG+asb2lY5/LTS2V2 FOHglQf/SgLVbbCVv+Z+lSxOwLbA38W4Qi/yFF4J9RBE72mldqFCethqCzE7adk3
MfOeZi4Vch4TEm41yYUwFAIJaZF77zbm0iD0HwCuSNgkTMWin4+cseSr2BkPHlWC k4fDfqf0TXBdNHabQ1AFN79f4HFcyTTQBPwGJB7XiSJCbvatV6+IynYG0c3rWla3
JQ4JZXyAdMusOQhD4I/68X+zPI2vX7pr8MQX/WBcDQgNaDRJ9GjGY+mZOVvvdZ9v dAYRBArjlzJ6JVIbB8sCSRts7MvO5o04rHd0qtaX8Ckq4NrYE5Oo6OyMkCVqFvFj
VvyJcxtYdSGeJdDyGeU2P6vkgAYseS8gn+QI+gtYOnXdAC8xZxG5tkD7q7SREkZd qswIXNOSloo2yXjAO6d1WPmUTgux67aodREoAYl+hWi0l8Qr2DKXyKTp+R1JJEXA
06GeQOhdSmLnBD38daWT/THegygHDEteweQCCXjGDrQgUySBfpk0AVP2Xm2ASS1L 4Z0MG4lXmknLGQDdS6W30aRI3Kz1/gum2Qv2HEeWCb+bUQ6O+mb7BSF4/b6jB1U4
1s2iVUMQTf0b3LtL4As+dmkmp89Xgg== mpmoeCnEqQ2XNdvqLIQOjwGmFhCbYw==
=9VgY =qlrn
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

View File

@ -1,25 +0,0 @@
2018/08/08 22:50:03 SAM Bridge connection established.
2018/08/08 22:50:03 Destination keys generated, tunnel name: static-eepSite
2018/08/08 22:50:03 Serving ./www on HTTP port: 8100
and on 6vdci6cxqcwtcjfnt537on7fwuihevyg3u7pntaiijts7pqkqo4a.b32.i2p
2018/08/08 22:50:23 SAM stream session established.
2018/08/08 22:50:23 Starting Listener.
2018/08/08 22:50:23 SAM Listener created, 6vdci6cxqcwtcjfnt537on7fwuihevyg3u7pntaiijts7pqkqo4a.b32.i2p
2018/08/08 22:55:50 SAM Bridge connection established.
2018/08/08 22:55:50 Destination keys generated, tunnel name: static-eepSite
2018/08/08 22:55:50 Serving ./www on HTTP port: 8100
and on 6vdci6cxqcwtcjfnt537on7fwuihevyg3u7pntaiijts7pqkqo4a.b32.i2p
2018/08/08 22:56:06 SAM Bridge connection established.
2018/08/08 22:56:06 Destination keys generated, tunnel name: static-eepSite
2018/08/08 22:56:06 Serving ./www on HTTP port: 8100
and on 6vdci6cxqcwtcjfnt537on7fwuihevyg3u7pntaiijts7pqkqo4a.b32.i2p
2018/08/08 22:56:06 Stream Creation error: Duplicate tunnel name
2018/08/08 22:59:22 SAM Bridge connection established.
2018/08/08 22:59:22 Destination keys generated, tunnel name: static-eepSite
2018/08/08 22:59:22 Serving ./www on HTTP port: 8100
and on 6vdci6cxqcwtcjfnt537on7fwuihevyg3u7pntaiijts7pqkqo4a.b32.i2p
2018/08/08 22:59:42 SAM stream session established.
2018/08/08 22:59:42 Starting Listener.
2018/08/08 22:59:42 SAM Listener created, 6vdci6cxqcwtcjfnt537on7fwuihevyg3u7pntaiijts7pqkqo4a.b32.i2p
2018/08/08 23:01:48 Accepted connection &{sO90W5~J00I0nfoo5c4vWI4NHByHQ9oxf~FNXSsNALavUDhbXg154JZbwmdddAF3dFC~x~0m0RvPxl1wWgr9ML4Xga5MlkXIvy1AWigov-1m1gjN41LPq4d-OwTYnIyO3DbgcG9eb2j4gbSIBNHHsLHgbMBwMucvk9rYe93nmOOHhV7kIVFmpCtEXEqrYPL9KbsLALNFNKque~ehvywlRnCw5cNW1nNKJw0MKhrgulYDQAhqSbjnrMYzwhQxv90wNPNxUusYtnf4VnPq~2CZlAIMiYhWqLRGOtGo7a7jWwjcvK9LWkBfE74AWN5-f5z8UiKkjTdQeiCwt0fLaohNTAWYgzv6UNSjjSZmHrX7UIMw2Gb4BQOV3AqARfr4MZi5qXpTgLcqVif1ImQiQUuidA~28evK6vvm-IgvSkh901dGJz8X1zCO7g7yev9QdMQyIF44WcmCTEkBV7Qa3Y-EmVpOD79Ws-KSnnVzlBC1c90zWZcaIygBr-aMkgtOtwbAAAAA RFtce1f~M~BsiOQ0XNvu83INzjctpuqfn7Ox~RKE8plwEBXq2mAWvtFebBFyF9acnKG9pAPTmSc~CfnXwAr3J11laVOWFxKkTV9e6MPAzfbRWj1KUhmb3gOlcsu~hTx4U9F9-NXrv7ehlXUoHRmoZPLLmghYKZn8Gh364Xs2iPhYKQlxgJM3R-I42GuXVvY9S7HFE5noL0RqoISqOCXxznnTDQymEto~4t6IdXsnxoiko24RELS5E~icAdJ~YlQaA7TqkdKa0KHe0c~ZZQkcS9~IUj2lImVLUnqUBpuOpwwfjc9BKFgdVz0vJA1WfPha-RGTaYL0Itwnebm37wt8R42RL7rh4XgHgnda1MzMzYLh~1GlziqHfgNMbt6biRuuHGchEA9BqXQt-kRaWj5Rz3c-c63n~QwPRMnV2ZAbgdlf3XUOL7dG52aol5DfYaSYTO~w-Ga4G-mZ0HnJ0JryWuCZAIot5LEMKe2GskjFNJKNSdj-U~mGBhMLD7sZbGsDAAAA 0xc42014e040}
2018/08/08 23:01:48 Connected to localhost &{sO90W5~J00I0nfoo5c4vWI4NHByHQ9oxf~FNXSsNALavUDhbXg154JZbwmdddAF3dFC~x~0m0RvPxl1wWgr9ML4Xga5MlkXIvy1AWigov-1m1gjN41LPq4d-OwTYnIyO3DbgcG9eb2j4gbSIBNHHsLHgbMBwMucvk9rYe93nmOOHhV7kIVFmpCtEXEqrYPL9KbsLALNFNKque~ehvywlRnCw5cNW1nNKJw0MKhrgulYDQAhqSbjnrMYzwhQxv90wNPNxUusYtnf4VnPq~2CZlAIMiYhWqLRGOtGo7a7jWwjcvK9LWkBfE74AWN5-f5z8UiKkjTdQeiCwt0fLaohNTAWYgzv6UNSjjSZmHrX7UIMw2Gb4BQOV3AqARfr4MZi5qXpTgLcqVif1ImQiQUuidA~28evK6vvm-IgvSkh901dGJz8X1zCO7g7yev9QdMQyIF44WcmCTEkBV7Qa3Y-EmVpOD79Ws-KSnnVzlBC1c90zWZcaIygBr-aMkgtOtwbAAAAA RFtce1f~M~BsiOQ0XNvu83INzjctpuqfn7Ox~RKE8plwEBXq2mAWvtFebBFyF9acnKG9pAPTmSc~CfnXwAr3J11laVOWFxKkTV9e6MPAzfbRWj1KUhmb3gOlcsu~hTx4U9F9-NXrv7ehlXUoHRmoZPLLmghYKZn8Gh364Xs2iPhYKQlxgJM3R-I42GuXVvY9S7HFE5noL0RqoISqOCXxznnTDQymEto~4t6IdXsnxoiko24RELS5E~icAdJ~YlQaA7TqkdKa0KHe0c~ZZQkcS9~IUj2lImVLUnqUBpuOpwwfjc9BKFgdVz0vJA1WfPha-RGTaYL0Itwnebm37wt8R42RL7rh4XgHgnda1MzMzYLh~1GlziqHfgNMbt6biRuuHGchEA9BqXQt-kRaWj5Rz3c-c63n~QwPRMnV2ZAbgdlf3XUOL7dG52aol5DfYaSYTO~w-Ga4G-mZ0HnJ0JryWuCZAIot5LEMKe2GskjFNJKNSdj-U~mGBhMLD7sZbGsDAAAA 0xc42014e040}

View File

@ -0,0 +1,16 @@
#[eephttpd]
host = 127.0.0.1
port = 7880
samhost = sam-host
samport = 7656
inbound.length = 6
outbound.length = 6
inbound.backupQuantity = 5
outbound.backupQuantity = 5
inbound.quantity = 8
outbound.quantity = 8
gzip = true
i2cp.reduceOnIdle = true
i2cp.reduceIdleTime = 900000
i2cp.reduceQuantity = 4
keys = eephttpd.dat

View File

@ -14,7 +14,7 @@ import (
func main() { func main() {
host := flag.String("a", "127.0.0.1", host := flag.String("a", "127.0.0.1",
"hostname to serve on") "hostname to serve on")
port := flag.String("p", "8100", port := flag.String("p", "7880",
"port to serve locally on") "port to serve locally on")
samhost := flag.String("sh", "127.0.0.1", samhost := flag.String("sh", "127.0.0.1",
"sam host to connect to") "sam host to connect to")