{"id":1267,"date":"2014-07-26T21:59:22","date_gmt":"2014-07-26T20:59:22","guid":{"rendered":"http:\/\/fbcs.co.uk\/?p=1267"},"modified":"2015-12-09T19:06:40","modified_gmt":"2015-12-09T19:06:40","slug":"website-version-control-with-git","status":"publish","type":"post","link":"https:\/\/wp.fbcs.co.uk\/website-version-control-with-git\/","title":{"rendered":"Website version control with Git"},"content":{"rendered":"<p>\n\tSome notes on using <a href=\"http:\/\/git-scm.com\/\" target=\"_blank\">git<\/a> to manage development and production versions of a website on a Linux server, based on <a href=\"http:\/\/toroid.org\/ams\/git-website-howto\" target=\"_blank\">Using Git to manage a web site<\/a>.&nbsp; There seem to be several web pages with similar ideas out there: I don&#8217;t know who wrote it down first.&nbsp; And also with reference to <a href=\"http:\/\/shop.oreilly.com\/product\/9780596520137.do\" target=\"_blank\"><cite>Version Control with Git<\/cite><\/a> by Jon Loeliger.\n<\/p>\n<p>\n\tI&#8217;ve adapted those ideas for the way I like to do things:\n<\/p>\n<ul>\n<li>\n\t\tI SSH in to the server, and do the editing there, using vim.\n\t<\/li>\n<li>\n\t\tI have separate domains for development and production versions of my sites.&nbsp; For the purposes of these notes, they&#8217;re called <code>dev.example.org<\/code> and <code>www.example.org<\/code>.&nbsp; So the development version is also an active real-world website: my nginx configuration makes it only visible to me.\n\t<\/li>\n<li>\n\t\tThe document roots are <code>\/var\/www\/website<\/code> and <code>\/var\/www\/website-dev<\/code> respectively.\n\t<\/li>\n<li>\n\t\tThe &#8216;bare&#8217; production git repository can be anywhere on the server.&nbsp; I&#8217;ll put it at <code>\/var\/www\/website.git<\/code>.&nbsp; It&#8217;s a git convention to use the <code>.git<\/code> extension for bare repositories.\n\t<\/li>\n<\/ul>\n<p>\n\tThe steps for setting it up are as follows.&nbsp; I&#8217;ll leave the setting of suitable permissions and use of sudo as an exercise for the reader.\n<\/p>\n<ol>\n<li>\n\t\tPut some web pages in <code>\/var\/www\/website-dev<\/code>.\n\t<\/li>\n<li>\n<pre>\r\nmkdir \/var\/www\/website\r\ncd \/var\/www\/website-dev\r\ngit init\r\ngit add &lt;all the appropriate files and directories&gt;\r\n<\/pre>\n<\/li>\n<li>\n\t\tCreate a <code>.gitignore<\/code> file, and add everything that shouldn&#8217;t be transferred to production, such as configuration files that specify the development database and debug settings. For a WordPress site, that probably includes most of the WordPress stuff.\n\t<\/li>\n<li>\n<pre>\r\ngit commit -a -m \"a message\"\r\nmkdir \/var\/www\/website.git\r\ncd \/var\/www\/website.git\r\ngit --bare init<\/pre>\n<\/li>\n<li>\n\t\tCreate <code>\/var\/www\/website.git\/hooks\/post-receive<\/code> containing:<\/p>\n<p>\n\t\t\t&nbsp;\n\t\t<\/p>\n<pre>\r\n#!\/bin\/bash\r\nGIT_WORK_TREE=\/var\/www\/website git checkout -f<\/pre>\n<\/li>\n<li>\n\t\tIn the following, I&#8217;ve used &#8216;live&#8217; as an alias for the production environment; you could use &#8216;prod&#8217; or whatever you fancy.\n\t<\/li>\n<li>\n<pre>\r\nchmod +x \/var\/www\/website.git\/hoots\/post-receive\r\ncd \/var\/www\/website-dev\r\ngit remote add live file:\/\/\/var\/www\/website.git\r\ngit push live +master:refs\/heads\/master\r\ngit push --set-upstream live master\r\ngit push live<\/pre>\n<\/li>\n<li>\n\t\tAnd, as if by magic, the files from the master branch of <code>\/var\/www\/website-dev<\/code> are now in <code>\/var\/www\/website<\/code>.\n\t<\/li>\n<li>\n\t\tThen whenever you&#8217;ve got new code ready to into production, all that&#8217;s required is:<\/p>\n<p>\n\t\t\t&nbsp;\n\t\t<\/p>\n<pre>\r\ngit push live<\/pre>\n<\/li>\n<\/ol>\n","protected":false},"excerpt":{"rendered":"<p>Some notes on using git to manage development and production versions of a website on a Linux server, based on Using Git to manage a web site.&nbsp; There seem to be several web pages with similar ideas out there: I don&#8217;t know who wrote it down first.&nbsp; And also with reference to Version Control with [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[45,7,29,23],"tags":[],"_links":{"self":[{"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/posts\/1267"}],"collection":[{"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/comments?post=1267"}],"version-history":[{"count":19,"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/posts\/1267\/revisions"}],"predecessor-version":[{"id":1390,"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/posts\/1267\/revisions\/1390"}],"wp:attachment":[{"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/media?parent=1267"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/categories?post=1267"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wp.fbcs.co.uk\/wp-json\/wp\/v2\/tags?post=1267"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}