From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: Marc Weber <marco-oweber@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: recipe to use git for deployment
Date: Fri, 04 May 2012 23:43:16 -0500 [thread overview]
Message-ID: <4FA4AFE4.6040701@gmail.com> (raw)
In-Reply-To: <1336190286-sup-3813@nixos>
On 5/4/2012 11:10 PM, Marc Weber wrote:
> I always did "git pull" on the servers - but the history of my projects
> is not that huge.. Thus I never cared.
> Great: You can keep some server specific config settings and rebase
> them -
So I could rebase apache virtual host conf files with generic template
changes like symlink support, but keep the networking ip's. Merge
conflicts would be bad. I guess that would be cause to reset --hard to
a previous commit.
and you can do a fast git status to check whether file contents
> have been modified (eg determine whether you've been hacked ..)
>
With 'source is run' like html, css, etc. that would be a good way to
enforce no-hacking-allowed support agreements.
> If you really care that much about history why not push a zip file using
> git archive --format=zip and unpack that on the deployment server
> instead?
>
That is what I'm currently doing. By paying attention to tracked
executable bits I don't even have to fix permissions on deployment.
The scriptable patching of a git repo (scripted checkout of remote
tracking branch commits to worktree with inserted conversions and
validations -- an interactive cherry-pick so to speak) allows for
flexible conversions of varying patch levels. Maybe git-sequencer will
do this when it comes out.
Also, I could have a deployment tracking repo on one of my servers that
remotes to all deployed servers and pulls to refresh my monitor view of
all deployed revisions in gitk.
> For FTP access only this did a great job for small projects:
> https://github.com/MarcWeber/git-ftp (-> git-ftp-minimal.sh)
> It only copies changed files *and* checks whether they have been
> modified on the server first (detecting work of others).
> But that's probably not a good thing for automatic deployment.
>
I'll take a look to see what I can steal, uh I mean reuse. Thanks!
v/r,
neal
next prev parent reply other threads:[~2012-05-05 4:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-05 3:51 recipe to use git for deployment Neal Kreitzinger
2012-05-05 4:10 ` Marc Weber
2012-05-05 4:43 ` Neal Kreitzinger [this message]
2012-05-05 5:04 ` Marc Weber
2012-05-05 5:30 ` Neal Kreitzinger
2012-05-05 12:14 ` Sitaram Chamarty
2012-05-16 20:08 ` Neal Kreitzinger
2012-05-05 4:31 ` Junio C Hamano
2012-05-05 8:25 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FA4AFE4.6040701@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=git@vger.kernel.org \
--cc=marco-oweber@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).