зеркало из https://github.com/mozilla/bedrock.git
Fix Bug 1128579 - Finish moving certs/included and certs/pending web pages to wiki pages
This commit is contained in:
Kohei Yoshino
Родитель
e6d44decf2
Коммит
e27fa38e3d
|
|
@ -1,23 +0,0 @@
|
|||
{# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
|
||||
|
||||
{% extends "mozorg/about-base.html" %}
|
||||
|
||||
{% block page_title %}{{ _('Mozilla Included CA Certificate List') }}{% endblock %}
|
||||
{% block body_class %}sand{% endblock %}
|
||||
|
||||
{% block extrahead %}{% endblock %}
|
||||
|
||||
{% block article %}
|
||||
<h1 class="title-banner">{{ _('Mozilla Included CA Certificate List') }}</h1>
|
||||
<p>{{ _('This is a list of CA certificates that are distributed with Mozilla software products. You can view the <a href="%s">source file with all of the included root certificates</a>.')|format('http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ckfw/builtins/certdata.txt') }}</p>
|
||||
|
||||
<p>{{ _('If the spreadsheet does not display in the iframe below, then you may <a href="%s">access the spreadsheet directly</a>.')|format('https://docs.google.com/spreadsheet/pub?key=0Ah-tHXMAwqU3dGx0cGFObG9QM192NFM4UWNBMlBaekE&single=true&gid=1&output=html') }}</p>
|
||||
|
||||
<iframe height="700px" width="100%" src="https://docs.google.com/spreadsheet/pub?key=0Ah-tHXMAwqU3dGx0cGFObG9QM192NFM4UWNBMlBaekE&single=true&gid=1&output=html">
|
||||
<a href="https://docs.google.com/spreadsheet/pub?key=0Ah-tHXMAwqU3dGx0cGFObG9QM192NFM4UWNBMlBaekE&single=true&gid=1&output=html">{{ _('View spreadsheet') }}</a>
|
||||
</iframe>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
<ul>
|
||||
<li><a href="{{ url('mozorg.about.governance.policies.security.certs.policy') }}">{{ _('Mozilla CA Certificate Policy') }}</a>
|
||||
<li><a href="https://wiki.mozilla.org/CA:Overview">{{ _('Mozilla CA Certificate Program Overview') }}</a>
|
||||
<li><a href="{{ url('mozorg.about.governance.policies.security.certs.pending') }}">{{ _('List of pending inclusion requests') }}</a> {{ _('— Certification Authorities (CAs) who have applied for inclusion of their certificates into Mozillaʼs CA Certificate Program, and whose applications are pending.') }}</li>
|
||||
<li><a href="{{ url('mozorg.about.governance.policies.security.certs.included') }}">{{ _('List of included root certificates') }}</a> {{ _('— CA certificates that are incuded in the NSS root certificate store, and distributed with Mozilla software products.') }} </li>
|
||||
<li><a href="https://wiki.mozilla.org/CA:PendingCAs">{{ _('List of pending inclusion requests') }}</a> {{ _('— Certification Authorities (CAs) who have applied for inclusion of their certificates into Mozillaʼs CA Certificate Program, and whose applications are pending.') }}</li>
|
||||
<li><a href="https://wiki.mozilla.org/CA:IncludedCAs">{{ _('List of included root certificates') }}</a> {{ _('— CA certificates that are incuded in the NSS root certificate store, and distributed with Mozilla software products.') }} </li>
|
||||
<li><a href="http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ckfw/builtins/certdata.txt">{{ _('Source file with all of the included root certificates') }}</a>
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
{# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
|
||||
|
||||
{% extends "mozorg/about-base.html" %}
|
||||
|
||||
{% block page_title %}{{ _('Mozilla Pending CA Certificate List') }}{% endblock %}
|
||||
{% block body_class %}sand{% endblock %}
|
||||
|
||||
{% block extrahead %}{% endblock %}
|
||||
|
||||
{% block article %}
|
||||
<h1 class="title-banner">{{ _('Mozilla Pending CA Certificate List') }}</h1>
|
||||
|
||||
<p>{{ _('This is a list of Certification Authorities (CAs) who have applied for inclusion of their certificates into the Mozilla project Root CA store, and whose applications are <a href="%s">pending</a>.')|format('https://wiki.mozilla.org/CA:Schedule') }}</p>
|
||||
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>{{ _('Approved, pending inclusion') }}</th>
|
||||
<td>{{ _('Approved requests that are in the <a href="%s">inclusion phase</a> are highlighted in blue.')|format('https://wiki.mozilla.org/CA:How_to_apply#Inclusion') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ _('Ready for Public Discussion') }}</th>
|
||||
<td>{{ _('Requests that are ready for <a href="%s">public discussion</a> are highlighted in green.')|format('https://wiki.mozilla.org/CA:How_to_apply#Public_discussion') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ _('In Public Discussion') }}</th>
|
||||
<td>{{ _('Requests in <a href="%s">public discussion</a> are highlighted in yellow.')|format('https://wiki.mozilla.org/CA:How_to_apply#Public_discussion') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ _('CA Actions Items from Discussion') }}</th>
|
||||
<td>{{ _('Requests pending completion of action items resulting from <a href="%s">public discussion</a> are highlighted in yellow.')|format('https://wiki.mozilla.org/CA:How_to_apply#Public_discussion') }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p>{{ _('View the <a href="%s">list of CA certificates that are currently distributed with Mozilla software products</a>.')|format(url('mozorg.about.governance.policies.security.certs.included')) }}</p>
|
||||
|
||||
<p>{{ _('If the spreadsheet does not display in the iframe below, then you may <a href="%s">access the spreadsheet directly</a>.')|format('https://docs.google.com/spreadsheet/pub?key=0Ah-tHXMAwqU3dHEtbFRSUGVtN0hoUVZnajFNRlJWenc&output=html') }}</p>
|
||||
|
||||
<iframe width="100%" height="700px" src="https://docs.google.com/spreadsheet/pub?key=0Ah-tHXMAwqU3dHEtbFRSUGVtN0hoUVZnajFNRlJWenc&output=html">
|
||||
<a href="https://docs.google.com/spreadsheet/pub?key=0Ah-tHXMAwqU3dHEtbFRSUGVtN0hoUVZnajFNRlJWenc&output=html">{{ _('View spreadsheet') }}</a>
|
||||
</iframe>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -41,8 +41,6 @@ urlpatterns = patterns('',
|
|||
page('about/governance/policies/security-group/tld-idn', 'mozorg/about/governance/policies/security/tld-idn.html'),
|
||||
page('about/governance/policies/security-group/membership', 'mozorg/about/governance/policies/security/membership.html'),
|
||||
page('about/governance/policies/security-group/certs', 'mozorg/about/governance/policies/security/certs/index.html'),
|
||||
page('about/governance/policies/security-group/certs/included', 'mozorg/about/governance/policies/security/certs/included.html'),
|
||||
page('about/governance/policies/security-group/certs/pending', 'mozorg/about/governance/policies/security/certs/pending.html'),
|
||||
page('about/governance/policies/security-group/certs/policy', 'mozorg/about/governance/policies/security/certs/policy.html'),
|
||||
page('about/governance/policies/security-group/certs/policy/enforcement', 'mozorg/about/governance/policies/security/certs/enforcement.html'),
|
||||
page('about/governance/policies/security-group/certs/policy/maintenance', 'mozorg/about/governance/policies/security/certs/maintenance.html'),
|
||||
|
|
|
|||
|
|
@ -637,10 +637,12 @@ RewriteRule ^/projects/security/membership-policy.html$ /about/governance/polici
|
|||
RewriteRule ^/projects/security/secgrouplist.html$ /about/governance/policies/security-group/ [L,R=301]
|
||||
RewriteRule ^/projects/security/security-bugs-policy.html$ /about/governance/policies/security-group/bugs/ [L,R=301]
|
||||
|
||||
# bug 818316
|
||||
# bug 818316, 1128579
|
||||
RewriteRule ^/projects/security/certs(?:/(?:index.html)?)?$ /about/governance/policies/security-group/certs/ [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/included(?:/(?:index.html)?)?$ /about/governance/policies/security-group/certs/included/ [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/pending(?:/(?:index.html)?)?$ /about/governance/policies/security-group/certs/pending/ [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/included(?:/(?:index.html)?)?$ https://wiki.mozilla.org/CA:IncludedCAs [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/pending(?:/(?:index.html)?)?$ https://wiki.mozilla.org/CA:PendingCAs [L,R=301]
|
||||
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?about/governance/policies/security-group/certs/included(?:/(?:index.html)?)?$ https://wiki.mozilla.org/CA:IncludedCAs [L,R=301]
|
||||
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?about/governance/policies/security-group/certs/pending(?:/(?:index.html)?)?$ https://wiki.mozilla.org/CA:PendingCAs [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/policy(?:/(?:index.html)?)?$ /about/governance/policies/security-group/certs/policy/ [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/policy/EnforcementPolicy.html /about/governance/policies/security-group/certs/policy/enforcement/ [L,R=301]
|
||||
RewriteRule ^/projects/security/certs/policy/MaintenancePolicy.html /about/governance/policies/security-group/certs/policy/maintenance/ [L,R=301]
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче