Derive staging from master

[cvvergara]

Currently making a merge or a rebase is complicated, because staging does not come from master.

[cvvergara]

I copied the whole /var/www/staging.www.osgeo.org directory to /var/www/staging1.www.osgeo.org So that I can do so tests without disrupting staging

How can I see /var/www/staging1.www.osgeo.org

maybe some apache stuff is needed?

[cvvergara]

I made a complete backup, so I will be working on staging ... staging will be down until further notice

[cvvergara]

My first experiment is:

making master work on staging with staging db

[cvvergara]

staging basically has now master (with some minor changes)

my next step is see what files dont commit to keep them equal maybe

For security dont add to repo: wp-config.php config.php

For size: httpdocs/wp-content/uploads

and instead have a soft link into osgeo.org's httpdocs/wp-content/uploads

Will do that when during the week

staging is working again on the meantime

[cvvergara]

Done

Some uploaded resources might have being lost.