commit de8d428ab5f2dfcc830ac8a4b34985a87643749f
Author: Ximin Luo infini...@torproject.org
Date: Tue Nov 4 01:28:55 2014 +
have automake output test failures to stdout
---
Makefile |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index
commit c89d0c04a6e454c54a58cd17c0b2e7c7267f15fc
Author: Ximin Luo infini...@torproject.org
Date: Sun Nov 2 19:33:55 2014 +
use a more flexible wait time in the facilitator test, to work on slower
machines
---
facilitator/fp-facilitator-test.py | 15 ++-
1 file changed,
commit 7ba80db17d0fe53dfc0eff9ed4dec46312e853e7
Author: Ximin Luo infini...@torproject.org
Date: Tue Aug 5 23:23:05 2014 +0100
generate key in the initscript instead of post-install
- this allows things to work easily even on pre-installed system images,
such as liveCDs, c.f. debian
commit e8a2eb04ba430562b81db7ba4d36c60915de189c
Author: Quinn Jarrell qjarr...@gosynapsify.com
Date: Mon Jun 30 18:31:46 2014 -0400
Proxy shims now detect what type of protocol each PT needs, SOCKS4 or
SOCKS5.
---
obfs-flash-client | 50 +-
'),
default=DEFAULT_CONFIG_FILE_NAME)
pt_setup_logger()
# TODO(infinity0): add an external mode, which would require us to run
# obfsproxy in external mode too.
opts = parser.parse_args(args)
-
-# ensure string address is valid
-_, _, = parse_addr_spec(opts.fp_remote, defhost
commit ae09d13b4fa4caa8d0a0dd07b1add66605466953
Author: Ximin Luo infini...@torproject.org
Date: Mon Jul 14 10:48:20 2014 +0100
Add fingerprint of the bridge we're running, to protect against MITM of the
first hop.
- To support multiple authenticated bridges, we will need to fix #10196
commit 564e75cdbd5128968288afb3da583be5413e4b6c
Author: Ximin Luo infini...@torproject.org
Date: Tue Jul 8 11:54:03 2014 +0100
report facilitator service status correctly
---
facilitator/init.d/fp-facilitator.in |2 +-
facilitator/init.d/fp-reg-decryptd.in|2 +-
commit a2c0980e51ac6fe73b1a6fccea240df493201c4c
Author: Ximin Luo infini...@torproject.org
Date: Tue Jul 8 10:32:32 2014 +0100
undo overzealous factoring - enforce v4/v6 behaviour only applies for
registration helpers
---
flashproxy-reg-appspot |1 +
flashproxy-reg-email |1 +
commit 701a03c82900c4c76963563554234c86929d30d1
Author: Ximin Luo infini...@torproject.org
Date: Sun Jul 6 21:53:11 2014 +0100
remove ignore_pubkey param, treat http as special case
---
flashproxy-reg-http | 12 +---
flashproxy/reg.py | 11 +--
2 files changed, 14
commit e6b07f1d84fd5735a9ba3afae96ff8626e7cd9a2
Author: Ximin Luo infini...@torproject.org
Date: Thu Feb 13 16:43:17 2014 +
fix flashproxy-client registration
- this ought to have been grouped together with c323a11f migrate
flashproxy-client to argparse but it had already been
commit 56ff2609cf9ec4f36357d92123c95922b4fbdc44
Author: Ximin Luo infini...@gmx.com
Date: Tue Nov 19 16:12:07 2013 +
migrate reg methods to argparse
---
flashproxy-reg-appspot | 95
flashproxy-reg-email | 141
commit badb39f9c13497a7887bac4ac24210ec12be9e39
Author: Ximin Luo infini...@torproject.org
Date: Thu Feb 13 16:45:09 2014 +
move common functionality and command-line options into flashproxy-common
- move keys.DEFAULT_FACILITATOR_PUBKEY_PEM into new reg module to be with
other
commit 0361a009f6c13dd125c8ad3267d0c9fc6074b298
Author: Ximin Luo infini...@torproject.org
Date: Sun Jul 6 21:53:46 2014 +0100
unify common parts of build_register_command
---
flashproxy-client | 43 ---
1 file changed, 20 insertions(+), 23
commit 2d1fd22de9ab2648ab81287079a9b9b9f7700f64
Author: Ximin Luo infini...@gmx.com
Date: Tue Nov 19 15:29:19 2013 +
factor out the M2Crypto check to flashproxy.keys
---
flashproxy-reg-appspot | 15 +++
flashproxy-reg-email | 17 +++--
flashproxy-reg-url
commit c323a11f3c4fbf9ed0fd9721d62410584524197b
Author: Ximin Luo infini...@gmx.com
Date: Tue Nov 19 17:17:59 2013 +
migrate flashproxy-client to argparse
---
flashproxy-client | 255 -
1 file changed, 115 insertions(+), 140
commit 83ffac02803b5f354f02edbe122e8df515fdf756
Author: Ximin Luo infini...@torproject.org
Date: Fri Jun 27 17:42:56 2014 +0100
fix incorrect transport name in obfs3_flashproxy, which was causing
flashproxy registration to fail
---
obfs-flash-client |2 +-
1 file changed, 1
commit 068356526078a876df301a797fabb3573630cd43
Author: Ximin Luo infini...@torproject.org
Date: Fri Jun 27 18:07:32 2014 +0100
fix chaining logic
- we actually want the second shim to listen on the callback port, not the
first shim
- tor socks-connects directly to the first PT, it
commit 2b7a86b3bb2db582123f800f992d8683c65cc3e4
Author: Quinn Jarrell qjarr...@gosynapsify.com
Date: Thu Jun 5 14:40:20 2014 -0400
Modified pt_launch_pair into pt_launch_chain. The new method of chaining
starts with the last socks server pointing to the last pt with the destination
being
(--fp-arg, help=arguments for flashproxy-client,
metavar='ARG', action='append')
+parser.add_argument(-f, help=fog configuration file path,
+metavar='FOGFILE', type=argparse.FileType('r'))
+
# TODO(infinity0): add an external mode, which would require us to run
commit 29929c7f049f2ee738da2ca4e0c5cd6847cb4143
Author: Ximin Luo infini...@torproject.org
Date: Wed Jun 4 19:22:01 2014 +0100
- fix launching obfs3_flashproxy
---
obfs-flash-client |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/obfs-flash-client
commit f84a749a5fd10f36d0d0d2aab14eb3a5e4da9dec
Author: Ximin Luo infini...@torproject.org
Date: Mon Jun 2 19:33:17 2014 +0100
- fix websocket-server program name, somehow omitted from last commit
---
obfs-flash-server.go |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit f75ce00346237321622a3959997c707a1eaaf5ad
Author: Ximin Luo infini...@torproject.org
Date: Sun May 18 14:09:27 2014 +0100
update instances of websocket-server embedded in documentation and
metadata
---
.gitignore |4 ++--
README
commit c4ef06f097354214460d45207a0297eec79d3bbe
Author: Ximin Luo infini...@torproject.org
Date: Sun May 18 13:47:26 2014 +0100
disambiguate binary names to avoid potential name clashes
---
Makefile | 22 +-
pt-websocket-client/pt-websocket-client.go |
commit 7735064af5a60d99f041d168d04fbda44a495760
Author: Ximin Luo infini...@torproject.org
Date: Mon May 19 10:16:58 2014 +0100
bump facilitator version
---
facilitator/configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/facilitator/configure.ac
commit f9c3c67c4817d2e3c2894dc0463ebf760836b137
Author: Ximin Luo infini...@torproject.org
Date: Mon May 19 14:09:20 2014 +0100
update to new pt-websocket-server name
---
obfs-flash-server.go |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/obfs-flash-server.go
commit 8a73911ed82454de0c77c2479eb865c4dee8b3d2
Author: Ximin Luo infini...@torproject.org
Date: Mon May 19 14:50:50 2014 +0100
fix out-of-source builds and `make distcheck`
---
facilitator/Makefile.am |6 --
mkman.sh|9 +
2 files changed, 9
commit f75ce00346237321622a3959997c707a1eaaf5ad
Author: Ximin Luo infini...@torproject.org
Date: Sun May 18 14:09:27 2014 +0100
update instances of websocket-server embedded in documentation and
metadata
---
.gitignore |4 ++--
README
commit 9dea0c6c90dedc868dfaa84add2bfa19a2039281
Author: Ximin Luo infini...@torproject.org
Date: Fri Mar 7 13:22:29 2014 +
add a logging timestamp, and per-connection info
---
proxy/flashproxy.js |5 +
1 file changed, 5 insertions(+)
diff --git a/proxy/flashproxy.js
commit 05b9c101ba9afe4653d1eff6f5414f90f22ef042
Author: Ximin Luo infini...@torproject.org
Date: Fri Mar 7 13:39:31 2014 +
remove failed connections from proxy_pairs as well
- this is a pretty major fix, as the previous behaviour effectively
disabled a proxy after 5 failed
commit 281c277c5e0c08a40583d3aca1f321e834e0ef34
Author: Ximin Luo infini...@torproject.org
Date: Fri Mar 7 13:51:54 2014 +
use CONNECTIONS_PER_CLIENT and MAX_NUM_CLIENTS instead of a single
MAX_NUM_PROXY_PAIRS
- the previous behaviour was misleading, max_clients was effectively
commit 81fa4ac056cc575bbb427bb00ba42c52614ce3b5
Author: Ximin Luo infini...@torproject.org
Date: Fri Mar 7 14:30:58 2014 +
add ChangLog entry for the browser proxy bugfix
---
ChangeLog |3 +++
1 file changed, 3 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index
commit ffcbb269b56bd9f5a329baffa58e430a59dfb93e
Author: Ximin Luo infini...@torproject.org
Date: Sun Feb 23 19:37:34 2014 +
add an optional target to build a man page.
---
Makefile |4
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 7824879..02d4d47
commit a0aae748b6eb0f0eaabf6dc17770cbf8f4bd8083
Author: Ximin Luo infini...@torproject.org
Date: Sun Feb 23 21:03:34 2014 +
clean the optional man page as well
---
Makefile |1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 02d4d47..b723c86 100644
---
commit 1432fd2ca896522613be1e4bc8f40712b2a61f96
Author: Ximin Luo infini...@torproject.org
Date: Sat Feb 15 18:00:10 2014 +
more FreeBSD compatibility fixes for some build scripts
---
mkman.sh | 12 +---
version.sh |5 -
2 files changed, 13 insertions(+), 4
commit a0655ccaef30d56456e41911b74a9bb917fd103c
Author: Ximin Luo infini...@torproject.org
Date: Thu Feb 13 13:54:19 2014 +
use BRE instead of ERE to support FreeBSD better
---
mkman.sh |6 +++---
proxy/modules/nodejs/Makefile |2 +-
version.sh
commit 14dadf0fe2d4e284decaa478b1a227c51c2a2d24
Author: Ximin Luo infini...@torproject.org
Date: Thu Feb 13 14:09:51 2014 +
remove one last use of `sed -r` and fix replacement snippet to apply to the
plain non-Debianised package
---
proxy/modules/nodejs/Makefile |3 +--
1 file
commit d67a8f8bdea1e64ec7370ab677e7b3e0b0d37920
Author: Ximin Luo infini...@torproject.org
Date: Thu Feb 13 14:05:49 2014 +
fix bug that was causing mkman to screw with the section headings
---
mkman.sh |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
4f44bbc..32c0c9c 100755
--- a/obfs-flash-client
+++ b/obfs-flash-client
@@ -7,6 +7,7 @@ import sys
from collections import namedtuple
from functools import partial
+# TODO(infinity0): this is temporary workaround until we do #10047
if sys.platform == 'win32':
os.environ[KILL_CHILDREN_ON_DEATH
commit c2ecc7e035a81bcd9cc23784d4be5dfac963beac
Merge: a5bb87f 951616c
Author: Ximin Luo infini...@torproject.org
Date: Tue Feb 11 14:28:38 2014 +
Merge branch 'fix-w32-kill'
obfs-flash-client |2 ++
setup.py | 14 --
2 files changed, 14 insertions(+), 2
commit 14f5823a0965b29aa8b41682295b1a75ab78c152
Author: Ximin Luo infini...@gmx.com
Date: Tue Oct 29 21:09:57 2013 +
use the autokill workaround mentioned in 10006
---
obfs-flash-client |2 ++
1 file changed, 2 insertions(+)
diff --git a/obfs-flash-client b/obfs-flash-client
index
commit 951616c9789689d572d52ee2764b0a3ca2bd0bb3
Author: Ximin Luo infini...@gmx.com
Date: Fri Nov 1 18:04:25 2013 +
add txsocksx to direct deps, and zope.interface to indirect deps, in py2exe
setup script
- works around py2exe on wine silently not finding them
---
setup.py | 14
commit 0ab9f052b6aaa30506c1f7db6c6718bdef8dcd62
Author: Ximin Luo infini...@gmx.com
Date: Fri Jan 17 22:43:51 2014 +
fix VERBOSE flag test in flashproxy-test
---
proxy/flashproxy-test.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxy/flashproxy-test.js
commit aa66587104addced0bd40918e8108011c8cd5c8b
Author: Ximin Luo infini...@gmx.com
Date: Fri Jan 17 22:56:59 2014 +
run flashproxy-test.js using nodejs instead of rhino. it is much quicker
and doesn't require a JVM.
---
proxy/flashproxy-test.js | 23 ---
1 file
commit 0625a91d988d92694f58c98a253dce4d10b1842a
Author: Ximin Luo infini...@gmx.com
Date: Sat Jan 18 00:33:22 2014 +
bump facilitator version to match rest of package
---
facilitator/configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit 1f330117b79887908785ff39f2f0a7584976be93
Author: Ximin Luo infini...@gmx.com
Date: Tue Jan 7 16:37:52 2014 +
fix copyright years
---
LICENSE |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/LICENSE b/LICENSE
index 865b15d..986dda9 100644
--- a/LICENSE
+++
commit 2af442f799785cf0baa4c18aa85cfdd507986633
Author: Ximin Luo infini...@gmx.com
Date: Tue Jan 7 16:36:51 2014 +
install examples to pkgdatadir rather than docdir
- they are used by post-install scripts so not strictly documentation
---
facilitator/Makefile.am |2 +-
1 file
commit 91282e4ca9e1ae4d6b12fb617ef63d1c62bff84d
Author: Ximin Luo infini...@gmx.com
Date: Wed Dec 11 15:15:13 2013 +
update ChangeLog for recent merges and commits
---
ChangeLog | 14 ++
1 file changed, 14 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index
commit a06329ef328b3f0bc93e319647e8a620ac65e03d
Merge: 67a9da9 f2ef8d1
Author: Ximin Luo infini...@gmx.com
Date: Fri Dec 6 19:56:22 2013 +
Merge branch 'help2man'
facilitator/.gitignore |1 +
facilitator/HACKING |2 +-
facilitator/INSTALL |
commit f2ef8d1080be67ea51488615336e8fe21df469fc
Author: Ximin Luo infini...@gmx.com
Date: Mon Dec 2 16:04:03 2013 +
add a help2man man page for the nodejs browser proxy
---
proxy/modules/nodejs/.gitignore |1 +
proxy/modules/nodejs/Makefile | 18 --
2 files
commit f20d128c0b2a00c6398e179bc35a1351668d16b0
Author: Ximin Luo infini...@gmx.com
Date: Wed Dec 4 17:13:15 2013 +
add an install target to Makefile for convenience
---
Makefile |4
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 0303862..143b098
commit 7211f2f2cc4a070bdda34fb41c6468cb54f748fa
Author: Arlo Breault arlo...@gmail.com
Date: Thu Nov 21 16:25:54 2013 -0800
Bump node.js package version.
This is independent of the Makefile version.
See: 788799ba2ab26c43a0575e2b188fffcb5477ddab
---
commit 5cdc3a59a7133fa7c4ac398b12225712ae30a851
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 23:20:30 2013 +
node-flashproxy: be looser in the version requirements
---
proxy/modules/nodejs/package.json |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
commit 160fcb894bb9f9c1d8748072953ed1ba0d60f6ad
Author: Arlo Breault arlo...@gmail.com
Date: Thu Nov 21 16:21:27 2013 -0800
Add an .npmignore
Otherwise npm picks up .gitignore and fails to include the copied
flashproxy.js file in the package.
---
0 files changed
diff --git
commit 611931cdcde313d794c7e16ed251c11a93a6e9e3
Merge: 3406eb1 7211f2f
Author: Ximin Luo infini...@gmx.com
Date: Fri Nov 22 13:19:08 2013 +
Merge branch 'nodejs-cli'
proxy/modules/nodejs/INSTALL |2 +-
proxy/modules/nodejs/main.js | 41
commit b36824550642af90386eb214952fc8365f0ced3a
Author: Arlo Breault arlo...@gmail.com
Date: Thu Nov 21 16:19:37 2013 -0800
Use tilde version range for dependencies.
Keeps them reasonably close with less chance for breaking changes.
---
proxy/modules/nodejs/package.json |6
commit 293987a90a7bd2aaa19aeac90ad076788b6e73c4
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 23:19:59 2013 +
node-flashproxy: read unix-style command line options using optimist
- this is backwards-compatible; non-hyphenated args are concatenated to the
querystring
---
commit 0f6d43d6f9b08876f5d19bd9ffeb5b4e404164de
Author: Ximin Luo infini...@gmx.com
Date: Tue Oct 15 15:08:35 2013 +0100
- fix VPATH build and `make distcheck`
---
facilitator/Makefile.am |2 ++
facilitator/facilitator-test.py |4 +++-
2 files changed, 5 insertions(+), 1
commit c228341a056f0380bb5d70d84ed9e0d2f67956bb
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 18:16:49 2013 +
add short descriptions to the top of all programs.
---
facilitator/facilitator |3 +++
facilitator/facilitator-email-poller |3 +++
commit def182a2501070fa5dfcb9793fe977c58b0861ae
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 18:57:23 2013 +
make fac.py in flashproxy-common not soft-implicit-depends on
facilitator-reg
- to do this, we turn put_reg_base64 into a generic run-a-program function
- also
commit aafd15b8927e0d7519152d3e88f655b571037f04
Author: Ximin Luo infini...@gmx.com
Date: Fri Sep 13 14:05:52 2013 +0100
install the appengine files as data files in $(pkgdatadir)
---
facilitator/Makefile.am |2 ++
facilitator/appengine/README|4 ++--
commit d736b4b218077b09666f38e21723b00fca611df8
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 4 16:31:50 2013 +
don't hard code /etc/default; try to detect the correct one and bug the
user to specify it, if that fails
---
facilitator/Makefile.am |5 +++--
-poller
b/facilitator/facilitator-email-poller
index be1ab58..f087507 100755
--- a/facilitator/facilitator-email-poller
+++ b/facilitator/facilitator-email-poller
@@ -21,6 +21,9 @@ import fac
from hashlib import sha1
from M2Crypto import SSL
+# TODO(infinity0): we only support gmail so this is OK
commit 26db40e275804d75ecb86b0c1922f0af2a53aa2f
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 21:19:26 2013 +
email-poller: move main loop inside a main() function
- so we can import it without running it, useful for the upcoming help2man
stuff
---
commit 2c5b9739314833c17152866f04f4beb05647093c
Author: Ximin Luo infini...@gmx.com
Date: Wed Nov 6 13:27:29 2013 +
only try to detect initconfdir if we actually want initscripts, and simplify
---
facilitator/configure.ac | 25 +++--
1 file changed, 15
commit 3fc93f88e8cd22c12861034b5389348f8a5c4db3
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 14:37:32 2013 +
rename relays to facilitator-relays and integrate it into the install
process
---
facilitator/Makefile.am |3 ++-
commit d3e27be5f375a80917c84e0881aa5c78bfd3d1f1
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 19:15:29 2013 +
split name-resolution behaviour out of parse_addr_spec to match
flashproxy-common
- keep named relays as names rather than numeric addresses
---
facilitator/fac.py
commit 35f0bd7c386b8af23862f89e1d97aa9954610f3c
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 13:48:41 2013 +
mention the need to set RUN_DAEMON=yes
---
facilitator/README |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/facilitator/README
commit 871e4c394dbe81efbe350185624d9ac81fcd5133
Author: Ximin Luo infini...@gmx.com
Date: Wed Nov 13 17:28:53 2013 +
use common certificate pinning code in facilitator-email-poller
---
facilitator/facilitator-email-poller | 63 +++---
1 file changed, 5
commit 8d5eeb8bd9f589451d95d6e6a2ba3f2697c8cab0
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 16:56:14 2013 +
document and add tests for the None/ default behaviour of parse_addr_spec
---
flashproxy/test/test_util.py |8
flashproxy/util.py | 14
commit a54308b9e74288b16a1fa23e46fd89be71169757
Author: Ximin Luo infini...@gmx.com
Date: Wed Nov 6 13:41:47 2013 +
rename default user to fp-facilitator for consistency with production names
elsewhere
---
facilitator/configure.ac |2 +-
1 file changed, 1 insertion(+), 1
of reg-daemon.pub into the appropriate place.
+TODO(infinity0): find a better solution for this.
+
+You should also edit /etc/flashproxy/reg-email.pass to contain your
+app-specific Gmail password; see doc/gmail-setup.txt for instructions.
+
Uninstall.
# make pre-remove uninstall post-remove
commit 0080b8dff74c583682867eb190e49237fee3b9db
Author: Ximin Luo infini...@gmx.com
Date: Thu Sep 12 17:03:08 2013 +0100
use GNU autotools to create an installable package, including docs
---
Makefile |5 +-
facilitator/.gitignore
commit 4afdef621e3061b0254ab18424d6cb4ac83129b1
Author: Ximin Luo infini...@gmx.com
Date: Tue Oct 15 16:15:20 2013 +0100
- rm CLEANFILES; it's only needed if we have custom rules to build them
---
facilitator/Makefile.am |4
1 file changed, 4 deletions(-)
diff --git
commit e2b902fbf0abf768bfacda495fa10868aea26568
Author: Ximin Luo infini...@gmx.com
Date: Sun Sep 15 17:37:12 2013 +0100
readd check target and change the test port so as to not conflict with
existing service
---
facilitator/Makefile.am |3 +++
facilitator/facilitator-test |2
commit 471a4bc234be1bf7e5f33142b1d1c1688ee50bbf
Author: Ximin Luo infini...@gmx.com
Date: Sat Sep 14 15:59:51 2013 +0100
handle initscripts in a more robust way and provide an option not to
install them
---
facilitator/Makefile.am | 76 +-
/local/etc/flashproxy/reg-daemon.{key,pub}.
-You will have to edit flashproxy-reg-email (in the client package) and
-copy the contents of reg-daemon.pub into the appropriate place.
-TODO(infinity0): find a better solution for this.
+You should securely distribute the public key to anyone that wants
commit fc251f7428f77fe51aee751cce031bb720acd961
Author: Ximin Luo infini...@gmx.com
Date: Thu Sep 12 17:03:20 2013 +0100
add reference install scripts and integrate them into the instructions
---
facilitator/INSTALL | 21 +++
facilitator/Makefile.am
commit dfd80a48930b328a8410172bc74fcfdf8593428f
Merge: 751158f a54308b
Author: Ximin Luo infini...@gmx.com
Date: Wed Nov 13 16:23:40 2013 +
Merge branch 'fac-build'
Conflicts:
Makefile
facilitator/Makefile
facilitator/facilitator-test.py
commit 0a4930dc607788d96c37d032d13bb80aebb8ad6e
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 13:49:04 2013 +
need to install a webserver for auto-detection of cgibindir
---
facilitator/INSTALL |4
1 file changed, 4 insertions(+)
diff --git a/facilitator/INSTALL
commit 324da7ea4263249a57e5085043ba447122b665cb
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 19:11:22 2013 +
match facilitator version with rest of package.
---
facilitator/configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
@@ copy the contents of reg-daemon.pub into the appropriate
place.
TODO(infinity0): find a better solution for this.
You should also edit /usr/local/etc/flashproxy/reg-email.pass to contain your
-app-specific Gmail password; see doc/gmail-setup.txt for instructions.
+app-specific Gmail password; see
commit 7ed4f653df3b7b6ec92fef41efd3f2295bd097d8
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 4 22:04:11 2013 +
document appspot method more thoroughly, and rename howtos to be consistent
with the method name.
- also ditch the url method since it is not really a separate method
commit 82e6dc766a2625f14599968e82fe3c6e5fbc704c
Author: Ximin Luo infini...@gmx.com
Date: Thu Oct 10 11:31:03 2013 +0100
fix errors in apache example config and add instructions on enabling SSL
and HSTS
---
facilitator/examples/fp-facilitator |8 ++--
1 file changed, 6
commit 55986435a04d7b547ebfe430915b69445211c588
Author: Ximin Luo infini...@gmx.com
Date: Wed Sep 11 17:51:24 2013 +0100
separate child tests and link in future websocket-transport tests
---
Makefile | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Makefile
commit 04ce42a22197f4bfef66fdd1934b6d5ac594c821
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 14:06:36 2013 +
in extra-install tasks, use ${} rather than $() syntax for easier copying
into distro-specific scripts
---
facilitator/Makefile.am | 40
commit cf9ebbd24c9db0f7996b8a758ea74f7b1375a9d4
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 14:46:47 2013 +
safe logging is appropriate for most cases, not just high-risk
---
facilitator/default/facilitator |2 +-
facilitator/default/facilitator-email-poller |
commit 134e55a2337be2e51b3b68becb21c8b8678e9769
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 15:17:14 2013 +
FP_FACILITATOR can contain a base path too
---
facilitator/appengine/config.go |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
commit 720861831e03e5a7f9cd726dd3ea73c3e7f3f376
Author: Ximin Luo infini...@gmx.com
Date: Wed Oct 9 23:36:10 2013 +0100
don't clobber secret files during post-install, and don't remove them
during pre-remove
---
facilitator/INSTALL |5 +
facilitator/Makefile.am | 26
commit 4811b51af8a5bf5c97dd1053e89c091a07916f4a
Author: Ximin Luo infini...@gmx.com
Date: Tue Sep 24 20:11:41 2013 +0100
source the email address from a defaults file, don't hard code it
---
facilitator/INSTALL|6 --
facilitator/Makefile.am
commit 15f0aa4a1750793b1128ff893edd69434dd900ea
Author: Ximin Luo infini...@gmx.com
Date: Tue Oct 15 16:14:23 2013 +0100
add more initscripts default files for users to override various options
---
facilitator/Makefile.am|2 +-
facilitator/default/facilitator
commit b318c3e51e881e61d8912959b08c15b79c6a961a
Author: Ximin Luo infini...@gmx.com
Date: Tue Nov 5 00:08:09 2013 +
some more doc tweaks
- more precise autotools dependencies
- note more config locations in README
- fix appengine README relative path
- note about public
..7e117ba 100644
--- a/facilitator/Makefile.am
+++ b/facilitator/Makefile.am
@@ -2,6 +2,9 @@
fpfacilitatoruser = @fpfacilitatoruser@
initconfdir = @initconfdir@
+# TODO(infinity0): switch this to @cgibindir@ once we replace fac.py with
+# flashproxy-common, so that we install facilitator.cgi
to edit flashproxy-reg-email (in the client package) and
copy the contents of reg-daemon.pub into the appropriate place.
TODO(infinity0): find a better solution for this.
-You should also edit /etc/flashproxy/reg-email.pass to contain your
+You should also edit /usr/local/etc/flashproxy/reg
commit ce622cbf25a754dcac838f2af350b9c49ecf12b5
Author: Ximin Luo infini...@gmx.com
Date: Sat Sep 14 16:55:52 2013 +0100
disable initscripts by default since it ignores ${prefix} and causes `make
distcheck` to fail
---
facilitator/INSTALL |2 +-
facilitator/configure.ac |7
commit cfbcbaea65acc1f6b2999785211672cf931135d0
Author: Ximin Luo infini...@gmx.com
Date: Tue Oct 15 23:18:28 2013 +0100
- drop autoconf min version to 2.68, version in Ubuntu precise
---
facilitator/configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit b7aab78ab124884cac44339203721f9609e56548
Author: Ximin Luo infini...@gmx.com
Date: Thu Nov 21 14:17:26 2013 +
more specific rm in remove-{secrets,symlinks} and add remove-daemon-data to
purge logs and other data
- also don't symlink no-longer-existant appengine/README
---
commit ca032bf816f8812221cdb56fe1d3c5fdd6b1cf9c
Author: Ximin Luo infini...@gmx.com
Date: Wed Nov 6 01:13:15 2013 +
tweak apache instructions
- point out that current instructions are Debian-specific
- move example conf to have a .conf extension, mandated by newer versions
of
commit 60cae9bc22834538d8fc5f3c1731b9415dc66477
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 18 19:45:44 2013 +
auto-mkdir directories used by the initscripts
---
facilitator/Makefile.am |4
1 file changed, 4 insertions(+)
diff --git a/facilitator/Makefile.am
commit 1ab29f3a4aa4c9243ab82931f778a0e9d7ce9c85
Author: Ximin Luo infini...@gmx.com
Date: Mon Nov 4 21:07:38 2013 +
move some documentation around for a more coherent structure
- separate HTTP-rendezvous-specific info out of facilitator-howto.txt
- move technical design info
commit 04afd3a2954946d54e12f1da090f368c09a2689f
Author: Ximin Luo infini...@gmx.com
Date: Wed Oct 9 14:44:01 2013 +0100
use automake's python test runner
---
facilitator/.gitignore |6 +-
facilitator/Makefile.am | 10 +-
facilitator/configure.ac|2 +
1 - 100 of 218 matches
Mail list logo
