diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 2b41e45267..99b636d509 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -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 diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml index bf14b7b92b..a67f2509d5 100644 --- a/roles/apps-fp-o/files/apps.yaml +++ b/roles/apps-fp-o/files/apps.yaml @@ -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 diff --git a/roles/easyfix/gather/files/template.html b/roles/easyfix/gather/files/template.html index 6610f6fd4a..44cc149998 100644 --- a/roles/easyfix/gather/files/template.html +++ b/roles/easyfix/gather/files/template.html @@ -186,7 +186,7 @@
Fedora
About Fedora
-
Planet Fedora
+
Planet Fedora
Fedora Weekly News
Documentation
diff --git a/roles/haproxy/files/503.http b/roles/haproxy/files/503.http index b2c61cefda..b1b86fe152 100644 --- a/roles/haproxy/files/503.http +++ b/roles/haproxy/files/503.http @@ -44,7 +44,7 @@ Content-Type: text/html; charset=UTF-8 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index d549f0d16f..5ee01d2573 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -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; diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index e5592b2234..8e7b4532c5 100644 --- a/roles/nagios_server/files/nagios-external/services/websites.cfg +++ b/roles/nagios_server/files/nagios-external/services/websites.cfg @@ -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 } diff --git a/roles/planet/files/people_base_config b/roles/planet/files/people_base_config index 74c1e94bd5..e6db379411 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 cd9ad5c761..b4c9eecfdb 100644 --- a/roles/planet/files/planet.conf +++ b/roles/planet/files/planet.conf @@ -1,15 +1,19 @@ ## - # 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 + + + 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 + ## @@ -57,22 +75,6 @@ UserDir disable AddCharset UTF-8 .xml - - ExpiresActive On - ExpiresDefault "access plus 5 days" - - - - ExpiresActive On - ExpiresDefault "access plus 5 days" - - - - Options Indexes FollowSymLinks - - - 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 diff --git a/roles/planet/files/sub-planets/design/base_config b/roles/planet/files/sub-planets/design/base_config index ecf95cd693..ef7f41bd02 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 04aa46b373..09b2b54036 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 @@ "/> - + xml:lang=""> 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 29c49245aa..4fa78b1295 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 @@ - + - - + +