diff options
| author | t3sserakt <t3ss@posteo.de> | 2021-04-25 16:02:08 +0200 |
|---|---|---|
| committer | t3sserakt <t3ss@posteo.de> | 2021-04-25 16:02:52 +0200 |
| commit | cef6317f17a706647c0a5d5f7e52548a7130b713 (patch) | |
| tree | cc29c4d4c2ae83115a313b32653757e370b88c6c /contrib | |
| parent | 9ffa19269054bf1e569fe584c0c51a00205a735d (diff) | |
| parent | b996ba4156678b6a0a551b9a932867b2ade42344 (diff) | |
| download | gnunet-cef6317f17a706647c0a5d5f7e52548a7130b713.tar.gz gnunet-cef6317f17a706647c0a5d5f7e52548a7130b713.zip | |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.inc | 3 | ||||
| -rw-r--r-- | contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd | 3 | ||||
| -rw-r--r-- | contrib/packages/alpine/gnunet/gnunet.xsession | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc index c737a07f8..a563ef4a1 100644 --- a/contrib/Makefile.inc +++ b/contrib/Makefile.inc | |||
| @@ -8,7 +8,8 @@ BUILDCOMMON_SHLIB_FILES = \ | |||
| 8 | build-common/sh/lib.sh/existence_python.sh \ | 8 | build-common/sh/lib.sh/existence_python.sh \ |
| 9 | build-common/sh/lib.sh/msg.sh \ | 9 | build-common/sh/lib.sh/msg.sh \ |
| 10 | build-common/sh/lib.sh/progname.sh \ | 10 | build-common/sh/lib.sh/progname.sh \ |
| 11 | build-common/sh/lib.sh/version_gnunet.sh | 11 | build-common/sh/lib.sh/version_gnunet.sh \ |
| 12 | build-common/LICENSE | ||
| 12 | 13 | ||
| 13 | BUILDCOMMON_CONF_FILES = \ | 14 | BUILDCOMMON_CONF_FILES = \ |
| 14 | build-common/conf/.dir-locals.el \ | 15 | build-common/conf/.dir-locals.el \ |
diff --git a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd index 3c5a22ee2..2a4dcc1c4 100644 --- a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd +++ b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd | |||
| @@ -21,12 +21,10 @@ start() { | |||
| 21 | # Customize gnunet.conf | 21 | # Customize gnunet.conf |
| 22 | port=$((8000+$(id -u $user))) | 22 | port=$((8000+$(id -u $user))) |
| 23 | gnunet-config -c /home/$user/.config/gnunet.conf \ | 23 | gnunet-config -c /home/$user/.config/gnunet.conf \ |
| 24 | --rewrite \ | ||
| 25 | --section=gns-proxy \ | 24 | --section=gns-proxy \ |
| 26 | --option=IMMEDIATE_START \ | 25 | --option=IMMEDIATE_START \ |
| 27 | --value=YES | 26 | --value=YES |
| 28 | gnunet-config -c /home/$user/.config/gnunet.conf \ | 27 | gnunet-config -c /home/$user/.config/gnunet.conf \ |
| 29 | --rewrite \ | ||
| 30 | --section=gns-proxy \ | 28 | --section=gns-proxy \ |
| 31 | --option=OPTIONS \ | 29 | --option=OPTIONS \ |
| 32 | --value="-p $port" | 30 | --value="-p $port" |
| @@ -79,7 +77,6 @@ stop() { | |||
| 79 | 77 | ||
| 80 | # Disable gns-proxy in config | 78 | # Disable gns-proxy in config |
| 81 | gnunet-config -c /home/$user/.config/gnunet.conf \ | 79 | gnunet-config -c /home/$user/.config/gnunet.conf \ |
| 82 | --rewrite \ | ||
| 83 | --section=gns-proxy \ | 80 | --section=gns-proxy \ |
| 84 | --option=IMMEDIATE_START \ | 81 | --option=IMMEDIATE_START \ |
| 85 | --value=NO | 82 | --value=NO |
diff --git a/contrib/packages/alpine/gnunet/gnunet.xsession b/contrib/packages/alpine/gnunet/gnunet.xsession index 944d47a27..dead5c783 100644 --- a/contrib/packages/alpine/gnunet/gnunet.xsession +++ b/contrib/packages/alpine/gnunet/gnunet.xsession | |||
| @@ -10,7 +10,6 @@ if [ "$gnunet_proxy" ]; then | |||
| 10 | port=$((8000+$(id -u $user))) | 10 | port=$((8000+$(id -u $user))) |
| 11 | 11 | ||
| 12 | gnunet-config -c /home/$user/.config/gnunet.conf \ | 12 | gnunet-config -c /home/$user/.config/gnunet.conf \ |
| 13 | --rewrite \ | ||
| 14 | --section=gns-proxy \ | 13 | --section=gns-proxy \ |
| 15 | --option=OPTIONS \ | 14 | --option=OPTIONS \ |
| 16 | --value="-p $port" | 15 | --value="-p $port" |