aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrexxnor <rexxnor+gnunet@brief.li>2019-08-18 23:10:49 +0200
committerrexxnor <rexxnor+gnunet@brief.li>2019-08-18 23:12:43 +0200
commitaf287112facab73fb19b18c4dabc4008f3e188a7 (patch)
treef31ef4788de0c9cf4894abfe3cd2869a39773140
parent1f62e1a0bd454cc8b1ae9711d40b42d792f88b1c (diff)
downloadwww-af287112facab73fb19b18c4dabc4008f3e188a7.tar.gz
www-af287112facab73fb19b18c4dabc4008f3e188a7.zip
removed bandwith unlimited, made archlinux tutorial more generic, deleted old template
-rw-r--r--template/install-on-archpi.html.j265
-rw-r--r--template/install-on-macos.html.j217
-rw-r--r--template/install.html.j212
3 files changed, 44 insertions, 50 deletions
diff --git a/template/install-on-archpi.html.j2 b/template/install-on-archpi.html.j2
index fccf46e3..1ef61eb2 100644
--- a/template/install-on-archpi.html.j2
+++ b/template/install-on-archpi.html.j2
@@ -3,20 +3,22 @@
3<article class="container"> 3<article class="container">
4 4
5 <header> 5 <header>
6 <h1>{{ _("Tutorial: GNUnet on Archlinux/Pi") }}</h1> 6 <h1>{{ _("Tutorial: GNUnet on Arch Linux/Pi") }}</h1>
7 </header> 7 </header>
8 8
9 9
10 Welcome to this GNUnet tutorial for Archlinux on a Raspberry Pi 3. If you want 10 Welcome to this GNUnet tutorial for Arch Linux. This was also tested for the
11 to run a GNUnet node on a separte system, permanently online, with low energy 11 Raspberry Pi 3 image of Arch Linux. If you want to run a GNUnet node on a
12 consumption, this might be the thing for you. This tutorial shows you how to 12 separte system, permanently online, with low energy consumption, this might
13 install, run, and operate it. 13 be the thing for you. This tutorial shows you how to install, run, and
14 operate it.
14 15
15 <h2>{{ _("Requirements") }}</h2> 16 <h2>{{ _("Requirements for Raspberry Pi 3") }}</h2>
16 17
17 <p>First you need the hardware. This tutorial works with a Raspberry Pi 3. The 18 <p>First you need the hardware. This tutorial works with a Raspberry Pi 3 or
18 other Pi versions I haven't tested, but they should probably work, too. To 19 any Arch Linux system. The other Pi versions I haven't tested, but they should
19 install Archlinux on the Pi3, follow the instructions from <a 20 probably work, too. To install Arch Linux on the Pi3, follow the instructions
21 from <a
20 href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3">archlinuxarm.org</a>.</p> 22 href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3">archlinuxarm.org</a>.</p>
21 23
22 <p>That was easy, right? Our goal now is to build GNUnet from source. So, let's 24 <p>That was easy, right? Our goal now is to build GNUnet from source. So, let's
@@ -26,13 +28,13 @@
26 > sudo pacman -S base-devel 28 > sudo pacman -S base-devel
27 </code></p> 29 </code></p>
28 30
29 <p>Now we can continue to install the following Archlinux dependencies to 31 <p>Now we can continue to install the following Arch Linux dependencies to
30 compile GNUnet on our Pi.</p> 32 compile GNUnet.</p>
31 33
32 <p><code> 34 <p><code>
33 $ pacman -Su libmicrohttpd libgcrypt gnurl libunistring gnutls libidn 35 $ pacman -Su libmicrohttpd libgcrypt gnurl libunistring gnutls libidn
34 libextractor openssl libltdl sqlite texinfo which gettext zlib 36 libextractor openssl libltdl sqlite texinfo which gettext zlib
35 pkg-config git miniupnpc libextractor jansson nim 37 pkg-config git miniupnpc libextractor jansson
36 </code></p> 38 </code></p>
37 39
38 <h2>{{ _("Get the Source Code") }}</h2> 40 <h2>{{ _("Get the Source Code") }}</h2>
@@ -41,21 +43,39 @@
41 in the next step:<p> 43 in the next step:<p>
42 44
43 <p><code> 45 <p><code>
44 > git clone https://gnunet.org/git/gnunet.git<br> 46 > git clone https://gnunet.org/git/gnunet.git<br>
45 </code></p> 47 </code></p>
46 48
47 <p>Now it's time to compile GNUnet.</p> 49 <p>Now it's time to compile and install GNUnet.</p>
48 50
49 <p><code> 51 <p><code>
50 > cd gnunet<br> 52 > cd gnunet<br>
53 > export GNUNET_PREFIX=/usr # for example, other locations possible
51 > ./bootstrap # Run this to generate the configure files.<br> 54 > ./bootstrap # Run this to generate the configure files.<br>
52 > ./configure # Use --help to see the various flags available to you.<br> 55 > ./configure --prefix=$GNUNET_PREFIX --disable-documentation # Use --help to see the various flags available to you.<br>
53 > make -j$(nproc || echo -n 1)<br> 56 > make -j$(nproc || echo -n 1)<br>
54 > sudo make install<br> 57 > sudo make install<br>
55 </code></p> 58 </code></p>
56 59
57 <p>Congrats! GNUnet is now installed!</p> 60 <p>Congrats! GNUnet is now installed!</p>
58 61
62 <h3>{{ _("In Addition: gnunet-gtk") }}</h3>
63
64 <p>For gnunet-gtk we need a few more dependencies.</p>
65
66 <p><code>
67 $ pacman -Su gtk3 glade
68 </code></p>
69 <code>
70 $ cd ../gnunet-gtk<br>
71 $ ./bootstrap<br>
72 $ export GNUNET_PREFIX=/usr # for example, other locations possible
73 $ export CFLAGS="-g -Wall -O0"<br>
74 $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-gnunet=$GNUNET_PREFIX<br>
75 $ make -j$(nproc || echo -n 1)<br>
76 $ sudo make install
77 </code>
78
59 <h2>{{ _("Run") }}</h2> 79 <h2>{{ _("Run") }}</h2>
60 80
61 <p>By default GNUnet looks in our home directory for the file 81 <p>By default GNUnet looks in our home directory for the file
@@ -65,24 +85,11 @@
65 > touch ~/.config/gnunet.conf 85 > touch ~/.config/gnunet.conf
66 </code></p> 86 </code></p>
67 <br /> 87 <br />
68 <p>
69 It's reccomended that you increase your bandwidth restrictions
70 from the acutely low defaults. The example below sets the WAN
71 and LAN limits to the value "unlimited".
72 </p>
73 <br />
74 <code>
75 $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
76 $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br />
77 $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
78 $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br />
79 </code>
80 <br />
81 <p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart 88 <p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart
82 Manager).</p> 89 Manager).</p>
83 90
84 <p><code> 91 <p><code>
85 > gnunet-arm -s 92 > gnunet-arm -s
86 </code></p> 93 </code></p>
87 94
88 <p>It starts the default GNUnet services. We can list them with the -I option:</p> 95 <p>It starts the default GNUnet services. We can list them with the -I option:</p>
diff --git a/template/install-on-macos.html.j2 b/template/install-on-macos.html.j2
index 2529adbe..e97efd75 100644
--- a/template/install-on-macos.html.j2
+++ b/template/install-on-macos.html.j2
@@ -17,7 +17,7 @@
17 <h2>{{ _("Requirements") }}</h2> 17 <h2>{{ _("Requirements") }}</h2>
18 18
19 <p> 19 <p>
20 As a bare minimum, we recommend you install <a href="https://brew.sh">homebrew</a> and <a href="https://developer.apple.com/xcode/">XCode</a> before reading any further. 20 As a bare minimum, we recommend you install <a href="https://brew.sh">homebrew</a>. If you want to install GNUnet from source you should also install <a href="https://developer.apple.com/xcode/">XCode</a> and follow the specific instructions below.
21 </p> 21 </p>
22 22
23 23
@@ -54,19 +54,6 @@
54 </p> 54 </p>
55 <br /> 55 <br />
56 <p> 56 <p>
57 It's reccomended that you increase your bandwidth restrictions
58 from the acutely low defaults. The example below sets the WAN
59 and LAN limits to the value "unlimited".
60 </p>
61 <br />
62 <code>
63 $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
64 $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br />
65 $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
66 $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br />
67 </code>
68 <br />
69 <p>
70 GNUnet and its services are managed using the command line tool `gnunet-arm` 57 GNUnet and its services are managed using the command line tool `gnunet-arm`
71 (Automatic Restart Manager). 58 (Automatic Restart Manager).
72 <br/> 59 <br/>
@@ -163,7 +150,7 @@ vpn (gnunet-service-vpn)
163 debug symbols that can be displayed with a debugger). Otherwise choose the 150 debug symbols that can be displayed with a debugger). Otherwise choose the
164 production version. 151 production version.
165 </p> 152 </p>
166 153
167 <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4> 154 <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
168 155
169 <p> 156 <p>
diff --git a/template/install.html.j2 b/template/install.html.j2
index 84c581a5..9e7f8e94 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -9,17 +9,17 @@
9 <div class="row container justify-content-center"> 9 <div class="row container justify-content-center">
10 <div class="col-md"> 10 <div class="col-md">
11 {% trans %} 11 {% trans %}
12 <p>The following GNUnet installation instructions help you building from source for your distribution.</p> 12 <p>The following GNUnet installation instructions help you building from source for your distribution.</p>
13 <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p> 13 <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p>
14 <p>You have already installed GNUnet and want to use it? 14 <p>You have already installed GNUnet and want to use it?
15 <a href="https://gnunet.org/en/use">Check this out!</a> </p> 15 <a href="https://gnunet.org/en/use">Check this out!</a> </p>
16 {% endtrans %} 16 {% endtrans %}
17 </div> 17 </div>
18 <div class="col-md"> 18 <div class="col-md">
19 {% trans %} 19 {% trans %}
20 <p>Please be aware that this project is still in an early alpha 20 <p>Please be aware that this project is still in an early alpha
21 stage when it comes to running software &#8211; its not an easy task 21 stage when it comes to running software &#8211; its not an easy task
22 to rewrite the whole Internet! We are happy to get your 22 to rewrite the whole Internet! We are happy to get your
23 <a href="engage.html">helping hand</a> anytime!</p> 23 <a href="engage.html">helping hand</a> anytime!</p>
24 <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p> 24 <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p>
25 <p>If you have any queries about the installation or the usage, please <a href="engage.html">get in touch!</a></p> 25 <p>If you have any queries about the installation or the usage, please <a href="engage.html">get in touch!</a></p>
@@ -50,7 +50,7 @@
50 </div> 50 </div>
51 <div class="col-md"> 51 <div class="col-md">
52 <p><a href="install-on-archpi.html"><img src="{{ url('static/images/archlinux-logo.svg') }}" class="distro-logo" style="width:300px;height:auto"></a></p> 52 <p><a href="install-on-archpi.html"><img src="{{ url('static/images/archlinux-logo.svg') }}" class="distro-logo" style="width:300px;height:auto"></a></p>
53 <h3>Arch-Pi</h3> 53 <h3>Arch Linux/Arch-Pi</h3>
54 </div> 54 </div>
55 <div class="col-md"> 55 <div class="col-md">
56 </div> 56 </div>