psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Merge remote branch 'origin'

This commit is contained in:
psyc://psyced.org/~lynX 2014-05-03 12:43:12 +02:00
parent 25d6a5d4cb 8569644285
commit f5da929286
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/psyconf
View File

@ -376,7 +376,9 @@ X
$torify = "torsocks";
say "Enabling PSYC federation over Tor: Using "
. "torsocks wrapper around psyced.\n";
say "Warning: Maybe, if you install unbound.conf, it actually works.\n"
say "Warning: Make sure either dnsmasq.conf or "
. "unbound.conf are in\n"
. "place for .onion resolution to function.\n";
}
}
## ldmud bug number two

8
tor/dnsmasq.conf Normal file
View File

@ -0,0 +1,8 @@
# if you already have dnsmasq on your system,
# this should go into /etc/dnsmasq.conf:
server=/onion/127.0.0.1#9053
# or you can pass --server=/onion/127.0.0.1#9053
# to dnsmasq on the command line

7
tor/unbound.conf
View File

@ -1,7 +1,8 @@
# tell a localhost "unbound" DNS server to
# forward .onion requests into Tor
# courtesy of tg of secushare.org
# if you don't want dnsmasq on your system you
# can tell a localhost "unbound" DNS server to
# forward .onion requests into Tor.
#
# courtesy of tg of secushare.org
# see the unbound.conf(5) man page for more.
server:

8
world/default/en/jabber.textdb
View File

@ -159,7 +159,13 @@ _failure_filter_strangers
|<message to='[_INTERNAL_target_jabber]' from='[_INTERNAL_source_jabber]' type='error'><body>{_failure_unsupported_function_whisper}</body><error code='503' type='cancel'><service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/><text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>{_failure_filter_strangers}</text></error></message>
_failure_unsuccessful_delivery_timeout_dialback
|## happens so frequently it is mostly just annoying
|## happens so frequently it is mostly just annoying (and breaks OTR)
_failure_unsuccessful_delivery_resolve
|## happens almost as frequently and users don't care to know
_failure_unsuccessful_delivery_repeated
|## do users want to know the complete truth about federation?
_notice_received_email_UNUSED
|<message from='[_INTERNAL_source_jabber]' to='[_INTERNAL_target_jabber]' type='headline'><body>{_notice_received_email}</body></message>