From 085d35e2ca3b0db14dfe260b02c4c0e6c88280a8 Mon Sep 17 00:00:00 2001
From: Marco Ziesing <mail@marco-ziesing.de>
Date: Thu, 29 Mar 2012 20:37:58 +0200
Subject: [PATCH] added Hajek Museum and TYPO3, plus minor updates

---
 CCCS.de.xml            |  2 +-
 DRF-Luftrettung.de.xml |  2 +-
 GWF-Stuttgart.de.xml   |  2 +-
 GenoAkademie.de.xml    |  2 +-
 HajekMuseum.de.xml     |  7 +++++++
 LinuxTag.xml           |  7 +++++++
 MediaCluster.de.xml    |  2 +-
 README.md              | 19 ++++++++++++++-----
 TYPO3.xml              |  9 +++++++++
 9 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 HajekMuseum.de.xml
 create mode 100644 LinuxTag.xml
 create mode 100644 TYPO3.xml

diff --git a/CCCS.de.xml b/CCCS.de.xml
index 79bda15..d64bdc8 100644
--- a/CCCS.de.xml
+++ b/CCCS.de.xml
@@ -1,4 +1,4 @@
-<ruleset name="cccs.de" default_off="expired certificate">
+<ruleset name="CCC Stuttgart" default_off="expired certificate">
   <target host="*.cccs.de" />
   <target host="cccs.de" />
 
diff --git a/DRF-Luftrettung.de.xml b/DRF-Luftrettung.de.xml
index d1e6569..d1a9d89 100644
--- a/DRF-Luftrettung.de.xml
+++ b/DRF-Luftrettung.de.xml
@@ -1,4 +1,4 @@
-<ruleset name="drf-luftrettung.de">
+<ruleset name="DRF Luftrettung">
   <target host="*.drf-luftrettung.de" />
   <target host="drf-luftrettung.de" />
 
diff --git a/GWF-Stuttgart.de.xml b/GWF-Stuttgart.de.xml
index 496295a..55aef85 100644
--- a/GWF-Stuttgart.de.xml
+++ b/GWF-Stuttgart.de.xml
@@ -1,4 +1,4 @@
-<ruleset name="gwf-stuttgart.de">
+<ruleset name="GWF Stuttgart">
   <target host="*.gwf-stuttgart.de" />
   <target host="gwf-stuttgart.de" />
 
diff --git a/GenoAkademie.de.xml b/GenoAkademie.de.xml
index c601468..7e86eef 100644
--- a/GenoAkademie.de.xml
+++ b/GenoAkademie.de.xml
@@ -1,4 +1,4 @@
-<ruleset name="genoakademie.de">
+<ruleset name="GenoAkademie">
   <target host="*.genoakademie.de" />
   <target host="genoakademie.de" />
 
diff --git a/HajekMuseum.de.xml b/HajekMuseum.de.xml
new file mode 100644
index 0000000..8cb8dcb
--- /dev/null
+++ b/HajekMuseum.de.xml
@@ -0,0 +1,7 @@
+<ruleset name="Hajek Museum" default_off="expired certificate">
+  <target host="*.hajekmuseum.de" />
+  <target host="hajekmuseum.de" />
+
+  <rule from="^http://hajekmuseum\.de/" to="https://www.hajekmuseum.de/"/>
+  <rule from="^http://([^/:@\.]+)\.hajekmuseum\.de/" to="https://$1.hajekmuseum.de/"/>
+</ruleset>
diff --git a/LinuxTag.xml b/LinuxTag.xml
new file mode 100644
index 0000000..70670da
--- /dev/null
+++ b/LinuxTag.xml
@@ -0,0 +1,7 @@
+<ruleset name="LinuxTag">
+  <target host="linuxtag.org"/>
+  <target host="www.linuxtag.org"/>
+
+  <rule from="^http://(www\.)?linuxtag\.org/" to="https://www.linuxtag.org/"/>
+</ruleset>
+
diff --git a/MediaCluster.de.xml b/MediaCluster.de.xml
index 6619dc5..e0647ee 100644
--- a/MediaCluster.de.xml
+++ b/MediaCluster.de.xml
@@ -1,4 +1,4 @@
-<ruleset name="mediacluster.de">
+<ruleset name="MediaCluster">
   <target host="*.mediacluster.de" />
   <target host="mediacluster.de" />
 
diff --git a/README.md b/README.md
index ada7e2e..3c80136 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,17 @@
-#HTTPS Everywhere Rulesets
+# HTTPS Everywhere Rulesets
 
-Some rulesets for the browser plugin "HTTPS Everywhere".
+Some rulesets for the browser plugin ["HTTPS Everywhere"](https://www.eff.org/https-everywhere).
 
-See https://www.eff.org/https-everywhere
+## Installation
 
-More rulesets:
-https://gitweb.torproject.org/https-everywhere.git/tree/HEAD:/src/chrome/content/rules
+### Firefox
+Copy the XML files to \<profile folder\>/extensions/https-everywhere@eff.org/chrome/content/rules
+
+Enter about:support in the location bar, hit Enter and click "Profile Directory" to get the path of your profile folder.
+
+### Chrome/Chromium
+Copy the XML files to \<profile folder\>/Extensions/gcbommkclmclpchllfjekcdonpmejbdp/\<version number\>/rules
+
+
+## More rulesets
+[Official Git-Repository at TorProject.org](https://gitweb.torproject.org/https-everywhere.git/tree/HEAD:/src/chrome/content/rules)
diff --git a/TYPO3.xml b/TYPO3.xml
new file mode 100644
index 0000000..1a2fa27
--- /dev/null
+++ b/TYPO3.xml
@@ -0,0 +1,9 @@
+<ruleset name="TYPO3">
+  <target host="typo3.org"/>
+  <target host="www.typo3.org"/>
+  <target host="forge.typo3.org"/>
+
+  <rule from="^http://(www\.)?typo3\.org/" to="https://typo3.org/"/>
+  <rule from="^http://forge\.typo3\.org/" to="https://forge.typo3.org/"/>
+</ruleset>
+