summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrike Uhlig <u@451f.org>2017-03-13 13:44:44 +0100
committerUlrike Uhlig <u@451f.org>2017-03-13 13:44:44 +0100
commit02e69efcadb8464618b44dd483faaa76b506aa55 (patch)
treec1a5dc407a016a9e855e775a3eb9e691fe3cc9be
parent7a283f0010203a270bb36f20cc46ced712edeecb (diff)
parent105836f401678cc7465029e57a7417e669672342 (diff)
Merge branch 'master' of webmasters.boum.org:wiki
-rw-r--r--wiki/src/blueprint/tails_server.mdwn2
-rw-r--r--wiki/src/templates/archivepage.tmpl7
-rw-r--r--wiki/src/templates/inlinepage.tmpl74
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp16
7 files changed, 125 insertions, 0 deletions
diff --git a/wiki/src/blueprint/tails_server.mdwn b/wiki/src/blueprint/tails_server.mdwn
index 6cf7652..8581041 100644
--- a/wiki/src/blueprint/tails_server.mdwn
+++ b/wiki/src/blueprint/tails_server.mdwn
@@ -67,6 +67,8 @@ Please add to this list!
* charybdis
* ngIRCd
* IRCD-Hybrid
+* Media streaming
+ * Icecast
* SSH
# Design
diff --git a/wiki/src/templates/archivepage.tmpl b/wiki/src/templates/archivepage.tmpl
new file mode 100644
index 0000000..14aadfe
--- /dev/null
+++ b/wiki/src/templates/archivepage.tmpl
@@ -0,0 +1,7 @@
+<div class="archivepage">
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
+</div>
diff --git a/wiki/src/templates/inlinepage.tmpl b/wiki/src/templates/inlinepage.tmpl
new file mode 100644
index 0000000..d96e420
--- /dev/null
+++ b/wiki/src/templates/inlinepage.tmpl
@@ -0,0 +1,74 @@
+<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
+
+<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
+<TMPL_IF AUTHOR>
+<span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
+<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
+<TMPL_VAR CONTENT>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF ENCLOSURE>
+<TMPL_IF HTML5><section id="inlineenclosure"><TMPL_ELSE><div id="inlineenclosure"></TMPL_IF>
+<a href="<TMPL_VAR ENCLOSURE>">Download</a>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
+
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
+Tags:
+<TMPL_LOOP TAGS>
+<TMPL_VAR LINK>
+</TMPL_LOOP>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF COPYRIGHT>
+<div class="pagecopyright">
+<TMPL_VAR COPYRIGHT>
+</div>
+</TMPL_IF>
+
+<TMPL_IF LICENSE>
+<div class="pagelicense">
+License: <TMPL_VAR LICENSE>
+</div>
+</TMPL_IF>
+
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
+<ul>
+<TMPL_IF EDITURL>
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
+</TMPL_IF>
+<TMPL_IF COMMENTSLINK>
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
+<TMPL_IF DISCUSSIONLINK>
+<li><TMPL_VAR DISCUSSIONLINK></li>
+</TMPL_IF>
+</TMPL_IF>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml
new file mode 100644
index 0000000..938ffdd
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml
@@ -0,0 +1,5 @@
+---
+build-target: i386
+channel: alpha
+product-name: Tails
+product-version: '2.11.1'
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp
new file mode 100644
index 0000000..acbbe24
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEuiwiL0SsAO2YmTiTmP7GvHUqPbYFAljGgRoACgkQmP7GvHUq
+PbZslA//Ti/IRyR/nW2OyKivF9iHc8E5jQ492ufZIVOTpUo79DjQqaL3H96i3j8Z
+Vbk8RxNizA9BDFWB8EpuNR9d3wgpmJXAHAe91TAacRgGLDsqn4YQpAMabGQ4lsjj
+Q7hCKfLhmdiWFrkQwA8yGoPmw54vfUOeuYU6+J2xZTzsMycT0r37XxiDbCIDbLA8
+mWxd74P9/3hJ0loYeSkhd9HlR1k0q3RfX31gGKnI8FOpoUqtmin9WKE6i5W/B0N+
+UPYUYwve7yJ8u0vwzWxcg8cQNthcACG7vy9Q3R03eF7kTjsIvBdUarPSTR+m4wBk
+g34ORYpwTchbRkflyITJVnpC5EdNPLi+7AJsw5iItIizlxUNQQQ5/MLBQF1HMurf
+Syfa+SzqizJf0EHE3h3QiWMbITiGrx0YiBFMZZlR4VMhz47AHrHGAL7b/eJVzk2v
+zPok5hXlz/G1QFAAd7weL/cVnZAN/E7FQd0xb7sJfHId7bwV0PW6zWEE9cLIacvT
+u8+H23xjwCzy/Z8JFmuofbETtuzRGS0Wu0d6vDcDUBSnt1bGawnMGvCdUqGLeDch
+SxyCyXUDhhA4Q6c0wXQhUe+nxGlK1hf6QLGb8scMEJBwkZvSlUR6VFJojZmngsFH
+d3+jLEiith3IWzQWJ8x66RK3Z3/dwUEIHt9atRd0Zscply82AJo=
+=c9QW
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml
new file mode 100644
index 0000000..89e1f36
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml
@@ -0,0 +1,5 @@
+---
+build-target: i386
+channel: stable
+product-name: Tails
+product-version: '2.11.1'
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp
new file mode 100644
index 0000000..1af8040
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEuiwiL0SsAO2YmTiTmP7GvHUqPbYFAljGgREACgkQmP7GvHUq
+PbbYwQ/8D/RUOiuLYaVHMOSMNI4GP5c5Nfnp1F/0JUO5YoHdojBLMPgxJ6O/R+0A
+7zt51ToVTTkPdBmrpr3LBFU70VGUaSIEc/dgj9zikoG9U0ebts33rzFGVO8lyiPl
+pbjKZRknQDCVveXp9J3MFVx1v0OO8YecN7vpD5sMuh0SyQSaFs2B7N6bcpfHvLSs
+yrVuR0085G3B2O14NwqLmrqv0aP8LN5M8CEEW8mMCICuyroZQEtoR4fseC1zQwDu
+T7Pf95CMN5Sx4cvlbPRvLyZFiDG6KaSiTQwX/1nRipnIeqWyptdaDWARZKPSzwNF
+aA+NH8VHMnoGF4Kslw/sqY9Q9qhHQqyVWQuvG0yk24oL5SADFwi7W0tEU47fgZOg
+3m/hvQaYOiwb21OZgyjPCVC6JqyNmfW6g423gAqdogYng986QBlOlamy8HySJMmr
+nsIj6Hm3RgNpJ5haYzxILz0UxzbMRccYWXfLyI5a9DqdkgYaybVSw5y/uiI/tv2E
+2eqfN+am5Grr48pqn4mqAOwA7tLCM5adfbgDRxFA25T9NzkwlXTSCQ4Yp8bp6W0E
+041UA4Bd144xRKfxrR0Wzi842fHk1onsmeFF0QNUgolHwkyR99ZClZIhfAZkYG4w
+hRGWqFzQ4DLnQdEBle9Nigko4bLCkqUgJ7J8afHfjgipCuYq2N8=
+=wXPr
+-----END PGP SIGNATURE-----