[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch stable updated (ae000dc -> 44713be)
|
From: |
gnunet |
|
Subject: |
[www] branch stable updated (ae000dc -> 44713be) |
|
Date: |
Fri, 15 May 2020 11:07:54 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a change to branch stable
in repository www.
from ae000dc use funding text by ngi trust
add 1ebd7c3 add deploy script
add d868619 fixed missing clone of gnunet-gtk repository
add 068fd70 archinstall: removed unnecessary compiler flags, changed to
/usr/local
add 2f02a6f gnurl: add new gpg key for versions after 7.69.1
add 2a5701a gnurl: rewrite to be more rational about patch waiting times
add 8e623df mailmap update
add 5645dd9 Add opengraph to header, most of it is TODO
add 3cc9e3d Merge branch 'master' of git+ssh://gnunet.org/www
add 16808e1 add more build tasks
add 05fe330 add CI link
add a15d862 fix CI link
add 97a8f4e streamline installation instructions
add 02b4c3d fix styles
add 44713be minor improvements
No new revisions were added by this update.
Summary of changes:
.buildbot/build.sh | 10 +++
.buildbot/firefly-x86_64-amdepyc_deploy.sh | 10 +++
.mailmap | 7 +-
common/header.j2.inc | 18 +++++
common/navigation.j2.inc | 5 +-
static/styles.css | 4 +
template/gnurl.html.j2 | 22 ++---
template/install-on-archpi.html.j2 | 36 +++++----
template/install.html.j2 | 125 +++++++++++++++++++++++------
9 files changed, 179 insertions(+), 58 deletions(-)
create mode 100755 .buildbot/build.sh
create mode 100755 .buildbot/firefly-x86_64-amdepyc_deploy.sh
diff --git a/.buildbot/build.sh b/.buildbot/build.sh
new file mode 100755
index 0000000..da209c0
--- /dev/null
+++ b/.buildbot/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+./bootstrap
+./configure
+make
+if [ $? -eq 0 ]; then
+ exit 0
+fi
+echo "Try again"
+make
diff --git a/.buildbot/firefly-x86_64-amdepyc_deploy.sh
b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
new file mode 100755
index 0000000..baad1ba
--- /dev/null
+++ b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Deploy websites from buildbot
+
+chmod -R ag+rX rendered/
+DEPLOY_USER="stage"
+if [ $(git rev-parse --abbrev-ref HEAD) == 'stable' ]; then
+ DEPLOY_USER="www"
+fi
+rsync -a --delete rendered/ $address@hidden:~/www_deployment/
diff --git a/.mailmap b/.mailmap
index 017cc9a..386cebe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,5 @@
-ng0 <address@hidden>
-ng0 <address@hidden> Nils Gillmann <address@hidden>
+nikita <address@hidden>
+nikita <address@hidden> address@hidden <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden> Nils Gillmann <address@hidden>
+nikita <address@hidden> Nils Gillmann <address@hidden>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 2f80985..9d797fe 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -56,3 +56,21 @@
<![endif]-->
<link rel="alternate" type="application/rss+xml" title="GNUnet.org rss"
href="{{ url_localized('news/rss.xml') }}" />
+
+ <!-- opengraph -->
+ <!--
+ We do not actively use Twitter or endorse it, but people might
+ use our posts there or other websites might conform to the
+ twitter namespace of the opengraph. More opengraph must be
+ implemented in the sitecode.
+ -->
+ <meta name="twitter:card" content="article" />
+ <meta name="twitter:site" content="@gnunet" />
+ <meta name="twitter:creator" content="@gnunet" />
+ {#
+ TODO: Implement the necessary functions.
+ <meta property="og:url" content="{{ url_localized(url) }}" />
+ <meta property="og:title" content="{{ title }}" />
+ <meta property="og:description" content="{{ summary }}" />
+ <meta property="og:image" content="" />
+ #}
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 1befac8..5e288a9 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -61,10 +61,7 @@
<li><a class="dropdown-item" href="https://bugs.gnunet.org";
target="_blank">{{ _("Bug Tracker") }}</a></li>
<li><a class="dropdown-item" href="https://git.gnunet.org";
target="_blank">{{ _("Source Code") }}</a></li>
<li><a class="dropdown-item" target="_blank"
href="https://docs.gnunet.org/doxygen/";>{{ _("Source Code Documentation")
}}</a></li>
- <!--
- /* Until there is no functional CI we don not show this */
- <li><a class="dropdown-item" href="https://gitlab.gnunet.org/";
target="_blank">{{ _("Continuous Integration") }}</a></li>
- -->
+ <li><a class="dropdown-item" href="https://buildbot.gnunet.org/";
target="_blank">{{ _("Continuous Integration") }}</a></li>
<li><a class="dropdown-item" target="_blank"
href="https://docs.gnunet.org/tutorial/gnunet-tutorial.html";>{{ _("Development
Tutorial") }}</a></li>
<li><a class="dropdown-item" href="{{ url_localized('gnurl.html')
}}">libgnurl</a></li>
<li><a class="dropdown-item" href="{{ url_localized('gns.html')
}}">GNS</a></li>
diff --git a/static/styles.css b/static/styles.css
index 5979d21..3806ac1 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -47,6 +47,10 @@ code {
margin-bottom: 1em;
word-wrap: break-word; }
+code.block {
+ display: block; }
+
+
a.btn {
text-decoration: none !important;
color: white !important;
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index c502de7..c9c5d8b 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -28,9 +28,9 @@
</p>
<p>
{% trans %}
- Our main usecase is for GNUnet, but it might be usable
- for others, hence we're releasing the code to the
- general public.
+ Our main usecase is for GNUnet and Taler, but it might
+ be usable for others, hence we're releasing the code
+ to the general public.
{% endtrans %}
</p>
<p>
@@ -129,8 +129,9 @@
my mood. Note that this pretty much CANNOT be done without a
fork, as
renaming is an essential part of the fix. Now, there might be
creative
solutions to achieve the same thing within the standard cURL
build
- system, but I'm not happy to wait for a decade for Daniel to
review
- the patches. The changes libgnurl makes to curl are miniscule
and can
+ system, but this was deemed to be too much work when
+ gnurl was originally started.
+ The changes libgnurl makes to curl are miniscule and can
easily be applied again and again whenever libcurl makes a new
release.
{% endtrans %}
@@ -210,7 +211,7 @@
{% trans %}
Releases are published on <a
href="https://ftpmirror.gnu.org/gnu/gnunet/";>ftpmirror.gnu.org/gnu/gnunet</a>.
gnurl is available from within a variety of distributions and
package managers.
- Package Managers which include gnurl are:
+ Some Package Managers which include gnurl are:
<a href="https://www.gnu.org/software/guix/";>GNU Guix</a>
(available as "gnurl"),
<a href="https://gentoo.org";>Gentoo</a> through the collaborative
ebuild collection
<a
href="https://git.gnunet.org/youbroketheinternet-overlay.git/";>youbroketheinternet</a>,
@@ -266,7 +267,7 @@
{% trans %}
Fetch the signature key from
{% endtrans %}
- <a
href="https://keys.openpgp.org/search?q=ng0%40n0.is";>keys.openpgp.org</a>
+ <a
href="https://keys.openpgp.org/search?q=nikita%40NetBSD.org";>keys.openpgp.org</a>
{% trans %}
or via commandline with gnupg2.
{% endtrans %}
@@ -395,10 +396,9 @@
<p>
{% trans %}
gnurl/libgnurl is maintained by Nikita.
- Releases are signed with the OpenPGP Key
- <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>,
- with the key fingerprint
- <b>A88C 8ADD 1298 28D7 EAC0 2E52 E22F 9BBF EE34 8588</b>.
+ Releases after version 7.69.1 are signed with the OpenPGP Key
+ <b>0xD6B570842F7E7F8D</b> (<a
href="https://keys.openpgp.org/search?q=6115012DEA3026F62A98A556D6B570842F7E7F8D";>keys.openpgp.org</a>,
<a href="https://n0.is/pubkey.asc";>n0.is</a>), with the key fingerprint
+ <b>6115 012D EA30 26F6 2A98 A556 D6B5 7084 2F7E 7F8D</b>.
{% endtrans %}
</p>
</div>
diff --git a/template/install-on-archpi.html.j2
b/template/install-on-archpi.html.j2
index 00c8dc5..9970260 100644
--- a/template/install-on-archpi.html.j2
+++ b/template/install-on-archpi.html.j2
@@ -16,8 +16,8 @@
<h2>{{ _("Requirements for Raspberry Pi 3") }}</h2>
<p>First you need the hardware. This tutorial works with a Raspberry Pi 3 or
- any Arch Linux system. The other Pi versions I haven't tested, but they
should
- probably work, too. To install Arch Linux on the Pi3, follow the instructions
+ any Arch Linux system. The other Pi versions have not been tested, but they
+ should work, too. To install Arch Linux on the Pi3, follow the instructions
from <a
href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3";>archlinuxarm.org</a>.</p>
@@ -25,7 +25,7 @@
install the tools for building new software.</p>
<p><code>
- > sudo pacman -S base-devel
+ $ sudo pacman -S base-devel
</code></p>
<p>Now we can continue to install the following Arch Linux dependencies to
@@ -43,18 +43,18 @@
in the next step:<p>
<p><code>
- > git clone https://gnunet.org/git/gnunet.git<br>
+ $ git clone https://gnunet.org/git/gnunet.git<br>
</code></p>
<p>Now it's time to compile and install GNUnet.</p>
<p><code>
- > cd gnunet<br>
- > export GNUNET_PREFIX=/usr # for example, other locations possible<br>
- > ./bootstrap # Run this to generate the configure files.<br>
- > ./configure --prefix=$GNUNET_PREFIX --disable-documentation # Use --help
to see the various flags available to you.<br>
- > make -j$(nproc || echo -n 1)<br>
- > sudo make install<br>
+ $ cd gnunet<br>
+ $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br>
+ $ ./bootstrap # Run this to generate the configure files.<br>
+ $ ./configure --prefix=$GNUNET_PREFIX # Use --help to see the various flags
available to you.<br>
+ $ make -j$(nproc || echo -n 1)<br>
+ $ sudo make install<br>
</code></p>
<p>Congrats! GNUnet is now installed!</p>
@@ -66,14 +66,16 @@
<p><code>
$ pacman -Su gtk3 glade
</code></p>
+ <p><code>
+ $ git clone https://gnunet.org/git/gnunet-gtk.git<br>
+ </code></p>
<code>
$ cd ../gnunet-gtk<br>
$ ./bootstrap<br>
- $ export GNUNET_PREFIX=/usr # for example, other locations possible
- $ export CFLAGS="-g -Wall -O0"<br>
+ $ export GNUNET_PREFIX=/usr/local # for example, other locations
possible<br>
$ ./configure --prefix=$GNUNET_PREFIX --with-gnunet=$GNUNET_PREFIX<br>
$ make -j$(nproc || echo -n 1)<br>
- $ sudo make install
+ $ sudo make install<br>
</code>
<h2>{{ _("Run") }}</h2>
@@ -82,20 +84,20 @@
~/.config/gnunet.conf. We can start with an empty file for now:</p>
<p><code>
- > touch ~/.config/gnunet.conf
+ $ touch ~/.config/gnunet.conf
</code></p>
<br />
<p>Now we can start it with the commandline tool gnunet-arm (Automatic
Restart
Manager).</p>
<p><code>
- > gnunet-arm -s
+ $ gnunet-arm -s
</code></p>
<p>It starts the default GNUnet services. We can list them with the -I
option:</p>
<p><code>
- > gnunet-arm -I<br>
+ $ gnunet-arm -I<br>
Running services:<br>
ats (gnunet-service-ats)<br>
revocation (gnunet-service-revocation)<br>
@@ -125,7 +127,7 @@
<p>For stopping GNUnet again we can use the -e option.</p>
<p><code>
- > gnunet-arm -e
+ $ gnunet-arm -e
</code></p>
<h2>{{ _("Make sure, it works!") }}</h2>
diff --git a/template/install.html.j2 b/template/install.html.j2
index 5d097a3..b5b10f8 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -9,13 +9,65 @@
<div class="row container justify-content-center">
<div class="alert" style="background-color: #419edb;">
<div class="alert-content">
+{% trans %}
Notice: GNUnet is still undergoing major development. It is
largely <i>not yet ready</i> for usage beyond developers.
+{% endtrans %}
</div>
</div>
+{% trans %}
+<p>Please be aware that this project is still in an early alpha
+stage when it comes to running software – its not an easy task
+to rewrite the whole Internet! We are happy to get your
+<a href="engage.html">helping hand</a> anytime!
+Further information is available in our <a
href="https://docs.gnunet.org/#toc-Using-GNUnet-1";>handbook</a>.
+If you have any queries about the installation or the usage, please <a
href="engage.html">get in touch!</a></p>
+{% endtrans %}
</div>
- <h3>Current release downloads:</h3>
+ <h3>Binary packages</h3><br/>
+ <p>
+ {% trans %}
+ We recommend to use binary packages provided by the package manager
integrated
+ within your Operating System. GNUnet is reportedly available for at least:
+
+ <a
href="https://pkgs.alpinelinux.org/package/edge/testing/x86_64/gnunet";>Alpine</a>
+ and <a href="https://copr.fedorainfracloud.org/coprs/yosl/gnunet/";>Fedora
(Copr)</a>.
+ There is also a <a
href="https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnunet.rb";>Homebrew</a>
package available.
+
+ If GNUnet is available for your Operating System and it is missing,
+ send us feedback so that we can add it to this list. Furthermore, if
+ you are interested in packaging GNUnet for your Operating System,
+ get in touch with us at address@hidden if you require
+ help with this job.
+
+ If you were using an Operating System with the Alpine package manager,
+ GNUnet could be installed as simple as:
+ {% endtrans %}
+ </p>
+ <code class="block">
+ $ apk add gnunet
+ </code>
+ <p>
+ Please beware that some distributions may include outdated GNUnet packages!
+ </p>
+ <h3>From source</h3>
+ <p>
+ {% trans %}
+ First, install the <a
href="https://git.gnunet.org/gnunet.git/tree/README";>required dependencies</a>
of GNUnet. There are base requirements and optional
+ requirements.
+ {% endtrans %}
+ </p>
+ <p>
+ {% trans %}
+ Now, you need to decide if you want to install GNUnet from the release
+ tarball or from git. If you want to use GNUnet and there is no binary
+ package available for you OS, you should stick with the release tarball.
+ If you want to develop using the most recent build, you should go with
+ the <a href="https://git.gnunet.org/";>git repository</a>.
+ {% endtrans %}
+ </p>
+ <p>The current release tarballs for gnunet, a Gtk UI and fuse extensions can
be found here:</p>
<div class="row container justify-content-center">
<div class="col-md">
<b>gnunet</b>: <a
href="http://ftpmirror.gnu.org/gnunet/gnunet-latest.tar.gz";>0.12.2</a> (<a
href="http://ftpmirror.gnu.org/gnunet/gnunet-latest.tar.gz.sig";>sig</a>)<br>
@@ -23,28 +75,54 @@
<b>gnunet-fuse</b>: <a
href="http://ftpmirror.gnu.org/gnunet/gnunet-fuse-latest.tar.gz";>0.12.0</a> (<a
href="http://ftpmirror.gnu.org/gnunet/gnunet-fuse-latest.tar.gz.sig";>sig</a>)
</div>
</div>
- <h3>Instructions</h3><br/>
- <div class="row container justify-content-center">
- <div class="col-md">
- {% trans %}
- <p>The following GNUnet installation instructions help you building from
source for your Operating System.</p>
- <p><i>Please note that the installation process will get much easier
once we have proper packages again (planned for winter 2019).</i></p>
- <p>You have already installed GNUnet and want to use it?
- <a href="https://gnunet.org/en/use";>Check this out!</a> </p>
- {% endtrans %}
- </div>
- <div class="col-md">
- {% trans %}
- <p>Please be aware that this project is still in an early alpha
- stage when it comes to running software – its not an easy task
- to rewrite the whole Internet! We are happy to get your
- <a href="engage.html">helping hand</a> anytime!</p>
- <p>Further information is available in our <a
href="https://docs.gnunet.org/#toc-Using-GNUnet-1";>handbook</a>.</p>
- <p>If you have any queries about the installation or the usage, please
<a href="engage.html">get in touch!</a></p>
- {% endtrans %}
- </div>
- </div>
+ <p>
+ {% trans %}
+ Alternatively, get the sources from git by entering:
+ {% endtrans %}
+ </p>
+ <code class="block">
+ $ git clone https://gnunet.org/git/gnunet.git
+ </code>
+ <p>
+ {% trans %}
+ To compile GNUnet, execute:
+ {% endtrans %}
+ </p>
+ <code class="block">
+ $ export GNUNET_PREFIX=/usr/local/lib # or other directory of your
choice<br>
+ $ sudo addgroup gnunetdns <br>
+ $ sudo adduser --system --home "/var/lib/gnunet" --group gnunet --shell
/bin/sh<br>
+ $ ./bootstrap # only if you install from git <br>
+ $ ./configure --prefix=$GNUNET_PREFIX/ <br>
+ $ make
+ </code>
+ <p>
+ {% trans %}
+ You can find more configuration flags in the
+ <a href="https://git.gnunet.org/gnunet.git/tree/README";>README</a>.<br>
+ Install GNUnet with:
+ {% endtrans %}
+ </p>
+ <code class="block">
+ $ (sudo) make install # you only need sudo if your GNUNET_PREFIX is not
writeable by your user
+ </code>
+ <p>
+ {% trans %}
+ You can now start GNUnet by running:
+ {% endtrans %}
+ </p>
+ <code class="block">
+ $ gnunet-arm -s
+ </code>
+ <p>
+ {% trans %}
+ Check the <a
href="https://docs.gnunet.org/handbook/gnunet.html#Minimal-configuration";>handbook</a>
for detailed documentation.
+ For a more hands-on experience, <a
href="https://gnunet.org/en/use.html";>continue here</a>.
+ {% endtrans %}
+ </p>
+
+<!--
<div class="row container justify-content-center text-center">
<div class="col-md">
<p><a href="install-on-ubuntu1804.html"><img src="{{
url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
@@ -55,7 +133,6 @@
<h3>Debian 9</h3>
</div>
<div class="col-md">
- <!-- Not the officially distributed file, but it's the same logo, in
svg. Use this. -->
<p><a href="install-on-netbsd.html"><img src="{{
url('static/images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
<h3>NetBSD</h3>
</div>
@@ -77,6 +154,6 @@
<p><a
href="https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet";><img
alt="gentoo linux" src ="{{ url('static/images/gentoo-logo.svg') }}"
class="distro-logo" style="width:170px;height:auto"></a></p>
</div>
</div>
-
+-->
</article>
{% endblock body_content %}
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [www] branch stable updated (ae000dc -> 44713be),
gnunet <=