Opening bug to track issues related to making the mozilla.com and mozilla.org code bases work together when the content of both sites is on mozilla.org. Here is a first pass at issues that need to be considered.
* Design (making the pages look like they're part of same site)
* WebTrends (does the current tracking need to be changed?)
* webmaster@ email addresses (do we stop using the @mozilla.com address?)
* Localization (do we need to use a common setup?)
* Repositories (do we need to merge the repositories or can they be separate?)
* Load balancing (any issues here?)
* Staging (currently the sites have very different staging setups)
* Updating Bugzilla components
* Any other process changes?
We can file bugs for each of these items and sort out the details there.
In the list above I forgot one thing in the back-end issues section:
From discussion with Laura, I realize we also need to add one more item to this list.
* Search (mozilla.com uses Nutch, mozilla.org uses custom Google search)
(In reply to comment #2)
> From discussion with Laura, I realize we also need to add one more item to this
> * Search (mozilla.com uses Nutch, mozilla.org uses custom Google search)
Also worth noting that the new design doesn't have a search box.
> Also worth noting that the new design doesn't have a search box.
(In reply to comment #4)
> > Also worth noting that the new design doesn't have a search box.
> That's interesting...
Would be nice to prepare for the future possibility that it might have one, though.
FYI for James, this is a mozilla.com project that we want to work on after the Firefox 4 release. Since it deals with many back-end issues it has the potential to influence your thinking on changes to mozilla.com you are considering now, so I wanted you to be aware of this. If you have any questions about the background of this bug or what we're wanting to do, let me know and Laura and I are happy to bring you up to speed.
Thanks David, good to know. I haven't done anything with mozilla.org so I'll have to check it out before I have any questions. It would be good to have these domains merged & consistent.
Great. If you have any questions about mozilla.org, I'm happy to answer them.
Another item for the list:
* Submit a new sitemap.xml to Google and other search engines as needed (see bug 629778 and bug 629787 for reference)
For reference, we are moving the open issues mentioned in this bug to a wiki page at
We will then add a bug for each open issue identified there and will set them as a dependency to this bug.
(In reply to comment #7)
> Thanks David, good to know. I haven't done anything with mozilla.org so I'll
> have to check it out before I have any questions. It would be good to have
> these domains merged & consistent.
In the past few months, I've been working on a local copy of mozilla.org, and have made the changes necessary for it to be localizable. Now, the backend is what we currently have on mozilla-europe.org.
After a quick chat with Pascal, I'm going to try to use mozilla.com includes and img dirs as SVN externals, and try to make current pages work in it. There shouldn't be any problems with that, as .html pages we have on both mozilla-europe and mozilla.com are practically the same.
Now, would porting all pages from mozilla.org onto the very same backend that mozilla.com uses help anyhow in the merge process? If so, it should be done before the All Hands.
(In reply to comment #11)
> Now, would porting all pages from mozilla.org onto the very same backend that
> mozilla.com uses help anyhow in the merge process? If so, it should be done
> before the All Hands.
Great, thanks for the work! That definitely helps normalize everything. We'll have to deal with conflicting URLs and figure out how to normalize them (what if both sites have an /about page?). But we'll also have to integrate the two codebases so that they can run off a single site, so your work gets us closer to that.
Milos has done a lot of great work getting an l10n system staged for mozilla.org and hopefully that does help us move forward with the merge.
As James mentions in comment #12 though, there are a lot of open issues and they are all related. Dealing with merging the l10n system means dealing with content overlap and staging systems, etc.
To move forward on any one piece of the merge is going to require that we have a plan for the overall process and someone who can review and approve the overall merge work.
I've copied over the includes folder from mozilla.com into mozilla.org, and am using the style, js and img folders as SVN externals(mozilla.com). Everything works well, no error logs. I needed to change a few lines of code in /includes/ to make it work, though, such as config.inc.php, controller.inc.php for managing per-page includes, prefetch.php(to allow index.html pages on root of the domain) etc.
The basic migration to the mozilla.com system is done. All pages are working properly, except for the style. I'm going to work on styling tonight.
Although this bug is specifically about merging mozilla.com and mozilla.org it is worth noting that this is a first step and we should keep in mind that there is the potential to fold in some or all of a couple other sites.
For example, the recent news about Mozilla Messaging joining Mozilla Labs highlights that we've also talked about merging the mozillamessaging.com site as well at mozilla.org/thunderbird.
I did a testing merge, and you can see the results on:
http://hagege.stage.mozilla.com/en-US/ - Mozilla.org
http://hagege.stage.mozilla.com/en-US/firefox/new/ - Mozilla.com
There are some things that need to be fixed, like redirects, but all of that shouldn't take much time.
FWIW, from what I have in backup(hagege branch just before the merge), to the actual site we now have on hagege staging site, there was only 10 minutes work.
Awesome, thanks Milos. This is great stuff!
This may already have been taken care of, but we should make sure that we don't lose any of the performance optimizations we've made on the site in the last 6-7 months. In particular, we have the www.mozilla.com/en-US/firefox/new/ page loading really fast, which we know helps downloads, and I wouldn't want to lose that.
That was Anthony Ricaud's project, so am copying him here.
Milos, really awesome work. And John, there's really nothing changed here, it's just that .com is basically inheriting a ton of new URLs which render .org content. Existing pages are exactly the same.
Awesome, that's what I was hoping you'd say. Thanks!
As James already said, what I did is just adding a bunch of content pages from mozilla.org, several per-page includes(stored them in separate dir) and new headers and footers, which are also in separate directory. fwiw, mozilla.com works exactly the same - the only thing that changed is the redirect from root of the domain to /ab-CD/firefox/new/.
I just added en-US mozilla.com pages for showcase, and I'm gonna add the rest tonight. So, what are the next steps?
*** Bug 667537 has been marked as a duplicate of this bug. ***
Can I get CC'ed on bug 630980 ?
I have implemented a prototype of the merged site: http://etherpad.mozilla.com:9000/mozmerge
I'm now cleaning up these bugs in the context of our plan which we are going forward with:
I'm also filing new bugs that specifically relate to my prototype.
(In reply to comment #22)
> Can I get CC'ed on bug 630980 ?
*** Bug 655373 has been marked as a duplicate of this bug. ***
*** Bug 655385 has been marked as a duplicate of this bug. ***