Tidy up server home folder

raquelalegre commented 8 years ago

@lbewlay I can't figure out where in the home folder in the server is the copy of our repository. Can you point me to it? I'm referring to the folder that contains this repository where you have run npm to start the server. I need to do git pull to get the latest branches and test the feature/dataSync branch.

raquelalegre commented 8 years ago

Also the date is wrong, which is slightly important for the cronjob. I was planning to run it every midnight, assuming there won't be much traffic at that time and it can download stuff as needed. The date in the server is 9AM when it should be 4PM (I think).

lbewlay commented 8 years ago

the 'develop' repository is located at '/home/dev/git/testing/IPPR/develop'

raquelalegre commented 8 years ago

Thanks! We should maybe move it to something like /home/dev/server and don't have separated folders per branch, but that can be done later on. I'll update the branches and test the script.

lbewlay commented 8 years ago

I updated the timezone on the server to GMT +2 now.

lbewlay commented 8 years ago

Ok i can clean up the folders when you are done with this current iteration

raquelalegre commented 8 years ago

Cool, thanks. I have the cronjob in place. It's in /home/dev/git/IPPR/utils/SyncFlexicadastre.sh By now it only synchronises the data in /home/dev/data/flexicadastre with the contentes of http://data.pudo.org/flexicadastre. We still need to detect a new file was downloaded with something like inotifywait in this script. We'll get there later :)

I had to download the repo again elsewhere, otherwise by changing branches I could mess up with the live server. We need to figure out how it's best to tidy up the server, so I'm reopening the issue.

raquelalegre commented 8 years ago

The person who does this needs to know:

To connect to the server as dev: ssh -X dev@45.55.35.212 (password is in "Accounts" email)
The repo supplying the live (staging) web is in /home/dev/git/testing/IPPR/develop (Shouldn't use a folder for the branch, just checkout whatever branch)
The test repo where I'm testing the cronjob: /home/dev/git/IPPR/
To correct the cronjob if the repo moves elsewhere: crontab -e and modify last line with correct path to script.
To see the contents of the cronjob: crontab -l
We need to have a production and a staging site, I'm not sure where we're at right now.

lbewlay commented 8 years ago

Would the production and staging site require separate servers?

raquelalegre commented 8 years ago

Same server, different ports/folders, but maybe @ruta-goomba or @missfunmi know better.

lbewlay commented 8 years ago

Ok let me know what works best and I can work with them on setting it up.

lbewlay commented 8 years ago

Are there any updates to the server code? I can look at separating the server out into development, staging and production areas

nsetru commented 8 years ago

I thought I will start with this one. I will get in touch with @raquel-ucl for detail to server

lbewlay commented 8 years ago

I can also share the server details with you if necessary.

lbewlay commented 8 years ago

Shall I download the latest develop repo to the server to reflect changes?

missfunmi commented 8 years ago

@lbewlay I don't believe the develop branch has the latest code. The latest changes are on the various feature/ branches which we need to merge back to the develop branch. Hopefully we can do this in the next week or so.

lbewlay commented 8 years ago

Ok. If there is anything I can do to help merge them together let me know.

raquelalegre commented 8 years ago

@lbewlay the develop branch has now the latests changes. Can you git pull the latest changes in develop and start the server again? It may need also installing new modules, so do:

npm install
npm start

In general the develop branch should always have the latest stable development work, not the latest which will mostly be unstable. The latest happens in branch and needs to be tested before it goes to develop.

The master branch should be served in production, once we have a nice set of changes upon completion of a milestone or for a new release. We'll merge develop to master when we finish the linked highlighting of UI elements and finalise the first milestone.

lbewlay commented 8 years ago

@raquel-ucl : I cloned the develop branch into the home folder. I also moved the old folders into the folder "old files" . The latest files are under the folder "IPPR"

nsetru commented 8 years ago

I suppose this issue doesn't need any volunteer. I'm assuming @lbewlay have done the tidy-up pf /home/ directory on server. So, I will un-assign myself from this task.

missfunmi commented 8 years ago

Moving this to the next milestone

namibmap / IPPR

Tidy up server home folder #54