aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2019-02-22 20:49:05 +0100
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2019-02-22 20:49:05 +0100
commit66f63b185f03c3e22d244d5d54e83c2239ce7e1e (patch)
treee4b335ed0a7181db692459be499fb52a0bbdec41
parentf9055209666e494922c5451e90316ad7d29a9a27 (diff)
downloadwww-66f63b185f03c3e22d244d5d54e83c2239ce7e1e.tar.gz
www-66f63b185f03c3e22d244d5d54e83c2239ce7e1e.zip
code blocks
-rw-r--r--static/styles.css4
-rw-r--r--template/tutorial-macos.html.j241
2 files changed, 32 insertions, 13 deletions
diff --git a/static/styles.css b/static/styles.css
index deb97a80..8bbdde0e 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -35,6 +35,10 @@
35 padding:.25em 1em; 35 padding:.25em 1em;
36} 36}
37 37
38code {
39 margin-bottom: 1em;
40}
41
38/* hyperlinks and buttons */ 42/* hyperlinks and buttons */
39#body_content a, 43#body_content a,
40#body_content a:link, 44#body_content a:link,
diff --git a/template/tutorial-macos.html.j2 b/template/tutorial-macos.html.j2
index e92cdc9b..098a2b9c 100644
--- a/template/tutorial-macos.html.j2
+++ b/template/tutorial-macos.html.j2
@@ -29,22 +29,27 @@
29 and put it under the homebrew formula folder: 29 and put it under the homebrew formula folder:
30 </p> 30 </p>
31 31
32 32 <p>
33 <code> 33 <code>
34 $ cp gnunet.rb $(brew --repo homebrew/core)/Formula 34 $ cp gnunet.rb $(brew --repo homebrew/core)/Formula
35 </code> 35 </code>
36 </p>
36 <br/> 37 <br/>
37 Then install: 38 Then install:
38 <br/> 39 <br/>
40 <p>
39 <code> 41 <code>
40 $ brew install gnunet 42 $ brew install gnunet
41 </code><br/> 43 </code>
44 </p>
42 45
43 Alternatively, if you want to install GNUnet from git, execute: 46 Alternatively, if you want to install GNUnet from git, execute:
44<br/> 47<br/>
48 <p>
45 <code> 49 <code>
46 $ brew install --HEAD gnunet 50 $ brew install --HEAD gnunet
47 </code><br/><br/> 51 </code>
52 </p>
48 <br/> 53 <br/>
49 54
50 <p>And you're done!. <br/> 55 <p>And you're done!. <br/>
@@ -61,25 +66,27 @@
61 our home directory for the file `~/.gnunet/gnunet.conf`. We can 66 our home directory for the file `~/.gnunet/gnunet.conf`. We can
62 start with an empty file for now: 67 start with an empty file for now:
63 </p> 68 </p>
64 69 <p>
65 <code> 70 <code>
66 $ touch ~/.config/gnunet.conf 71 $ touch ~/.config/gnunet.conf
67 </code> 72 </code>
73 </p>
68 74
69 <p> 75 <p>
70 Now we can start it with the command line tool 76 Now we can start it with the command line tool
71 `gnunet-arm` (Automatic Restart Manager). 77 `gnunet-arm` (Automatic Restart Manager).
72 </p> 78 </p>
73 79 <p>
74 <code> 80 <code>
75 $ gnunet-arm -s 81 $ gnunet-arm -s
76 </code> 82 </code>
83 </p>
77 84
78 <p> 85 <p>
79 It starts the default GNUnet services. We can list them with the 86 It starts the default GNUnet services. We can list them with the
80 `-I` option: 87 `-I` option:
81 </p> 88 </p>
82 89 <p>
83 <code> 90 <code>
84 $ gnunet-arm -I<br> 91 $ gnunet-arm -I<br>
85 Running services:<br> 92 Running services:<br>
@@ -107,15 +114,15 @@
107namestore (gnunet-service-namestore)<br> 114namestore (gnunet-service-namestore)<br>
108vpn (gnunet-service-vpn) 115vpn (gnunet-service-vpn)
109 </code> 116 </code>
110 117 </p>
111 <p> 118 <p>
112 For stopping GNUnet again we can use the `-e` option. 119 For stopping GNUnet again we can use the `-e` option.
113 </p> 120 </p>
114 121 <p>
115 <code> 122 <code>
116 $ gnunet-arm -e 123 $ gnunet-arm -e
117 </code> 124 </code>
118 <br/> 125 </p>
119 126
120 <h3>{{ _("Alternative: Installation from source") }}</h3> 127 <h3>{{ _("Alternative: Installation from source") }}</h3>
121 128
@@ -125,28 +132,30 @@ vpn (gnunet-service-vpn)
125 using homebrew (see above).<br/> 132 using homebrew (see above).<br/>
126 First, install the dependencies: 133 First, install the dependencies:
127 </p> 134 </p>
128 135 <p>
129 <code> 136 <code>
130 $ brew install git autoconf automake glpk gettext gnutls jansson libextractor libgcrypt libffi libidn2 libmicrohttpd libmpc libtool libunistring pkg-config unbound 137 $ brew install git autoconf automake glpk gettext gnutls jansson libextractor libgcrypt libffi libidn2 libmicrohttpd libmpc libtool libunistring pkg-config unbound
131 </code> 138 </code>
132 <br/> 139 </p>
133 <p> 140 <p>
134 Next, create a directory in your home. This directory is where we store 141 Next, create a directory in your home. This directory is where we store
135 the source code later. You should keep this directory after 142 the source code later. You should keep this directory after
136 installation because it contains Makefiles that can be used for 143 installation because it contains Makefiles that can be used for
137 uninstalling GNUnet again. 144 uninstalling GNUnet again.
138 </p> 145 </p>
139 146 <p>
140 <code> 147 <code>
141 $ mkdir ~/gnunet 148 $ mkdir ~/gnunet
142 </code> 149 </code>
150 </p>
143 151
144 <h4>{{ _("Get the source code") }}</h4> 152 <h4>{{ _("Get the source code") }}</h4>
145 153 <p>
146 <code> 154 <code>
147 $ cd ~<br> 155 $ cd ~<br>
148 $ git clone --depth 1 https://gnunet.org/git/gnunet.git gnunet_src<br> 156 $ git clone --depth 1 https://gnunet.org/git/gnunet.git gnunet_src<br>
149 </code> 157 </code>
158 </p>
150 159
151 <h4>{{ _("Compile and Install") }}</h4> 160 <h4>{{ _("Compile and Install") }}</h4>
152 161
@@ -162,12 +171,14 @@ vpn (gnunet-service-vpn)
162 171
163 <h5>{{ _("Option 1: GNUnet for production / usage") }}</h5> 172 <h5>{{ _("Option 1: GNUnet for production / usage") }}</h5>
164 173
174 <p>
165 <code> 175 <code>
166 $ cd ~/gnunet_src<br> 176 $ cd ~/gnunet_src<br>
167 $ ./bootstrap<br> 177 $ ./bootstrap<br>
168 $ export GNUNET_PREFIX=~/gnunet<br> 178 $ export GNUNET_PREFIX=~/gnunet<br>
169 $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation<br> 179 $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation<br>
170 </code> 180 </code>
181 </p>
171 <p> 182 <p>
172 You might see configure failing telling you that it ``cannot run C compiled programs.''. 183 You might see configure failing telling you that it ``cannot run C compiled programs.''.
173 In this case, you might need to open/run Xcode once and you will be prompted to 184 In this case, you might need to open/run Xcode once and you will be prompted to
@@ -175,17 +186,21 @@ vpn (gnunet-service-vpn)
175 Then, you might have to manually install the command line tools from here https://developer.apple.com/download/more/ (you need an Apple ID for this). 186 Then, you might have to manually install the command line tools from here https://developer.apple.com/download/more/ (you need an Apple ID for this).
176 Install those and execute 187 Install those and execute
177 </p> 188 </p>
189 <p>
178 <code> 190 <code>
179 $ open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg 191 $ open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
180 </code> 192 </code>
193 </p>
181 <p> 194 <p>
182 After configure passes, you need to add a 'gnunetdns' group using the macOS system preferences. 195 After configure passes, you need to add a 'gnunetdns' group using the macOS system preferences.
183 Further, you need to add a user 'gnunet'. Then: 196 Further, you need to add a user 'gnunet'. Then:
184 </p> 197 </p>
198 <p>
185 <code> 199 <code>
186 $ make<br> 200 $ make<br>
187 $ sudo make install 201 $ sudo make install
188 </code> 202 </code>
203 </p>
189 204
190 <h5>{{ _("Option 2: GNUnet experimental") }}</h5> 205 <h5>{{ _("Option 2: GNUnet experimental") }}</h5>
191 206