Move planet.fedoraproject.org to fedoraplanet.org

37 files changed, 104 insertions, 102 deletions

diff --git a/roles/planet/files/people_base_config b/roles/planet/files/people_base_config
index 74c1e94bd..e6db37941 100644
--- a/roles/planet/files/people_base_config
+++ b/roles/planet/files/people_base_config
@@ -24,11 +24,11 @@ fedmsg_enabled = 1
 # The facewidth of the defined blog defaults to 64.
 
 [DEFAULT]
-face = http://planet.fedoraproject.org/images/heads/default.png
+face = http://fedoraplanet.org/images/heads/default.png
 
 [http://dailypackage.fedorabook.com/index.php?/feeds/index.rss2]
 name = fedora daily package
-face = http://planet.fedoraproject.org/imgages/heads/fdp.png
+face = http://fedoraplanet.org/imgages/heads/fdp.png
 fasname = admin
 
 [http://www.redhatmagazine.com/category/fedora/feed]
@@ -46,12 +46,12 @@ fasname = admin
 
 [http://www.projetofedora.org/rss.xml]
 name = Projeto Fedora Brasil
-face = http://planet.fedoraproject.org/images/heads/map_brazil_fedora_small.png
+face = http://fedoraplanet.org/images/heads/map_brazil_fedora_small.png
 fasname = admin
 
 [http://www.fedora-tunisia.org/?q=atom/feed]
 name = Fedora Tunisia
-face = http://planet.fedoraproject.org/images/heads/default.png
+face = http://fedoraplanet.org/images/heads/default.png
 fasname = admin
 
 [http://fedoramagazine.org/?feed=rss2]
@@ -61,10 +61,10 @@ fasname = admin
 
 [https://badges.fedoraproject.org/explore/badges/rss]
 name = Fedora Badges
-face = http://planet.fedoraproject.org/images/heads/default.png
+face = http://fedoraplanet.org/images/heads/default.png
 fasname = admin
 
 [http://status.fedoraproject.org/changes.rss]
 name = Fedora Infrastructure Status
-face = http://planet.fedoraproject.org/images/heads/default.png
+face = http://fedoraplanet.org/images/heads/default.png
 fasname = admin
diff --git a/roles/planet/files/planet.conf b/roles/planet/files/planet.conf
index cd9ad5c76..b4c9eecfd 100644
--- a/roles/planet/files/planet.conf
+++ b/roles/planet/files/planet.conf
@@ -1,15 +1,19 @@
 <VirtualHost *:80>
     ##
-    # Domain: planet.fedoraproject.org
+    # Domain: fedoraplanet.org
     # Owner: admin@fedoraproject.org
     #
+    # fedoraplanet.org only supports plain http because of user generated content
+    # to allow HSTS for *.fedoraproject.org it is on a separate domain:
+    # https://fedorahosted.org/fedora-infrastructure/ticket/4670
+    # https://fedorahosted.org/fedora-infrastructure/ticket/2888
     ServerAdmin admin@fedoraproject.org
-    ServerName planet.fedoraproject.org
+    ServerName fedoraplanet.org
 
     DocumentRoot "/srv/planet/site/"
 
     ErrorLog logs/planet-error.log
-    CustomLog logs/planet.fedoraproject.org-access.log common
+    CustomLog logs/fedoraplanet.org-access.log common
 
     UserDir disable
     AddCharset UTF-8 .xml
@@ -33,6 +37,20 @@
     Alias /justfedora /srv/planet/site/edited
 
 </VirtualHost>
+<VirtualHost *:80>
+    ServerAdmin admin@fedoraproject.org
+    ServerName planet.fedoraproject.org
+    DocumentRoot "/srv/planet/site/"
+
+    ErrorLog logs/planet-error.log
+    CustomLog logs/planet.fedoraproject.org-access.log common
+
+    UserDir disable
+    AddCharset UTF-8 .xml
+
+    RedirectMatch permanent (.*) http://fedoraplanet.org/$1
+
+</VirtualHost>
 <VirtualHost 152.19.134.191:443 [2610:28:3090:3001:5054:ff:fedb:7f5a]:443>
     ##
     # Domain: planet.fedoraproject.org
@@ -57,22 +75,6 @@
     UserDir disable
     AddCharset UTF-8 .xml
 
-    <Location /images/>
-        ExpiresActive On
-        ExpiresDefault "access plus 5 days"
-    </Location>
-
-    <Location /css/>
-        ExpiresActive On
-        ExpiresDefault "access plus 5 days"
-    </Location>
-
-    <Directory "/srv/planet/site/">
-      Options Indexes FollowSymLinks
-    </Directory>
-
-    RedirectMatch 301 /favicon\.ico$ https://fedoraproject.org/static/images/favicon.ico
-    Redirect /ldc http://fedoraldc.wordpress.com/feed/
-    Alias /justfedora /srv/planet/site/edited
+    RedirectMatch permanent (.*) http://fedoraplanet.org/$1
 
 </VirtualHost>
diff --git a/roles/planet/files/sub-planets/design/base_config b/roles/planet/files/sub-planets/design/base_config
index ecf95cd69..ef7f41bd0 100644
--- a/roles/planet/files/sub-planets/design/base_config
+++ b/roles/planet/files/sub-planets/design/base_config
@@ -1,6 +1,6 @@
 [Planet]
 name = Fedora Design Team Planet
-link = http://planet.fedoraproject.org/design/
+link = http://fedoraplanet.org/design/
 owner_name = Fedora Admin
 owner_email = admin@fedoraproject.org
 cache_directory = /srv/planet/config/design/cache
@@ -22,5 +22,5 @@ spider_threads=20
 # The facewidth of the defined blog defaults to 64.
 
 [DEFAULT]
-face = http://planet.fedoraproject.org/images/heads/default.png
+face = http://fedoraplanet.org/images/heads/default.png
 
diff --git a/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl
index 04aa46b37..09b2b5403 100644
--- a/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl
+++ b/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl
@@ -6,7 +6,7 @@
 	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
 	<id><TMPL_VAR feed ESCAPE="HTML"></id>
 	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://planet.fedoraproject.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+	<generator uri="http://fedoraplanet.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
 	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
diff --git a/roles/planet/files/sub-planets/design/templates/heads.html.tmpl b/roles/planet/files/sub-planets/design/templates/heads.html.tmpl
index 29c49245a..4fa78b129 100644
--- a/roles/planet/files/sub-planets/design/templates/heads.html.tmpl
+++ b/roles/planet/files/sub-planets/design/templates/heads.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/atom.xml">
     <style type="text/css">
         #content ul {
             overflow: auto;
@@ -50,7 +50,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="http://fedoranews.org">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/design/templates/index.html.tmpl b/roles/planet/files/sub-planets/design/templates/index.html.tmpl
index 27568b791..8052477fa 100644
--- a/roles/planet/files/sub-planets/design/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/design/templates/index.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/atom.xml">
 </head>
 <body class="home">
     <div id="wrapper">
@@ -34,7 +34,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="http://fedoranews.org">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl
index 2bf19195c..d0435ed89 100644
--- a/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl
+++ b/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl
@@ -9,7 +9,7 @@
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
 	<title><TMPL_VAR name></title>
     <link><TMPL_VAR link ESCAPE="HTML"></link>
-        <description>Fedora People: http://planet.fedoraproject.org</description>
+        <description>Fedora People: http://fedoraplanet.org</description>
 	<items>
 		<rdf:Seq>
 <TMPL_LOOP Items>
diff --git a/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl
index 882b341fc..81a21926d 100644
--- a/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl
+++ b/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-   <atom:link href="http://planet.fedoraproject.org/rss20.xml" rel="self" type="application/rss+xml" />
+   <atom:link href="http://fedoraplanet.org/rss20.xml" rel="self" type="application/rss+xml" />
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link></link>
 	<language>en</language>
-        <description>Fedora People: http://planet.fedoraproject.org</description>
+        <description>Fedora People: http://fedoraplanet.org</description>
 
 <TMPL_LOOP Items>
 <item>
diff --git a/roles/planet/files/sub-planets/desktop/base_config b/roles/planet/files/sub-planets/desktop/base_config
index 129f7dbfd..ae0ac660e 100644
--- a/roles/planet/files/sub-planets/desktop/base_config
+++ b/roles/planet/files/sub-planets/desktop/base_config
@@ -1,6 +1,6 @@
 [Planet]
 name = Fedora desktop Planet
-link = http://planet.fedoraproject.org/desktop/
+link = http://fedoraplanet.org/desktop/
 owner_name = Fedora Admin
 owner_email = admin@fedoraproject.org
 cache_directory = /srv/planet/config/desktop/cache
@@ -22,5 +22,5 @@ spider_threads=20
 # The facewidth of the defined blog defaults to 64.
 
 [DEFAULT]
-face = http://planet.fedoraproject.org/desktop/images/heads/default.png
+face = http://fedoraplanet.org/desktop/images/heads/default.png
 
diff --git a/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl
index 85282dc0b..4ca9270b7 100644
--- a/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl
+++ b/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl
@@ -6,7 +6,7 @@
 	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
 	<id><TMPL_VAR feed ESCAPE="HTML"></id>
 	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://planet.fedoraproject.org/desktop/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+	<generator uri="http://fedoraplanet.org/desktop/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
 	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
diff --git a/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl b/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl
index 025c746c7..17e2aff1d 100644
--- a/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl
+++ b/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl
@@ -6,7 +6,7 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
@@ -48,7 +48,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="http://fedoranews.org">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl b/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl
index 11e06f94c..0e1370760 100644
--- a/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/desktop/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/desktop/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/desktop/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/desktop/atom.xml">
 </head>
 <body class="home">
     <div id="wrapper">
diff --git a/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl
index 9596f958c..5ac03582e 100644
--- a/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl
+++ b/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl
@@ -9,7 +9,7 @@
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
 	<title><TMPL_VAR name></title>
     <link><TMPL_VAR link ESCAPE="HTML"></link>
-        <description>Fedora People: http://planet.fedoraproject.org/desktop</description>
+        <description>Fedora People: http://fedoraplanet.org/desktop</description>
 	<items>
 		<rdf:Seq>
 <TMPL_LOOP Items>
diff --git a/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl
index ecb247433..deeb7d512 100644
--- a/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl
+++ b/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-   <atom:link href="http://planet.fedoraproject.org/desktop/rss20.xml" rel="self" type="application/rss+xml" />
+   <atom:link href="http://fedoraplanet.org/desktop/rss20.xml" rel="self" type="application/rss+xml" />
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link></link>
 	<language>en</language>
-        <description>Fedora People: http://planet.fedoraproject.org/desktop</description>
+        <description>Fedora People: http://fedoraplanet.org/desktop</description>
 
 <TMPL_LOOP Items>
 <item>
diff --git a/roles/planet/files/sub-planets/edited/base_config b/roles/planet/files/sub-planets/edited/base_config
index 44a3fa3f3..e3e0916b8 100644
--- a/roles/planet/files/sub-planets/edited/base_config
+++ b/roles/planet/files/sub-planets/edited/base_config
@@ -1,6 +1,6 @@
 [Planet]
 name = Just Fedora Planet
-link = http://planet.fedoraproject.org/edited/
+link = http://fedoraplanet.org/edited/
 owner_name = Fedora Admin
 owner_email = admin@fedoraproject.org
 cache_directory = /srv/planet/config/edited/cache
@@ -22,7 +22,7 @@ spider_threads=20
 # The facewidth of the defined blog defaults to 64.
 
 [DEFAULT]
-face = http://planet.fedoraproject.org/edited/images/heads/default.png
+face = http://fedoraplanet.org/edited/images/heads/default.png
 
 [http://mairin.wordpress.com/category/fedora/feed/]
 name = Máirín Duffy
@@ -65,7 +65,7 @@ face = https://fedoraproject.org/w/uploads/0/0c/PaulWFrields_PaulWFrields-head.p
 
 [http://www.awe.com/mark/blog/index.rss?-tags=fedora,redhat,security]
 name = Mark Cox
-face=http://planet.fedoraproject.org/heads/mjcox.png
+face=http://fedoraplanet.org/heads/mjcox.png
 fasname=mjc
 
 [http://blog.chris.tylers.info/index.php?/feeds/categories/24-JustFedora-Planet.rss]
diff --git a/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl
index de097c8bb..aab71df89 100644
--- a/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl
+++ b/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl
@@ -6,7 +6,7 @@
 	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
 	<id><TMPL_VAR feed ESCAPE="HTML"></id>
 	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://planet.fedoraproject.org/edited/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+	<generator uri="http://fedoraplanet.org/edited/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
 	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
diff --git a/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl b/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl
index 562a49392..3a7fbdaa9 100644
--- a/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl
+++ b/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl
@@ -6,7 +6,7 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
@@ -48,7 +48,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="http://fedoranews.org">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/edited/templates/index.html.tmpl b/roles/planet/files/sub-planets/edited/templates/index.html.tmpl
index 943eb5188..3a81b3d9e 100644
--- a/roles/planet/files/sub-planets/edited/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/edited/templates/index.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/edited/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/edited/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/edited/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/edited/atom.xml">
 </head>
 <body class="home">
     <div id="wrapper">
diff --git a/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl
index eec6de128..6a19976bc 100644
--- a/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl
+++ b/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl
@@ -9,7 +9,7 @@
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
 	<title><TMPL_VAR name></title>
     <link><TMPL_VAR link ESCAPE="HTML"></link>
-        <description>Fedora People: http://planet.fedoraproject.org/edited</description>
+        <description>Fedora People: http://fedoraplanet.org/edited</description>
 	<items>
 		<rdf:Seq>
 <TMPL_LOOP Items>
diff --git a/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl
index b1312da14..c5d85c06b 100644
--- a/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl
+++ b/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-   <atom:link href="http://planet.fedoraproject.org/edited/rss20.xml" rel="self" type="application/rss+xml" />
+   <atom:link href="http://fedoraplanet.org/edited/rss20.xml" rel="self" type="application/rss+xml" />
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link></link>
 	<language>en</language>
-        <description>Fedora People: http://planet.fedoraproject.org/edited</description>
+        <description>Fedora People: http://fedoraplanet.org/edited</description>
 
 <TMPL_LOOP Items>
 <item>
diff --git a/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl
index 04aa46b37..09b2b5403 100644
--- a/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl
+++ b/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl
@@ -6,7 +6,7 @@
 	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
 	<id><TMPL_VAR feed ESCAPE="HTML"></id>
 	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://planet.fedoraproject.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+	<generator uri="http://fedoraplanet.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
 	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
diff --git a/roles/planet/files/sub-planets/people/templates/heads.html.tmpl b/roles/planet/files/sub-planets/people/templates/heads.html.tmpl
index c6a585bc7..c6628ac26 100644
--- a/roles/planet/files/sub-planets/people/templates/heads.html.tmpl
+++ b/roles/planet/files/sub-planets/people/templates/heads.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/atom.xml">
     <style type="text/css">
         #content ul {
             overflow: auto;
@@ -51,7 +51,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="https://fedoraproject.org/wiki/FWN">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/people/templates/index.html.tmpl b/roles/planet/files/sub-planets/people/templates/index.html.tmpl
index 45b583ae5..dc41d978d 100644
--- a/roles/planet/files/sub-planets/people/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/people/templates/index.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/atom.xml">
 </head>
 <body class="home">
     <div id="wrapper">
@@ -33,17 +33,17 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="https://fedoraproject.org/wiki/FWN">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 		
                 <h2>Sub-Project planets</h2> 
                 <ul>
-                  <li><a href="http://planet.fedoraproject.org/design/">Design</a></li> 
-                  <li><a href="http://planet.fedoraproject.org/desktop/">Desktop</a></li>
-                  <li><a href="http://planet.fedoraproject.org/security/">Security</a></li>
-                  <li><a href="http://planet.fedoraproject.org/summer-coding/">Summer Coding</a></li>
-             <!-- <li><a href="http://planet.fedoraproject.org/virt/">Virtualisation</a></li> NEEDS CONFIG CREATING 1ST -->
+                  <li><a href="http://fedoraplanet.org/design/">Design</a></li>
+                  <li><a href="http://fedoraplanet.org/desktop/">Desktop</a></li>
+                  <li><a href="http://fedoraplanet.org/security/">Security</a></li>
+                  <li><a href="http://fedoraplanet.org/summer-coding/">Summer Coding</a></li>
+             <!-- <li><a href="http://fedoraplanet.org/virt/">Virtualisation</a></li> NEEDS CONFIG CREATING 1ST -->
                 </ul>
            
 
diff --git a/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl
index 2bf19195c..d0435ed89 100644
--- a/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl
+++ b/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl
@@ -9,7 +9,7 @@
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
 	<title><TMPL_VAR name></title>
     <link><TMPL_VAR link ESCAPE="HTML"></link>
-        <description>Fedora People: http://planet.fedoraproject.org</description>
+        <description>Fedora People: http://fedoraplanet.org</description>
 	<items>
 		<rdf:Seq>
 <TMPL_LOOP Items>
diff --git a/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl
index 882b341fc..81a21926d 100644
--- a/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl
+++ b/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-   <atom:link href="http://planet.fedoraproject.org/rss20.xml" rel="self" type="application/rss+xml" />
+   <atom:link href="http://fedoraplanet.org/rss20.xml" rel="self" type="application/rss+xml" />
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link></link>
 	<language>en</language>
-        <description>Fedora People: http://planet.fedoraproject.org</description>
+        <description>Fedora People: http://fedoraplanet.org</description>
 
 <TMPL_LOOP Items>
 <item>
diff --git a/roles/planet/files/sub-planets/security/base_config b/roles/planet/files/sub-planets/security/base_config
index c5e9c5992..861ce3501 100644
--- a/roles/planet/files/sub-planets/security/base_config
+++ b/roles/planet/files/sub-planets/security/base_config
@@ -1,6 +1,6 @@
 [Planet]
 name = Fedora security Planet
-link = http://planet.fedoraproject.org/security/
+link = http://fedoraplanet.org/security/
 owner_name = Fedora Admin
 owner_email = admin@fedoraproject.org
 cache_directory = /srv/planet/config/security/cache
@@ -22,5 +22,5 @@ spider_threads=20
 # The facewidth of the defined blog defaults to 64.
 
 [DEFAULT]
-face = http://planet.fedoraproject.org/security/images/heads/default.png
+face = http://fedoraplanet.org/security/images/heads/default.png
 
diff --git a/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl
index 23a6f4379..ce41fdfc8 100644
--- a/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl
+++ b/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl
@@ -6,7 +6,7 @@
 	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
 	<id><TMPL_VAR feed ESCAPE="HTML"></id>
 	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://planet.fedoraproject.org/security/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+	<generator uri="http://fedoraplanet.org/security/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
 	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
diff --git a/roles/planet/files/sub-planets/security/templates/heads.html.tmpl b/roles/planet/files/sub-planets/security/templates/heads.html.tmpl
index dcb69be09..edb0426b6 100644
--- a/roles/planet/files/sub-planets/security/templates/heads.html.tmpl
+++ b/roles/planet/files/sub-planets/security/templates/heads.html.tmpl
@@ -6,7 +6,7 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
@@ -48,7 +48,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="http://fedoranews.org">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/security/templates/index.html.tmpl b/roles/planet/files/sub-planets/security/templates/index.html.tmpl
index d3a2d2897..55abc4fef 100644
--- a/roles/planet/files/sub-planets/security/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/security/templates/index.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/security/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/security/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/security/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/security/atom.xml">
 </head>
 <body class="home">
     <div id="wrapper">
diff --git a/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl
index 5b7b84ba9..924066239 100644
--- a/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl
+++ b/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl
@@ -9,7 +9,7 @@
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
 	<title><TMPL_VAR name></title>
     <link><TMPL_VAR link ESCAPE="HTML"></link>
-        <description>Fedora People: http://planet.fedoraproject.org/security</description>
+        <description>Fedora People: http://fedoraplanet.org/security</description>
 	<items>
 		<rdf:Seq>
 <TMPL_LOOP Items>
diff --git a/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl
index 0db2b4a43..236254ef9 100644
--- a/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl
+++ b/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-   <atom:link href="http://planet.fedoraproject.org/security/rss20.xml" rel="self" type="application/rss+xml" />
+   <atom:link href="http://fedoraplanet.org/security/rss20.xml" rel="self" type="application/rss+xml" />
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link></link>
 	<language>en</language>
-        <description>Fedora People: http://planet.fedoraproject.org/security</description>
+        <description>Fedora People: http://fedoraplanet.org/security</description>
 
 <TMPL_LOOP Items>
 <item>
diff --git a/roles/planet/files/sub-planets/summer-coding/base_config b/roles/planet/files/sub-planets/summer-coding/base_config
index f3b69058f..0bf8e04c7 100644
--- a/roles/planet/files/sub-planets/summer-coding/base_config
+++ b/roles/planet/files/sub-planets/summer-coding/base_config
@@ -1,6 +1,6 @@
 [Planet]
 name = Fedora summer-coding Planet
-link = http://planet.fedoraproject.org/summer-coding/
+link = http://fedoraplanet.org/summer-coding/
 owner_name = Fedora Admin
 owner_email = admin@fedoraproject.org
 cache_directory = /srv/planet/config/summer-coding/cache
@@ -22,5 +22,5 @@ spider_threads=20
 # The facewidth of the defined blog defaults to 64.
 
 [DEFAULT]
-face = http://planet.fedoraproject.org/summer-coding/images/heads/default.png
+face = http://fedoraplanet.org/summer-coding/images/heads/default.png
 
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl
index fac59be45..d12edf545 100644
--- a/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl
+++ b/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl
@@ -6,7 +6,7 @@
 	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
 	<id><TMPL_VAR feed ESCAPE="HTML"></id>
 	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://planet.fedoraproject.org/summer-coding/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+	<generator uri="http://fedoraplanet.org/summer-coding/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
 	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl
index 61a7aa919..b4c637d06 100644
--- a/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl
+++ b/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl
@@ -6,7 +6,7 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
@@ -48,7 +48,7 @@
                 <ul>
                     <li><a href="https://fedoraproject.org">Fedora Home</a></li>
                     <li><a href="http://fedoranews.org">Fedora News</a></li>
-                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraplanet.org/heads/">Hackergotchi Heads</a></li>
                     <li><a href="https://fedoraproject.org/infofeed/">Fedora Info</a></li>
                 </ul>
 
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl
index 122577e71..8fcafbd62 100644
--- a/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl
@@ -6,13 +6,13 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
     <meta http-equiv="Content-Type" content="text/html">
     <meta name="MSSmartTagsPreventParsing" content="TRUE">
-    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="print" href="http://fedoraplanet.org/css/print.css">
     <link rel="stylesheet" type="text/css" media="all" href="https://fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
     <link rel="shortcut icon" href="/images/favicon.ico">
     <link rel="icon" href="/images/favicon.ico">
-    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/summer-coding/rss20.xml">
-    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/summer-coding/atom.xml">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://fedoraplanet.org/summer-coding/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://fedoraplanet.org/summer-coding/atom.xml">
 </head>
 <body class="home">
     <div id="wrapper">
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl
index b1cc9d55d..01e2fcfea 100644
--- a/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl
+++ b/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl
@@ -9,7 +9,7 @@
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
 	<title><TMPL_VAR name></title>
     <link><TMPL_VAR link ESCAPE="HTML"></link>
-        <description>Fedora People: http://planet.fedoraproject.org/summer-coding</description>
+        <description>Fedora People: http://fedoraplanet.org/summer-coding</description>
 	<items>
 		<rdf:Seq>
 <TMPL_LOOP Items>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl
index c9a6afa56..b9a982330 100644
--- a/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl
+++ b/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-   <atom:link href="http://planet.fedoraproject.org/summer-coding/rss20.xml" rel="self" type="application/rss+xml" />
+   <atom:link href="http://fedoraplanet.org/summer-coding/rss20.xml" rel="self" type="application/rss+xml" />
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link></link>
 	<language>en</language>
-        <description>Fedora People: http://planet.fedoraproject.org/summer-coding</description>
+        <description>Fedora People: http://fedoraplanet.org/summer-coding</description>
 
 <TMPL_LOOP Items>
 <item>