summaryrefslogtreecommitdiffstats
path: root/doc/examples
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2015-01-14 21:58:29 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2015-01-14 21:58:29 +0100
commitba3afc50b3819694f009adc6db5a966f524242f6 (patch)
tree569dac7ae57076b864788b296dade9a77a6e63cf /doc/examples
parent0a69b958bdfd8da663577be2be557a1bc319cd12 (diff)
downloadfastd-ba3afc50b3819694f009adc6db5a966f524242f6.tar
fastd-ba3afc50b3819694f009adc6db5a966f524242f6.zip
Update OpenWrt scripts
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/openwrt/fastd.config8
-rw-r--r--doc/examples/openwrt/fastd.init2
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/examples/openwrt/fastd.config b/doc/examples/openwrt/fastd.config
index e2c6db6..7b13fc8 100644
--- a/doc/examples/openwrt/fastd.config
+++ b/doc/examples/openwrt/fastd.config
@@ -31,8 +31,9 @@ config fastd sample_config
# list bind '[::]:1337'
# "method null" uses no encryption or MAC
- # "method xsalsa20-poly1305" uses the XSalsa20 encryption ad the Poly1305 MAC
- list method 'xsalsa20-poly1305'
+ # "method salsa2012+umac" uses the Salsa20/12 encryption and the UMAC message authentication code
+ # See the fastd documentation for the other supported encryption methods
+ list method 'salsa2012+umac'
# "mode tap" will create an ethernet tunnel (tap device),
# "mode tun" will create an IP tunnel (tun device).
@@ -152,5 +153,8 @@ config peer_group sample_group
# Configures an additional peer directory for this group
# list config_peer_dir '/etc/fastd/sample_config/peers2'
+ # Methods set in the peer group override the ones configured in the parent group or globally
+# list method 'null'
+
# Limits the maximum number of connections to peers in this group (optional)
# option peer_limit 5
diff --git a/doc/examples/openwrt/fastd.init b/doc/examples/openwrt/fastd.init
index 0fd8f1a..e39c4d9 100644
--- a/doc/examples/openwrt/fastd.init
+++ b/doc/examples/openwrt/fastd.init
@@ -219,7 +219,7 @@ generate_peer_group_config() {
if [ -z "$update_only" ]; then
generate_option "$group" config_string_peer_group
append_options "$group" config \
- config config_peer config_peer_dir peer_limit
+ config config_peer config_peer_dir method peer_limit
fi
update_peer_group "$net" "$group_dir" "$group" "$update_only"