aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-10 14:58:29 +0100
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-10 14:58:29 +0100
commit519b93d4ffd8a5acf96e665c73adce3c535d09e5 (patch)
tree59f08cb2b8fc5df02553f32e009299fac7072eb6
parentbf52550b7f0dd041edabbb5d603e5906fbb3b8e1 (diff)
parentc04ac57d05a6305952d9a343c43da044b4d53241 (diff)
downloadwww-519b93d4ffd8a5acf96e665c73adce3c535d09e5.tar.gz
www-519b93d4ffd8a5acf96e665c73adce3c535d09e5.zip
Merge branch 'master' of git+ssh://gnunet.org/www
-rw-r--r--.gitmodules1
-rw-r--r--.well-known/security.txt14
-rw-r--r--Makefile1
m---------build-system/taler-build-scripts0
m---------inc0
-rw-r--r--template/contact.html.j23
-rw-r--r--www.yml14
7 files changed, 32 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 1cb35121..e15461d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,4 @@
5[submodule "inc"] 5[submodule "inc"]
6 path = inc 6 path = inc
7 url = https://git.gnunet.org/www_shared.git 7 url = https://git.gnunet.org/www_shared.git
8 branch = default
9 ignore = dirty 8 ignore = dirty
diff --git a/.well-known/security.txt b/.well-known/security.txt
new file mode 100644
index 00000000..554b0268
--- /dev/null
+++ b/.well-known/security.txt
@@ -0,0 +1,14 @@
1# Our security address(es). Two just to be safe.
2Contact: grothoff@gnunet.org
3Contact: schanzen@gnunet.org
4
5# Our PGP keys:
6Encryption: https://grothoff.org/christian/grothoff.asc
7Encryption: https://schanzen.eu/schanzen.asc
8
9# Our disclosure policy:
10Disclosure: Full
11
12# Happy to acknowledge once there is something to acknowledge,
13# for now 404 as we had no incidents.
14Acknowledgement: https://gnunet.org/en/security.html
diff --git a/Makefile b/Makefile
index e47f3faa..b032c34c 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ all: locale template
43 for lang in en de es fr it; do \ 43 for lang in en de es fr it; do \
44 $(cp) $$lang/rss.xml $$lang/news/rss.xml; \ 44 $(cp) $$lang/rss.xml $$lang/news/rss.xml; \
45 done) 45 done)
46 ($(mkdir) -p rendered/.well-known ; $(cp) .well-known/security.txt rendered/.well-known/)
46 47
47# Extract translateable strings from jinja2 templates. 48# Extract translateable strings from jinja2 templates.
48# Because of the local i18nfix extractor module we need 49# Because of the local i18nfix extractor module we need
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
Subproject d725a0cd1b4aa3ff54452a702b8c19db3f3c339 Subproject d81bbfabc2538932f631d3946bd6a9b95182b4f
diff --git a/inc b/inc
Subproject bdef602fcbd13d59aef971307b3730247a8b9c5 Subproject 6a51c97bddcffef78e0c3b39a0eddd69876b690
diff --git a/template/contact.html.j2 b/template/contact.html.j2
index adf5691d..32040e06 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -42,6 +42,9 @@
42 either <tt>PSEUDONYM@gnunet.org</tt> or 42 either <tt>PSEUDONYM@gnunet.org</tt> or
43 <tt>LASTNAME@gnunet.org</tt>. Most of us 43 <tt>LASTNAME@gnunet.org</tt>. Most of us
44 support receiving GnuPG encrypted Emails. 44 support receiving GnuPG encrypted Emails.
45 Urgent and sensitive security issues may be
46 addressed to the GNU maintainers
47 <tt>schanzen</tt> and <tt>grothoff</tt>.
45 {% endtrans %} 48 {% endtrans %}
46 </p> 49 </p>
47 </div> 50 </div>
diff --git a/www.yml b/www.yml
index 26532b8f..ba0e42e0 100644
--- a/www.yml
+++ b/www.yml
@@ -174,6 +174,20 @@ newsposts:
174# <!-- FIXME 2013: no media link. <li>Roger Dingledine and Jacob Appelbaum, "Q &amp; A", Technische Universität München (<a href="https://archive.org/details/RogerDingledineAndJacobAppelbaumQAMarathon" download>download</a>)</li> --> 174# <!-- FIXME 2013: no media link. <li>Roger Dingledine and Jacob Appelbaum, "Q &amp; A", Technische Universität München (<a href="https://archive.org/details/RogerDingledineAndJacobAppelbaumQAMarathon" download>download</a>)</li> -->
175# <!-- FIXME 2013: no source link on web. <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li> --> 175# <!-- FIXME 2013: no source link on web. <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li> -->
176videoslist: 176videoslist:
177 - year: 2020
178 authors:
179 - "Martin Schanzenbach"
180 location: "FOSDEM20"
181 description: "GNUnet presented at the Decentralized Internet and Privacy devroom at FOSDEM20 in 2020."
182 name: "GNUnet at FOSDEM20"
183 sources:
184 - "https://git.gnunet.org/gnunet-videos-2020.git/plain/FOSDEM20/dip_gnunet.webm"
185 mirror_sources:
186 - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.webm"
187 - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.mp4"
188 slides:
189 - "https://git.gnunet.org/presentations.git/plain/fosdem20/20200202_fosdem20_gnunet.pdf"
190 comment:
177 - year: 2019 191 - year: 2019
178 authors: 192 authors:
179 - "Martin Schanzenbach" 193 - "Martin Schanzenbach"