summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjvoisin <julien.voisin@dustri.org>2013-07-14 16:45:46 +0200
committerTails developers <amnesia@boum.org>2013-07-16 18:21:44 +0000
commit5fb088e181339b6dc45564e5b1c6b781ebd7d574 (patch)
tree397ab087719bceecb965fa3e08d9e922fa836a39
parentc0f1153338357cbc0b647fc0064c8095e071e225 (diff)
Disable pre-configured pidgin acounts
This closes https://tails.boum.org/todo/disable_Pidgin_accounts/
-rw-r--r--config/chroot_local-includes/etc/skel/.purple/accounts.xml2
-rw-r--r--wiki/src/doc/anonymous_internet/pidgin.mdwn11
-rw-r--r--wiki/src/support/chat.mdwn3
3 files changed, 15 insertions, 1 deletions
diff --git a/config/chroot_local-includes/etc/skel/.purple/accounts.xml b/config/chroot_local-includes/etc/skel/.purple/accounts.xml
index 38af191..5b1c319 100644
--- a/config/chroot_local-includes/etc/skel/.purple/accounts.xml
+++ b/config/chroot_local-includes/etc/skel/.purple/accounts.xml
@@ -23,7 +23,7 @@
<setting name='ssl' type='bool'>1</setting>
</settings>
<settings ui='gtk-gaim'>
- <setting name='auto-login' type='bool'>1</setting>
+ <setting name='auto-login' type='bool'>0</setting>
</settings>
<current_error/>
</account>
diff --git a/wiki/src/doc/anonymous_internet/pidgin.mdwn b/wiki/src/doc/anonymous_internet/pidgin.mdwn
index e25e0e4..02afc15 100644
--- a/wiki/src/doc/anonymous_internet/pidgin.mdwn
+++ b/wiki/src/doc/anonymous_internet/pidgin.mdwn
@@ -8,6 +8,17 @@ same time, even with several instances of the same protocol.
For more detailed documentation refer to the [official Pidgin user
guide](http://developer.pidgin.im/wiki/Using%20Pidgin).
+## Default profiles
+
+By default, Tails ships a few IRC profiles, including:
+
+- `irc.oftc.net` to reach Tails and Tor developers.
+
+- `127.0.0.1` to reach I2P developers.
+
+Thoses profiles are not enabled by default. You can activate
+them in the "Accounts menu -> Manage Accounts" section.
+
## OTR encryption
Of course the issue of end-to-end encryption arises again. As we
diff --git a/wiki/src/support/chat.mdwn b/wiki/src/support/chat.mdwn
index d660ed0..25d4d78 100644
--- a/wiki/src/support/chat.mdwn
+++ b/wiki/src/support/chat.mdwn
@@ -12,3 +12,6 @@ Here are the needed technical details:
* port: `6697`
* channel: `#tails`
* Use TLS/SSL to connect!
+
+If you are using Tails, you can enable the predefined profile
+in Pidgin in the "Accounts menu -> Manage Accounts" section.