infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Move planet.fedoraproject.org to fedoraplanet.org

Browse source
This commit is contained in:
Till Maas 2015-06-04 23:25:01 +02:00
parent 5b91adb3a2
commit ff2f58c243
43 changed files with 112 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

6
playbooks/include/proxies-redirects.yml
View file

@ -181,19 +181,19 @@
name: infofeed
website: fedoraproject.org
path: /infofeed
target: http://planet.fedoraproject.org/infofeed
target: http://fedoraplanet.org/infofeed
- role: httpd/redirect
name: people
website: fedoraproject.org
path: /people
target: http://planet.fedoraproject.org/
target: http://fedoraplanet.org/
- role: httpd/redirect
name: fedorapeople
website: fedoraproject.org
path: /fedorapeople
target: http://planet.fedoraproject.org/
target: http://fedoraplanet.org/
# QA

2
roles/apps-fp-o/files/apps.yaml
View file

@ -112,7 +112,7 @@ children:
- name: The Planet
data:
icon: planet_logo.png
url: http://planet.fedoraproject.org
url: http://fedoraplanet.org
description: >
The planet is a blog aggregator, a space accessible to you
as a community member where you can express your opinion and

2
roles/easyfix/gather/files/template.html
View file

@ -186,7 +186,7 @@
<dl>
<dt>Fedora</dt>
<dd><a href="https://fedoraproject.org/en/about-fedora">About Fedora</a></dd>
<dd><a href="http://planet.fedoraproject.org/">Planet Fedora</a></dd>
<dd><a href="http://fedoraplanet.org/">Planet Fedora</a></dd>
<dd><a href="https://fedoraproject.org/wiki/FWN/LatestIssue">Fedora Weekly News</a></dd>
<dd><a href="https://docs.fedoraproject.org/">Documentation</a></dd>

2
roles/haproxy/files/503.http
View file

@ -44,7 +44,7 @@ Content-Type: text/html; charset=UTF-8
<ul>
<li><a href="//docs.fedoraproject.org/">Docs</a> Fedora documentation.</li>
<li><a href="//fedoraproject.org/wiki/">Wiki</a> Collaborative knowledge.</li>
<li><a href="//planet.fedoraproject.org/">Planet</a> The voices of the Fedora community.</li>
<li><a href="//fedoraplanet.org/">Planet</a> The voices of the Fedora community.</li>
<li><a href="//fedoraproject.org/wiki/Communicate">Communicate</a> Speak with Fedora.</li>
<li><a href="//fedoraproject.org/wiki/FedoraEvents">Events</a> Meet the Fedora community.</li>
</ul>

2
roles/mediawiki/templates/LocalSettings.php.fp.j2
View file

@ -417,7 +417,7 @@ $wgSquidMaxage = 432000;
$wgNoFollowLinks = false;
# This can be an array in version 1.14 and above.
$wgAllowExternalImagesFrom = array("http://fedoraproject.org/", "http://docs.fedoraproject.org", "http://fedorahosted.org/", "http://fedorapeople.org", "http://planet.fedoraproject.org");
$wgAllowExternalImagesFrom = array("http://fedoraproject.org/", "http://docs.fedoraproject.org", "http://fedorahosted.org/", "http://fedorapeople.org", "http://fedoraplanet.org");
$wgAllowUserCss = true;
$wgAllowUserJs = true;

2
roles/nagios_server/files/nagios-external/services/websites.cfg
View file

@ -171,6 +171,6 @@ define service {
define service {
host_name 152.19.134.196-people01
service_description planet
check_command check_website!planet.fedoraproject.org!/!Sub-Project planets
check_command check_website!fedoraplanet.org!/!Sub-Project planets
use websitetemplate
}

12
roles/planet/files/people_base_config
View file

@ -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

42
roles/planet/files/planet.conf
View file

@ -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
@ -32,6 +36,20 @@
Redirect /ldc http://fedoraldc.wordpress.com/feed/
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>
##
@ -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>

4
roles/planet/files/sub-planets/design/base_config
View file

@ -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

2
roles/planet/files/sub-planets/design/templates/atom.xml.tmpl
View file

@ -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>>

8
roles/planet/files/sub-planets/design/templates/heads.html.tmpl
View file

@ -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>

8
roles/planet/files/sub-planets/design/templates/index.html.tmpl
View file

@ -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>

2
roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/desktop/base_config
View file

@ -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

2
roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl
View file

@ -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>>

4
roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl
View file

@ -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>

6
roles/planet/files/sub-planets/desktop/templates/index.html.tmpl
View file

@ -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">

2
roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl
View file

@ -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>

6
roles/planet/files/sub-planets/edited/base_config
View file

@ -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]

2
roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl
View file

@ -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>>

4
roles/planet/files/sub-planets/edited/templates/heads.html.tmpl
View file

@ -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>

6
roles/planet/files/sub-planets/edited/templates/index.html.tmpl
View file

@ -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">

2
roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl
View file

@ -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>

2
roles/planet/files/sub-planets/people/templates/atom.xml.tmpl
View file

@ -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>>

8
roles/planet/files/sub-planets/people/templates/heads.html.tmpl
View file

@ -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>

18
roles/planet/files/sub-planets/people/templates/index.html.tmpl
View file

@ -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>

2
roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/security/base_config
View file

@ -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

2
roles/planet/files/sub-planets/security/templates/atom.xml.tmpl
View file

@ -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>>

4
roles/planet/files/sub-planets/security/templates/heads.html.tmpl
View file

@ -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>

6
roles/planet/files/sub-planets/security/templates/index.html.tmpl
View file

@ -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">

2
roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/summer-coding/base_config
View file

@ -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

2
roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl
View file

@ -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>>

4
roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl
View file

@ -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>

6
roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl
View file

@ -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">

2
roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl
View file

@ -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>

4
roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl
View file

@ -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>