Commit e152b41d authored by Tails developers's avatar Tails developers

Import Tails signing key into the keyring

parent 56c96ad5
......@@ -23,7 +23,6 @@
/config/chroot_local-includes/usr/share/amnesia/build/variables
/config/chroot_local-includes/usr/share/doc/Changelog
/config/chroot_local-includes/usr/share/doc/amnesia/Changelog
/config/chroot_local-includes/usr/share/doc/amnesia/amnesia.asc
/config/chroot_local-includes/usr/share/doc/tails/website
/.lock
/.stage
......
......@@ -22,7 +22,6 @@ fi
rm -f config/chroot_local-includes/etc/amnesia/environment
rm -f config/chroot_local-includes/etc/amnesia/version
rm -f config/chroot_local-includes/usr/share/doc/amnesia/Changelog
rm -f config/chroot_local-includes/usr/share/doc/amnesia/amnesia.asc
for list in config/chroot_local-packageslists/*.list ; do
if [ "$list" != 'config/chroot_local-packageslists/tails-common.list' ]; then
rm -f "$list"
......
......@@ -75,9 +75,6 @@ echo "live-build: `dpkg-query -W -f='${Version}\n' live-build`" \
# changelog
cp debian/changelog config/chroot_local-includes/usr/share/doc/amnesia/Changelog
# GnuPG key
cp wiki/src/amnesia.asc config/chroot_local-includes/usr/share/doc/amnesia/
# create readahead-list from squashfs.sort
if [ -e config/binary_rootfs/squashfs.sort ]; then
mkdir -p config/chroot_local-includes/usr/share/amnesia
......
......@@ -3,7 +3,7 @@
Import_GnuPG_key ()
{
echo "- importing GnuPG key"
sudo -H -u "${LIVE_USERNAME}" gpg --batch --import /usr/share/doc/amnesia/amnesia.asc
sudo -H -u "${LIVE_USERNAME}" gpg --batch --import /usr/share/doc/tails/website/*.key
# Creating state file
touch /var/lib/live/config/import-gnupg-key
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-11-20 16:40+0100\n"
"POT-Creation-Date: 2011-12-16 00:00+0100\n"
"PO-Revision-Date: 2011-03-25 12:37+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -148,8 +148,8 @@ msgid "There are multiple ways to get this OpenPGP public key:"
msgstr "Il existe différents moyens d'obtenir cette clé publique :"
#. type: Bullet: '- '
msgid "download it from this website: [[!tails_website amnesia.asc]]"
msgstr "la télécharger depuis ce site : [[!tails_website amnesia.asc]]"
msgid "download it from this website: [[!tails_website tails-email.key]]"
msgstr "la télécharger depuis ce site : [[!tails_website tails-email.key]]"
#. type: Bullet: '- '
msgid "fetch it from your favourite keyserver"
......
......@@ -50,7 +50,7 @@ How to get the public key?
There are multiple ways to get this OpenPGP public key:
- download it from this website: [[!tails_website amnesia.asc]]
- download it from this website: [[!tails_website tails-email.key]]
- fetch it from your favourite keyserver
- send an email to <tails-sendkey@boum.org>.
......
......@@ -35,6 +35,6 @@ Bulleted list
test [[autolink|sandbox]]
[[!testpagespec pagespec="!comment(*) and !ikiwiki and !ikiwiki/* and !news/* and !*/Discussion and !todo and !todo/* and !bugs and !bugs/* and !patch and !wishlist and !amnesia.asc and !tags and !tags/* and !contribute and !contribute/* and !torrents/* and !forum and !forum/* and !forum/*/* and !recentchanges and !recentchanges/* and !shortcuts and !templates/*" match="recentchanges/change_41a33783011d95dcc9ecc4aa327a2a3bf29d9b23"]]
[[!testpagespec pagespec="!comment(*) and !ikiwiki and !ikiwiki/* and !news/* and !*/Discussion and !todo and !todo/* and !bugs and !bugs/* and !patch and !wishlist and !*.key and !tags and !tags/* and !contribute and !contribute/* and !torrents/* and !forum and !forum/* and !forum/*/* and !recentchanges and !recentchanges/* and !shortcuts and !templates/*" match="recentchanges/change_41a33783011d95dcc9ecc4aa327a2a3bf29d9b23"]]
[[!testpagespec pagespec="!comment(*) and !ikiwiki and !ikiwiki/* and !news/* and !*/Discussion and !todo and !todo/* and !bugs and !bugs/* and !patch and !wishlist and !amnesia.asc and !tags and !tags/* and !contribute and !contribute/* and !torrents/* and !forum and !forum/* and !forum/*/* and !recentchanges and !recentchanges/* and !shortcuts and !templates/*" match="forum/Persistent_home_or_TC_volume_on_USB__63__/comment_2_c59db2af33552354ae9c51b933a50878"]]
[[!testpagespec pagespec="!comment(*) and !ikiwiki and !ikiwiki/* and !news/* and !*/Discussion and !todo and !todo/* and !bugs and !bugs/* and !patch and !wishlist and !*.key and !tags and !tags/* and !contribute and !contribute/* and !torrents/* and !forum and !forum/* and !forum/*/* and !recentchanges and !recentchanges/* and !shortcuts and !templates/*" match="forum/Persistent_home_or_TC_volume_on_USB__63__/comment_2_c59db2af33552354ae9c51b933a50878"]]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment