From 0c89749bdfe73de4c118a3e98679344b03686050 Mon Sep 17 00:00:00 2001 From: Jack Engqvist Johansson Date: Sat, 21 Apr 2012 03:38:52 +0200 Subject: [PATCH] cleaned up a bit and edited README --- LICENSE | 25 +++++++++++++++++++++++++ README | 7 +++++++ deploy.conf | 7 ++++--- deploy.sample | 4 ++-- deploy.sh | 27 ++++++++++++++++++++++++++- 5 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0f89c05 --- /dev/null +++ b/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2012, Comfirm AB +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the Comfirm AB nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR NY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README b/README index 68e7217..339c991 100644 --- a/README +++ b/README @@ -11,6 +11,10 @@ Authors: Jack Engqvist Johansson, Comfirm AB http://comfirm.se +License: +BSD 3-Clause +See the LICENSE file + USAGE ===== To deploy, run: @@ -19,11 +23,14 @@ USAGE To update already existing deployment, run: ./deploy --update + It will run copy, replace and update-s2... + Partial deployment options: ./deploy --begin Run begin script ./deploy --copy Copy files to /tmp ./deploy --replace Replace the old files ./deploy --finish Run the finish script + ./deploy --update-s2 Run the update script, only WHAT YOU NEED ============= diff --git a/deploy.conf b/deploy.conf index 99c3ded..54cb268 100644 --- a/deploy.conf +++ b/deploy.conf @@ -1,13 +1,14 @@ -# (C) 2012 Comfirm AB -# deploy.sh # The server list. +# deploy.sh +# Copyright (c) 2012, Comfirm AB +# # To get the most out of deploy.sh you can make it dynamic. # Use a heartbeat software or similar to maintain it. # Define the user to login with: # user name keyfile # ------------------------------------------ -user ubuntu /hvar/keyfiles/ubuntu.rsa +user ubuntu /var/keyfiles/ubuntu.rsa # Add server groups like this: # server group ip address diff --git a/deploy.sample b/deploy.sample index 5b7efa6..4e3eeef 100644 --- a/deploy.sample +++ b/deploy.sample @@ -1,7 +1,7 @@ -# (C) 2012 Comfirm AB # deploy.sh # The deployment file -# +# Copyright (c) 2012, Comfirm AB + # Add files to be copied. # file group file # ------------------------------------------ diff --git a/deploy.sh b/deploy.sh index 5e4dd36..57c225a 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,9 +1,34 @@ #!/bin/sh -# (C) 2012 Comfirm AB # deploy.sh # Easy deployment to multiple servers. # Deploy code, files, settings and much more to multiple servers via ssh. +# +# Copyright (c) 2012, Comfirm AB +# All rights reserved. # +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of the Comfirm AB nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR NY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# # Authors: # --------------------------------------------- # Jack Engqvist Johansson, Comfirm AB