Skip to main content

apache 2.2 - Managing websites with Git under Ubuntu



So we've just received our new server which will be used solely for website development and version control.



I've set up Ubuntu (11.04 desktop edition, I like interfaces, sorry!) and installed Apache, PHP and MySQL - so far, so good.



We've decided that we want to use Git as our version managing system, since we've had good experiences with it. But... We're unsure of how to lay out, our structure. So I'm hoping you can help us.



Current setup




At the moment, we run one development server bbtsrv02 which is a Windows server, running XAMPP. We do all of our developments on this server and it leads to a lot of noise and mess when we're hacking things quickly.



Once the changes have been made locally, we upload these files to our external server (hosted by someone else) via FTP.





It's far from practical, there can be 3/5 developers at one time working on the site as a whole. It causes conflicts and... it's not nice.



The current idea




The idea is to use bbtsrv02 as a "mirror" server. It'll contain all of the most up to date and live code. bbtsrv03 (the new server) will be our development server. We'll have the master branch which will also contain the live code, and each developer will branch their own version for each change.



But... Further thinking has led me to come to the conclusion, that we'll need to setup some virtual hosts, for each developer so they can close the master repo and work from there?



I don't have much experience in this area, but my current plan is to partition the main HDD and give us each enough space to develop on.



We then push our changes from our branch to the master one and then "copy" it into bbtsrv02 and upload. I'm hoping of course, I can make some bash scripts to do that for me?


Answer



The way that we do it (YMMV) is as follows:




Each dev builds and does basic code tests on their desktop/laptop etc. They use git locally to commit changes, branch etc. When they are ready to push, they take what ever local actions the need to clean up their timeline and then they push.



The push goes to a staging server. Our staging server is a mirror of our production servers. We do load testing, code reviews, and final checks there.



Once we pass that level, we push to the production servers.


Comments

Post a Comment

Popular posts from this blog

iLO 3 Firmware Update (HP Proliant DL380 G7)

The iLO web interface allows me to upload a .bin file ( Obtain the firmware image (.bin) file from the Online ROM Flash Component for HP Integrated Lights-Out. ) The iLO web interface redirects me to a page in the HP support website ( http://www.hp.com/go/iLO ) where I am supposed to find this .bin firmware, but no luck for me. The support website is a mess and very slow, badly categorized and generally unusable. Where can I find this .bin file? The only related link I am able to find asks me about my server operating system (what does this have to do with the iLO?!) and lets me download an .iso with no .bin file And also a related question: what is the latest iLO 3 version? (for Proliant DL380 G7, not sure if the iLO is tied to the server model)
Post a Comment
Read more

linux - Awstats - outputting stats for merged Access_logs only producing stats for one server's log

I've been attempting this for two weeks and I've accessed countless number of sites on this issue and it seems there is something I'm not getting here and I'm at a lost. I manged to figure out how to merge logs from two servers together. (Taking care to only merge the matching domains together) The logs from the first server span from 15 Dec 2012 to 8 April 2014 The logs from the second server span from 2 Mar 2014 to 9 April 2014 I was able to successfully merge them using the logresolvemerge.pl script simply enermerating each log and > out_putting_it_to_file Looking at the two logs from each server the format seems exactly the same. The problem I'm having is producing the stats page for the logs. The command I've boiled it down to is /usr/share/awstats/tools/awstats_buildstaticpages.pl -configdir=/home/User/Documents/conf/ -config=example.com awstatsprog=/usr/share/awstats/wwwroot/cgi-bin/awstats.pl dir=/home/User/Documents/parced -month=all -year=all...
Post a Comment
Read more

linux - How can I get my mediawiki to stop thinking I have cookies disabled?

I've searched half a day for how to resolve this issue, and can't figure it out. Shortly after I made my wiki a simple private wiki according to the instructions at Mediawiki's website, it started giving me this weird login error message: Wiki uses cookies to log in users. You have cookies disabled. Please enable them and try again. If I remove those private wiki settings, the error disappears, even if I try logging in. But I need it to be a private wiki for only my team. So what do I do? Here's what I've done so far. Just to be safe, after ever change, I try rebooting Apache using: sudo /etc/init.d/apache2 restart In my php.ini file, I have the following set: session.save_path = "/var/lib/php5" session.cookie_secure = secure session.cookie_path = /tmp session.cookie_domain = my server's internal URL (should I even set this? this field was blank before, but not commented out) session.referer_check = Off I ran the following to ensure that the fold...
Post a Comment
Read more