Closed Bug 987852 Opened 12 years ago Closed 10 years ago

Migrate MPL content to bedrock

Categories

(www.mozilla.org :: Legacy PHP system, defect)

Product:
www.mozilla.org
Component:
Legacy PHP system
Version:
Development/Staging
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: hoosteeno, Assigned: sgarrity)

References

Details

(Whiteboard: [kb=1315497] )

Attachments

(2 files)

Link to Github pull-request: https://github.com/mozilla/bedrock/pull/3270
44 bytes, text/x-github-pull-request
Details | Review
patch to remove /MPL files from SVN
947.57 KB, patch
pmac
: review+
Details | Diff | Splinter Review
We should migrate the MPL content to bedrock/sandstone. Questions to consider/discuss: * Does all the content associated with MPL need to live at www, or could some move to wikimo, MDN, the www-archive, or elsewhere? * Do we need anything more complex than some static templates to house this content? For example, is there any compelling case to build out a Nucleus workflow for it? (Prior discussion has indicated that templates in Github may be sufficient.)
www.mozilla.org/MPL is a very widely-shared URL. In general, the MPL content benefits from not being easily changeable by just anyone; I wouldn't want to move it to a wiki. Also, many of these documents are legal documents published by the Foundation; www.mozilla.org is the conceptually right home for them. Everything is current; there's nothing that could go to www-archive. The documents are not dynamic, and not updated all that frequently. It would be acceptable for them to be stored in a different repo to which patches could be applied. I don't fully understand the question about static templates, or what Nucleus is. Gerv
(In reply to Gervase Markham [:gerv] from comment #2) > www.mozilla.org/MPL is a very widely-shared URL. > > In general, the MPL content benefits from not being easily changeable by > just anyone; I wouldn't want to move it to a wiki. Also, many of these > documents are legal documents published by the Foundation; www.mozilla.org > is the conceptually right home for them. > > Everything is current; there's nothing that could go to www-archive. > > The documents are not dynamic, and not updated all that frequently. It would > be acceptable for them to be stored in a different repo to which patches > could be applied. I don't fully understand the question about static > templates, or what Nucleus is. > > Gerv You can read about Nucleus here: https://wiki.mozilla.org/Websites/Mozilla.org/Publishing It is light version of a content management system for structured content. Given that the MPL is not purely structured content, is just paragraphs of text and markup, and doesn't change often, I think simply creating bedrock templates will be the easiest solution. Any changes to the text in the future would just require doing a github pull request, have it reviewed, and merged into master. Everything at /MPL/* receives about 800-1000 pageviews a day.
How about converting the MPL docs to Markdown and moving them to https://github.com/mozilla/legal-docs like privacy policies?
(In reply to Kohei Yoshino [:kohei] from comment #4) > How about converting the MPL docs to Markdown and moving them to > https://github.com/mozilla/legal-docs like privacy policies? I wouldn't want to do that for the MPL itself (its markup needs are complex), and it seems to make sense to have all this stuff in the same URL tree. That repo seems to be for legal docs relating to Mozilla; the MPL is much more widely used than that. I'm very happy with the template solution. Gerv
Depending on how quickly this needs to be done, I'd be glad to help with the porting to bedrock, and agree with the basic bedrock/template setup. I'll be a few weeks before I'll be able to get to this though.
Hi Gerv- Great! I'm glad the template solution can work! Hi Steven - Thanks! I'd love to get this done in May-June 2014 after Australis launches.
Adding to the mozilla.org Kanban board to work on starting in May.
Whiteboard: [kb=1315497]
Assignee: nobody → steven
OS: Mac OS X → All
Hardware: x86 → All
Hi Malena- Do you have bandwidth to pick this one up in the next week or so? Thx, Jen
Blocks: 1186102
Hey Jen, Sorry for such a late response! Getting to it this week.
I have added the pages to be archived to the website-archive repo in r145674. Redirects and actual removals are still to come.
Commits pushed to master at https://github.com/mozilla/bedrock https://github.com/mozilla/bedrock/commit/b2b5bbde1fdbe83ce9337fc19e9ab60e11e2ffec Bug 987852 Migrate MPL to bedrock https://github.com/mozilla/bedrock/commit/3f05a479395714555f59cb1b89ada41b3413cb0a Merge pull request #3239 from malena/bug-987852-migrate-mpl-to-bedrock Bug 987852 Migrate MPL to bedrock
This PR adds the redirects for the archived MPL pages.
The FAQ URL works for me locally, but I do see the 500 error in production. Steven's PR above is not related to that. Here is the URL mapping in bedrock https://github.com/mozilla/bedrock/blob/master/bedrock/mozorg/urls.py#L196
Commits pushed to master at https://github.com/mozilla/bedrock https://github.com/mozilla/bedrock/commit/c44353bc3692d5cb0e7e3d8e72b3dc4e06ebcecd Bug 987852 Add redirects for archived MPL pages https://github.com/mozilla/bedrock/commit/839a1932affe99d0aff5c29c39bebb74e1e42834 Merge pull request #3270 from sgarrity/bug-987852-mpl-archive-redirects Bug 987852 Add redirects for archived MPL pages
(In reply to Stephen Donner [:stephend] from comment #14) > Right now, https://www.mozilla.org/en-US/MPL/2.0/FAQ/ throws a 500; I take > it this pull fixes that? > > New Relic: > https://rpm.newrelic.com/accounts/263620/applications/2639284/traced_errors/ > 39c6d9-fd61e2b6-519b-11e5-871a-c81f66b8ceca I filed Bug 1201467 for this. Will look into it.
Depends on: 1201914
This is just a straight remove of everything in the /MPL dir. Here's an SVN status: D MPL D MPL/.htaccess D MPL/0.95 D MPL/0.95/index.html D MPL/0.95/index.txt D MPL/1.0 D MPL/1.0/annotated D MPL/1.0/annotated/annotated.html D MPL/1.0/annotated/annotations.html D MPL/1.0/annotated/header.html D MPL/1.0/annotated/index.html D MPL/1.0/index.html D MPL/1.0/index.txt D MPL/1.1 D MPL/1.1/FAQ.html D MPL/1.1/annotated D MPL/1.1/annotated/index.html D MPL/1.1/index.html D MPL/1.1/index.txt D MPL/2.0 D MPL/2.0/FAQ.html D MPL/2.0/Revision-FAQ.html D MPL/2.0/combining-mpl-and-gpl.html D MPL/2.0/differences.html D MPL/2.0/index.html D MPL/2.0/index.txt D MPL/2.0/permissive-code-into-mpl.html D MPL/2.0/process D MPL/2.0/process/MPL Archive Materials.zip D MPL/2.0/process/faq.html D MPL/2.0/process/index.html D MPL/2.0/process/people.html D MPL/2.0/process/process.html D MPL/2.0/process/scope D MPL/2.0/process/scope/binaries.html D MPL/2.0/process/scope/commercial-distribution.html D MPL/2.0/process/scope/explicit-trademark-and-fair-use-language.html D MPL/2.0/process/scope/globalization.html D MPL/2.0/process/scope/index.html D MPL/2.0/process/scope/initial-distributorcontributor-distinction.html D MPL/2.0/process/scope/jacobsen.html D MPL/2.0/process/scope/new-versions.html D MPL/2.0/process/scope/patent-defense-clause.html D MPL/2.0/process/scope/readability.html D MPL/2.0/process/scope/required-notices.html D MPL/2.0/process/scope/requirements-section-3-1-3-4.html D MPL/2.0/process/scope/source-executable-distinction.html D MPL/2.0/process/scope/tri-license-and-the-gpl.html D MPL/2.0/process/updatingthempl.wordpress.2012-12-12.xml D MPL/NPL D MPL/NPL/0.9 D MPL/NPL/0.9/annotated D MPL/NPL/0.9/annotated/annotations.html D MPL/NPL/0.9/annotated/index.html D MPL/NPL/0.9/index.html D MPL/NPL/0.9/index.txt D MPL/NPL/0.95 D MPL/NPL/0.95/index.html D MPL/NPL/0.95/index.txt D MPL/NPL/1.0 D MPL/NPL/1.0/FAQ.html D MPL/NPL/1.0/annotated D MPL/NPL/1.0/annotated/annotated.html D MPL/NPL/1.0/annotated/header.html D MPL/NPL/1.0/annotated/index.html D MPL/NPL/1.0/index.html D MPL/NPL/1.0/index.txt D MPL/NPL/1.0M D MPL/NPL/1.0M/FAQ.html D MPL/NPL/1.0M/index.html D MPL/NPL/1.1 D MPL/NPL/1.1/index.html D MPL/NPL/1.1/index.txt D MPL/boilerplate-1.1 D MPL/boilerplate-1.1/.htaccess D MPL/boilerplate-1.1/index.html D MPL/boilerplate-1.1/mpl-c D MPL/boilerplate-1.1/mpl-dual-gpl.c D MPL/boilerplate-1.1/mpl-dual-gpl.html D MPL/boilerplate-1.1/mpl-dual-gpl.m4 D MPL/boilerplate-1.1/mpl-dual-gpl.sh D MPL/boilerplate-1.1/mpl-dual-gpl.txt D MPL/boilerplate-1.1/mpl-dual.c D MPL/boilerplate-1.1/mpl-dual.html D MPL/boilerplate-1.1/mpl-dual.m4 D MPL/boilerplate-1.1/mpl-dual.sh D MPL/boilerplate-1.1/mpl-dual.txt D MPL/boilerplate-1.1/mpl-html D MPL/boilerplate-1.1/mpl-m4 D MPL/boilerplate-1.1/mpl-sh D MPL/boilerplate-1.1/mpl-tri-license-c D MPL/boilerplate-1.1/mpl-tri-license-html D MPL/boilerplate-1.1/mpl-tri-license-m4 D MPL/boilerplate-1.1/mpl-tri-license-sh D MPL/boilerplate-1.1/mpl-tri-license-txt D MPL/boilerplate-1.1/mpl-txt D MPL/boilerplate-1.1/npl-dual-gpl.c D MPL/boilerplate-1.1/npl-dual-gpl.html D MPL/boilerplate-1.1/npl-dual-gpl.m4 D MPL/boilerplate-1.1/npl-dual-gpl.sh D MPL/boilerplate-1.1/npl-dual-gpl.txt D MPL/boilerplate-1.1/npl-tri-license-c D MPL/boilerplate-1.1/npl-tri-license-html D MPL/boilerplate-1.1/npl-tri-license-m4 D MPL/boilerplate-1.1/npl-tri-license-sh D MPL/boilerplate-1.1/npl-tri-license-txt D MPL/boilerplate-1.1/npl.c D MPL/boilerplate-1.1/npl.html D MPL/boilerplate-1.1/npl.m4 D MPL/boilerplate-1.1/npl.sh D MPL/boilerplate-1.1/npl.txt D MPL/boilerplate-1.1/pd-c D MPL/boilerplate-1.1/pd-html D MPL/boilerplate-1.1/pd-m4 D MPL/boilerplate-1.1/pd-sh D MPL/boilerplate-1.1/pd-txt D MPL/headers D MPL/headers/index.html D MPL/historical.html D MPL/index.html D MPL/license-policy-flowchart.odg D MPL/license-policy-flowchart.png D MPL/license-policy.html D MPL/missing-hacker.jpg D MPL/missing.html
Attachment #8662958 - Flags: review?(pmac)
Attachment #8662958 - Flags: review?(pmac) → review+
SVN files removed in r146878.
Status: NEW → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: