Repoint 2018.foss4g.org to new location and revise git pull to follow gitea staging/production branches

[timlinux]

Thanks so much for helping us get a Wordpress instance set up. We have everything configured now and would like to go live with it. Could you please epoint staging.2018.foss4g.org to 2018.foss4g.org?

[timlinux]

Hi can I just check if anyone has noticed this issue? It would be great to get the new site online.

Also, could you please point the staging url to the current site so

2018.foss4g.org points to the wordpress site you set up

staging.2018.foss4g.org points to our current live site (52.28.51.102)

Thanks so much!

Regards

Tim

[robe]

I'm on it now. I'll create a new site based on your staging one so you can still have a staging.

I'll let you know once I have in place.

[robe]

Okay repointed now. I still have git repo only feeding to staging.

To feed to prod as well, I'm going to put in a text file in git for prod.

So would be something like prod.txt.

So if the file is present, it will push changes to prod as well and if the file is not present changes will only go to staging.

[robe]

forgot to mention, it might not have propagated for you yet since you visit the site often.

Once it's propagated. You should be able to access it via

​https://2018.foss4g.org/

[robe]

Okay I have the prod.txt/dev.txt switch file in place now.

I see though that you guys are making content changes in staging though and I have the two databases different at the moment.

e.g. this page exists in Staging, but not in prod.

​https://staging.2018.foss4g.org/about/#Dar%20LOC

, but not in

​https://2018.foss4g.org/about/#Dar%20LOC

Should I reupdate the production database.

The staging should only be used for testing themes before deployment to production as such a change could break the site.

[strk]

May I suggest to map git branches to staging/production instead of a file ?

I'm thinking it would be hard to work on a staging change while at the same time having the need to fix a typo in production otherwise.

[timlinux]

Thanks so much for this @robe!

@Edgar can you document the workflows somewhere? If Regina has set up the staging instance for us we don't need to self manage one on the Amazon Web Server from Ragnvald so lets rather shut that down and use the OSGEO provided one.

@Edgar can you also comment if the git workflow is clear for you?

[mloweedgar]

@Tim I have understood the both work flows. I think we are going for the branching work flow that is having staging and production branches. @robe we would prefer using branches, my question is, should create the staging/production branches or you are going to do that for us. my apologizes for writing this comment late.

[robe]

You can go ahead and branch and name as you see fit. Just let me know when you are done and then I'll change the pull scripts accordingly to point to the respective branches.

[beaty]

Thanks all for pushing this forward. @robe we have created staging and production branches which will be used to push changes to the staging and production(live) sites respectively. you can now change the pull scripts accordingly to the respective branches @robe. Thanks in advance.

[robe]

Okay I have 2018.foss4g.org now following the production branch and staging.2018.foss4g.org now following the staging branch. I've deleted the dev.txt file to minimize on confusion and updated the READMEs to reflect the new workflow.

[timlinux]

Thank you so much for your support Regina!