Want more timely Centmin Mod News Updates?
Become a Member

Featured Upgrade Working with git command line for updating Centmin Mod local copies

Discussion in 'Install & Upgrades or Pre-Install Questions' started by eva2000, Jan 16, 2015.

  1. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5

    Working directly with Github.com hosted Centmin Mod code



    Updated: 123.08beta03 branch is now latest Centmin Mod code state

    If you're more adventerous and understand git command line, you can do away with Centmin Mod .zip file method of update and go directly with git command line and direct with the Github.com hosted Centmin Mod code. I am still new to git command line myself, as I use GUI windows app, SourceTree for managing my Github hosted codes/projects. So if I made any mistakes below or if there's a better way to do this, please let me know :)

    Quick Command Line Steps



    Quick commands to run to switch to using Github hosted Centmin Mod code. You can read further for a detailed explanation of each step and how to update the code via git pull command.

    For existing Centmin Mod .07 users

    For existing Centmin Mod .07 users to switch to using github sourced code
    Code:
    cd /usr/local/src
    mv centmin-v1.2.3mod/ centmin-v1.2.3mod-orig
    yum -y install git -q
    git clone https://github.com/centminmod/centminmod.git centmin-v1.2.3mod
    cd centmin-v1.2.3mod
    git checkout -f 123.07stable
    chmod +x centmin.sh
    
    For existing Centmin Mod .08 beta users

    For existing Centmin Mod .08 beta users to switch to using github sourced code - you'll have a new install directory base at /usr/local/src/123.08beta03 once below steps are completed
    Code:
    cd /usr/local/src
    mv centminmod-123.08centos7beta01/ centminmod-123.08centos7beta01-orig
    mv centminmod-123.08centos7beta02/ centminmod-123.08centos7beta02-orig
    mv centminmod-123.08beta03/ centminmod-123.08beta03-org
    yum -y install git -q
    git clone https://github.com/centminmod/centminmod.git centminmod-123.08beta03
    cd centminmod-123.08beta03
    git checkout -f 123.08beta03
    chmod +x centmin.sh
    sed -i 's|centminmod-123.08centos7beta01|centminmod-123.08beta03|g' /root/.bashrc
    sed -i 's|centminmod-123.08centos7beta02|centminmod-123.08beta03|g' /root/.bashrc
    
    For existing Centmin Mod .07 stable users switching to .08 beta

    For existing Centmin Mod .07 stable users wanting to switch to .08 beta code sourced at github repository. Only difference is which branch is checked out git checkout -f 123.08beta03 while maintaining .07 stable's existing structure /usr/local/src/centmin-v1.2.3mod
    Code:
    cd /usr/local/src
    mv centmin-v1.2.3mod/ centmin-v1.2.3mod-orig
    yum -y install git -q
    git clone https://github.com/centminmod/centminmod.git centmin-v1.2.3mod
    cd centmin-v1.2.3mod
    git checkout -f 123.08beta03
    chmod +x centmin.sh
    

    Detailed Explanation of Each Step


    First move aside your existing Centmin Mod local server code

    for Centmin Mod .07 existing users
    Code:
    cd /usr/local/src
    mv centmin-v1.2.3mod/ centmin-v1.2.3mod-orig
    
    for Centmin Mod .08 beta existing users
    Code:
    cd /usr/local/src
    mv centminmod-123.08centos7beta01/ centminmod-123.08centos7beta01-orig
    mv centminmod-123.08centos7beta02/ centminmod-123.08centos7beta02-orig
    
    make sure git is installed
    Code:
    yum -y install git -q
    
    for Centmin Mod .07 existing users to keep the centmin command shortcut, clone repo (download code) using command
    Code:
    cd /usr/local/src
    git clone https://github.com/centminmod/centminmod.git centmin-v1.2.3mod
    cd centmin-v1.2.3mod
    chmod +x centmin.sh
    
    OR

    for Centmin Mod .08 beta existing users
    Code:
    cd /usr/local/src
    git clone https://github.com/centminmod/centminmod.git centminmod-123.08beta03
    cd centminmod-123.08beta03
    chmod +x centmin.sh
    sed -i 's|centminmod-123.08centos7beta01|centminmod-123.08beta03|g' /root/.bashrc
    sed -i 's|centminmod-123.08centos7beta02|centminmod-123.08beta03|g' /root/.bashrc
    
    You can check if you got the master branch which now defaults to .07 stable build using command
    Code:
    grep ^SCRIPT_M centmin.sh
    
    i.e.
    Code:
    grep ^SCRIPT_M centmin.sh
    SCRIPT_MAJORVER='1.2.3'
    SCRIPT_MINORVER='07'
    SCRIPT_MODIFICATION_AUTHOR='eva2000 (vbtechsupport.com)'
    
    to list all Centmin Mod github branches within your /usr/local/src/centmin-v1.2.3mod or /usr/local/src/centminmod-123.08centos7beta02 directories on your own server type:
    Code:
    git branch -a
    
    i.e.
    Code:
    git branch -a
    * master
      remotes/origin/123.06stable
      remotes/origin/123.07stable
      remotes/origin/123.07stable_intel
      remotes/origin/123.08centos7beta01
      remotes/origin/123.08centos7beta02
      remotes/origin/123.08geoip
      remotes/origin/123.08zerodown
      remotes/origin/HEAD -> origin/master
      remotes/origin/master
    
    to use a specific branch, check it out via command

    changing to 123.08centos7beta02 branch within your existing /usr/local/src/centmin-v1.2.3mod or /usr/local/src/centminmod-123.08centos7beta02 directories on your own server type:

    Code:
    git checkout -f 123.08centos7beta02
    chmod +x centmin.sh
    
    or

    changing to 123.07stable branch within your existing /usr/local/src/centmin-v1.2.3mod or /usr/local/src/centminmod-123.08centos7beta02 directories on your own server type:

    Code:
    git checkout -f 123.07stable
    chmod +x centmin.sh
    
    You can check if you got the 123.08centos7beta01 branch which now defaults to .08 beta01 build using command
    Code:
    grep ^SCRIPT_M centmin.sh
    
    i.e.
    Code:
    grep ^SCRIPT_M centmin.sh        
    SCRIPT_MAJORVER='1.2.3'
    SCRIPT_MINORVER='08'
    SCRIPT_MODIFICATION_AUTHOR='eva2000 (vbtechsupport.com)'
    
    When I update the Centmin Mod code on github.com, you can download and sync the changes via command

    Code:
    git pull
    
    if there are no changes to sync, it will tell you so
    Code:
    git pull
    Already up-to-date.
    
    if there are changes to sync
    Code:
    git pull
    remote: Counting objects: 14, done.
    remote: Compressing objects: 100% (14/14), done.
    remote: Total 14 (delta 5), reused 0 (delta 0)
    Unpacking objects: 100% (14/14), done.
    From https://github.com/centminmod/centminmod
       00bddcd..3374bda  123.08centos7beta01 -> origin/123.08centos7beta01
       1b1b779..ecede60  123.08geoip -> origin/123.08geoip
       427e649..6c846eb  123.08zerodown -> origin/123.08zerodown
    Updating 00bddcd..3374bda
    Fast-forward
    inc/nsd_install.inc   |   14 ++++++++
    inc/nsd_reinstall.inc |   86 +++++++++++++++++++++++++++++++++++++++++++++++++
    inc/nsdsetup.inc      |   17 ++++++++++
    init/nsd              |    2 +-
    4 files changed, 118 insertions(+), 1 deletions(-)
    
    Ways to get your current branch information that you're using.

    Via git status

    Code:
    git status
    Code:
    git status
    # On branch 123.08centos7beta01
    # Changed but not updated:
    #   (use "git add <file>..." to update what will be committed)
    #   (use "git checkout -- <file>..." to discard changes in working directory)
    #
    #       modified:   centmin.sh
    #
    no changes added to commit (use "git add" and/or "git commit -a")
    Via git branch -av - where current branch in use has a asterix * to the far left of the branch name

    Code:
     git branch -av
    
    Code:
     git branch -av
    * 123.08centos7beta01                00bddcd update igbinary check to reinstall when versions don't match for .08 beta
      master                             f307c6a update ngx_pagespeed 1.9.32.3 & openssl 1.0.1k for Nginx static compile for .07 stable
      remotes/origin/123.06stable        82965b0 Revert "Revert "Revert "first step to preparing PHP 5.6 support"""
      remotes/origin/123.07stable        7571772 update ngx_pagespeed 1.9.32.3 & openssl 1.0.1k for Nginx static compile for .07 stable
      remotes/origin/123.07stable_intel  fa5a199 update ngx_pagespeed 1.9.32.3 & openssl 1.0.1k for Nginx static compile for .07 stable
      remotes/origin/123.08centos7beta01 00bddcd update igbinary check to reinstall when versions don't match for .08 beta
      remotes/origin/123.08geoip         1b1b779 update igbinary check to reinstall when versions don't match for .08 beta
      remotes/origin/123.08zerodown      427e649 update igbinary check to reinstall when versions don't match for .08 beta
      remotes/origin/HEAD                -> origin/master
      remotes/origin/master              f307c6a update ngx_pagespeed 1.9.32.3 & openssl 1.0.1k for Nginx static compile for .07 stable
    Or less verbose method minus the -v flag

    Code:
    git branch -a
    * 123.08centos7beta01
      master
      remotes/origin/123.06stable
      remotes/origin/123.07stable
      remotes/origin/123.07stable_intel
      remotes/origin/123.08centos7beta01
      remotes/origin/123.08centos7beta02
      remotes/origin/123.08geoip
      remotes/origin/123.08zerodown
      remotes/origin/HEAD -> origin/master
      remotes/origin/master
     
    Last edited: May 29, 2015
    • Like Like x 7
  2. jeffwidman

    jeffwidman Active Member

    152
    27
    28
    Dec 3, 2014
    Ratings:
    +51
    Local Time:
    4:21 PM
    To clone only the 0.08 branch if you don't need the other branches on the local machine:
    Code:
    git clone -b 123.08centos7beta01 --single-branch https://github.com/centminmod/centminmod.git
     
    • Like Like x 1
  3. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
  4. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    For folks using git method of updating Centmin Mod .08 beta code, on git pull you may get following message if you already had used git to download the initial code.

    Code:
    git pull
    remote: Counting objects: 60, done.
    remote: Compressing objects: 100% (24/24), done.
    remote: Total 60 (delta 53), reused 43 (delta 36), pack-reused 0
    Unpacking objects: 100% (60/60), done.
    From https://github.com/centminmod/centminmod
       2d5c17e..cf6145d  123.08centos7beta01 -> origin/123.08centos7beta01
       34ab7b5..6d5d226  123.08geoip -> origin/123.08geoip
       812f027..986e5e3  123.08zerodown -> origin/123.08zerodown
    Updating 2d5c17e..cf6145d
    error: Your local changes to the following files would be overwritten by merge:
            centmin.sh
    Please, commit your changes or stash them before you can merge.
    Aborting
    git pull aborted as previously had centmin.sh chmodded and thus git detected it as a file change and git pull won't download latest updates without these local changes taken care of.

    Easiest way is to stash the change Git - Stashing and then git pull and drop the stash afterwards

    Commands run within directory of centmin.sh.

    Either /usr/local/src/entmin-v1.2.3mod for .07 stable or for .08 beta at /usr/local/src/centminmod-123.08centos7beta01

    git stash
    Code:
    git stash
    
    Saved working directory and index state WIP on 123.08centos7beta01: 2d5c17e cminfo fix again
    HEAD is now at 2d5c17e cminfo fix again
    git pull
    Code:
    git pull
    
    Updating 2d5c17e..cf6145d
    Fast-forward
    centmin.sh                                   |  1 +
    config/mysql/my-mdb10-4gb.cnf                |  1 +
    config/mysql/my-mdb10-min.cnf                |  1 +
    config/mysql/my-mdb10.cnf                    |  1 +
    config/mysql/my-mdb55-4gb.cnf                |  1 +
    config/mysql/my-mdb55-min.cnf                |  1 +
    config/mysql/my-mdb55.cnf                    |  1 +
    config/nginx/php-pool2.conf                  |  1 +
    config/nginx/php.conf                        |  1 +
    config/nginx/phpalt.conf                     |  1 +
    config/nginx/phpssl.conf                     |  1 +
    config/php-fpm/php-fpm-min.conf              |  2 +-
    config/php-fpm/php-fpm-min.conf-fullcomments |  2 +-
    config/php-fpm/php-fpm-minond.conf           |  2 +-
    config/php-fpm/php-fpm.conf                  |  2 +-
    config/php-fpm/php-fpm.conf-fullcomments     |  2 +-
    config/php-fpm/php-fpm.conf.default          |  2 +-
    inc/logrotate_nginx.inc                      |  6 ++----
    inc/logrotate_phpfpm.inc                     |  6 ++----
    inc/php_configure.inc                        | 14 ++++++++++----
    20 files changed, 31 insertions(+), 18 deletions(-)
    list the stash - take note of stash list number stash@{0} you'll need that for dropping stash later

    Code:
    git stash list
    
    stash@{0}: WIP on 123.08centos7beta01: 2d5c17e cminfo fix again
    then optionally remove/drop stash
    Code:
    git stash drop stash@{0}
    
    Dropped stash@{0} (41b8183a4df7cd7e9b98c042d8d137a5d3782e44)
    then chmod centmin.sh
    Code:
    chmod +x centmin.sh
    run centmin.sh to make sure it worked

    Code:
    ./centmin.sh
    
    --------------------------------------------------------
    Centmin Mod 1.2.3-eva2000.08 - http://centminmod.com
    --------------------------------------------------------
                       Centmin Mod Menu                
    --------------------------------------------------------
    1).  Centmin Install
    2).  Add Nginx vhost domain
    3).  NSD setup domain name DNS
    4).  Nginx Upgrade / Downgrade
    5).  PHP Upgrade / Downgrade
    6).  XCache Re-install
    7).  APC Cache Re-install
    8).  XCache Install
    9).  APC Cache Install
    10). Memcached Server Re-install
    11). MariaDB 5.2, 5.5, 10 Upgrade Sub-Menu
    12). Zend OpCache Install/Re-install
    13). Install ioping.sh vbtechsupport.com/1239/
    14). SELinux disable
    15). Install/Re-install ImageMagick PHP Extension
    16). Change SSHD Port Number
    17). Multi-thread compression: pigz,pbzip2,lbzip2,p7zip etc
    18). Suhosin PHP Extension install
    19). Install FFMPEG and FFMPEG PHP Extension
    20). NSD Re-install
    21). Update - Nginx + PHP-FPM + Siege
    22). Exit
    --------------------------------------------------------
    Enter option [ 1 - 22 ]
    --------------------------------------------------------
     
  5. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    Updated first post guide with quick command step as well as full details explanation to make it easier for folks to read and understand.

    Quick Command Line Steps



    Quick commands to run to switch to using Github hosted Centmin Mod code. You can read further for a detailed explanation of each step and how to update the code via git pull command.

    For existing Centmin Mod .07 users

    For existing Centmin Mod .07 users to switch to using github sourced code
    Code:
    cd /usr/local/src
    mv centmin-v1.2.3mod/ centmin-v1.2.3mod-orig
    yum -y install git -q
    git clone https://github.com/centminmod/centminmod.git centmin-v1.2.3mod
    cd centmin-v1.2.3mod
    git checkout -f 123.07stable
    chmod +x centmin.sh
    
    For existing Centmin Mod .08 beta users

    For existing Centmin Mod .08 beta users to switch to using github sourced code
    Code:
    cd /usr/local/src
    mv centminmod-123.08centos7beta01/ centminmod-123.08centos7beta01-orig
    mv centminmod-123.08centos7beta02/ centminmod-123.08centos7beta02-orig
    yum -y install git -q
    git clone https://github.com/centminmod/centminmod.git centminmod-123.08centos7beta02
    cd centminmod-123.08centos7beta02
    git checkout -f 123.08centos7beta02
    chmod +x centmin.sh
    
    For existing Centmin Mod .07 stable users switching to .08 beta

    For existing Centmin Mod .07 stable users wanting to switch to .08 beta code sourced at github repository. Only difference is which branch is checked out git checkout -f 123.08centos7beta02 while maintaining .07 stable's existing structure /usr/local/src/centmin-v1.2.3mod
    Code:
    cd /usr/local/src
    mv centmin-v1.2.3mod/ centmin-v1.2.3mod-orig
    yum -y install git -q
    git clone https://github.com/centminmod/centminmod.git centmin-v1.2.3mod
    cd centmin-v1.2.3mod
    git checkout -f 123.08centos7beta02
    chmod +x centmin.sh
    
     
    Last edited: Mar 13, 2015
    • Informative Informative x 1
  6. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    Easy to update via git pull

    Code:
    cd /usr/local/src/centminmod-123.08centos7beta02
    
    git pull
    remote: Counting objects: 99, done.
    remote: Compressing objects: 100% (76/76), done.
    remote: Total 99 (delta 53), reused 14 (delta 14), pack-reused 9
    Unpacking objects: 100% (99/99), done.
    From https://github.com/centminmod/centminmod
       6841e3d..9172f43  123.07stable -> origin/123.07stable
       0281e00..241b0e6  123.08centos7beta02 -> origin/123.08centos7beta02
       a2be4ad..9308c1c  123.08zerodown -> origin/123.08zerodown
       e9fbcc7..09e804f  master     -> origin/master
    Updating 0281e00..241b0e6
    error: Your local changes to 'centmin.sh' would be overwritten by merge.  Aborting.
    Please, commit your changes or stash them before you can merge.
    
    Code:
    git stash
    Saved working directory and index state WIP on 123.08centos7beta02: 0281e00 openssl 1.0.2a default for .08 beta
    HEAD is now at 0281e00 openssl 1.0.2a default for .08 beta
    
    Code:
    git pull
    Updating 0281e00..241b0e6
    Fast-forward
    centmin.sh                    |   10 ++--
    config/nginx/staticfiles.conf |    2 +-
    inc/apcreinstall.inc          |    2 +-
    inc/downloadlinks.inc         |   10 ++--
    inc/geoip.inc                 |   22 ++++++++++-
    inc/nginx_configure.inc       |   35 +++++++++++------
    inc/nginx_mimetype.inc        |    7 ++-
    inc/nginx_upgrade.inc         |    2 +-
    inc/pureftpd.inc              |   35 +++++++++++++++++
    inc/zendopcache_reinstall.inc |   85 ++++++++++++++++++++++------------------
    tools/centminmod_packager.sh  |   48 +++++++++++++++++++++++
    11 files changed, 191 insertions(+), 67 deletions(-)
    create mode 100644 tools/centminmod_packager.sh
    
    chmod +x centmin.sh
     
    • Like Like x 1
  7. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    With git method in place from 1st post, git pull command can update your Centmin Mod code easily.

    This git pull is for Centmin Mod .08 beta for CentOS 7.1 supported changes.

    Code:
    cd /usr/local/src/centminmod-123.08centos7beta02
    Code:
    git pull
    remote: Counting objects: 34, done.
    remote: Compressing objects: 100% (27/27), done.
    remote: Total 34 (delta 29), reused 11 (delta 6), pack-reused 0
    Unpacking objects: 100% (34/34), done.
    From https://github.com/centminmod/centminmod
       241b0e6..1d78c67  123.08centos7beta02 -> origin/123.08centos7beta02
       9172f43..5042756  123.07stable -> origin/123.07stable
       09e804f..fcc7d05  master     -> origin/master
    Updating 241b0e6..1d78c67
    error: Your local changes to the following files would be overwritten by merge:
            centmin.sh
    Please, commit your changes or stash them before you can merge.
    Aborting
    
    Code:
    git stash
    Saved working directory and index state WIP on 123.08centos7beta02: 241b0e6 disable Axel download accelerator too many redirects error using Axel
    HEAD is now at 241b0e6 disable Axel download accelerator
    
    Code:
    git pull
    Updating 241b0e6..1d78c67
    Fast-forward
    Extras/axivo_install.sh       |  2 +-
    centmin.sh                    | 10 +++++-----
    inc/axelsetup.inc             |  2 +-
    inc/centminfinish.inc         |  2 +-
    inc/downloads.inc             |  2 +-
    inc/downloads_centosseven.inc |  2 +-
    inc/mariadb_install.inc       |  2 +-
    inc/mariadb_upgrade10.inc     |  2 +-
    inc/mariadb_upgrade55.inc     |  2 +-
    inc/mysql_proclimit.inc       |  2 +-
    inc/nginx_configure.inc       |  2 +-
    inc/nginx_install.inc         |  2 +-
    inc/nginx_upgrade.inc         |  2 +-
    inc/openssl_install.inc       |  2 +-
    inc/php_configure.inc         |  4 ++--
    inc/php_upgrade.inc           | 10 +++++-----
    inc/yuminstall.inc            |  2 +-
    17 files changed, 26 insertions(+), 26 deletions(-)
    
    Code:
    chmod +x centmin.sh
     
  8. Josephm

    Josephm Active Member

    126
    43
    28
    Aug 26, 2014
    Ratings:
    +45
    Local Time:
    6:21 AM
    1.9.5
    10.0.21
    So many thanks, I need this to upgrade old stable to beta 2 :D
     
    • Like Like x 1
  9. Mak Adang

    Mak Adang Member

    34
    12
    8
    Jan 4, 2015
    Ratings:
    +12
    Local Time:
    6:21 AM
    1.9.0
    10.0.18-MariaDB
    just updating now..
     
    • Like Like x 1
  10. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    pretty easy to update once you switch to using git command line

    my one liner to update Centmin Mod .08 beta 02 code for server which upgraded from .07 to .08 beta 02

    Code:
    cd /usr/local/src/centmin-v1.2.3mod 
    git stash; git pull; chmod +x centmin.sh
    Code:
    git stash; git pull; chmod +x centmin.sh
    Saved working directory and index state WIP on 123.08centos7beta02: 047de40 fix STRIPPHP for .08 beta
    HEAD is now at 047de40 fix STRIPPHP for .08 beta
    remote: Counting objects: 33, done.
    remote: Compressing objects: 100% (33/33), done.
    remote: Total 33 (delta 15), reused 0 (delta 0), pack-reused 0
    Unpacking objects: 100% (33/33), done.
    From https://github.com/centminmod/centminmod
       69d0b0b..4c5a885  123.07stable -> origin/123.07stable
       047de40..a7c0651  123.08centos7beta02 -> origin/123.08centos7beta02
       55ee2bf..d3ff852  master     -> origin/master
    Updating 047de40..a7c0651
    Fast-forward
    centmin.sh                  |    4 +-
    config/memcached/memcached  |   72 +++++++++++++++++++++++++++++++++---------
    config/memcached/memcached2 |   72 +++++++++++++++++++++++++++++++++---------
    inc/memcached_install.inc   |   56 ++++++++++++++++++++-------------
    inc/wpsetup.inc             |    2 +-
    inc/zendopcache_upgrade.inc |   13 +++++++-
    6 files changed, 161 insertions(+), 58 deletions(-)
     
    • Like Like x 1
  11. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    Testing a new beta branch 123.08lua which is 123.08centos7beta02 with added lua support in Nginx CentOS 7.x - How to help test .08 CentOS 7 Betas with Github code ? | Page 24 | Centmin Mod Community

    using git command line is easy to switch

    Switch to 123.08lua branch



    i.e. from .07 stable I switched to .08 beta02 (123.08centos7beta02) and now switch to 123.08lua

    switch to working centmin mod install directory (originally server was .07 stable so worked with existing path)
    Code:
    cmdir
    /usr/local/src/centmin-v1.2.3mod ~
    
    list all branches available on server default has asterix = * 123.08centos7beta02 which is in use
    Code:
     git branch -a
    * 123.08centos7beta02
      master
      remotes/origin/123.06stable
      remotes/origin/123.07stable
      remotes/origin/123.07stable_intel
      remotes/origin/123.08centos7beta01
      remotes/origin/123.08centos7beta02
      remotes/origin/123.08geoip
      remotes/origin/123.08slowfs
      remotes/origin/123.08zerodown
      remotes/origin/HEAD -> origin/master
      remotes/origin/master
    
    stash needed as chmod'd centmin.sh needs putting aside
    Code:
     git stash
    Saved working directory and index state WIP on 123.08centos7beta02: 8abe156 update inc/downloadlinks.inc only run dynamic epel check if epel not setup
    HEAD is now at 8abe156 update inc/downloadlinks.inc only run dynamic epel check if epel not setup
    
    fetch new branches i.e. 123.08lua not yet downloaded to server
    Code:
     git fetch
    remote: Counting objects: 218, done.
    remote: Compressing objects: 100% (133/133), done.
    remote: Total 218 (delta 144), reused 58 (delta 58), pack-reused 27
    Receiving objects: 100% (218/218), 87.64 KiB, done.
    Resolving deltas: 100% (144/144), done.
    From https://github.com/centminmod/centminmod
       6ea9562..4c5a885  123.07stable -> origin/123.07stable
       8abe156..8da8d1c  123.08centos7beta02 -> origin/123.08centos7beta02
    * [new branch]      123.08lua  -> origin/123.08lua
       8616c81..8612069  master     -> origin/master
    
    view all branches available now and see new remotes/origin/123.08lua one
    Code:
     git branch -a
    * 123.08centos7beta02
      master
      remotes/origin/123.06stable
      remotes/origin/123.07stable
      remotes/origin/123.07stable_intel
      remotes/origin/123.08centos7beta01
      remotes/origin/123.08centos7beta02
      remotes/origin/123.08geoip
      remotes/origin/123.08lua
      remotes/origin/123.08slowfs
      remotes/origin/123.08zerodown
      remotes/origin/HEAD -> origin/master
      remotes/origin/master
    
    switch to that new branch I want 123.08lua
    Code:
     git checkout 123.08lua
    Branch 123.08lua set up to track remote branch 123.08lua from origin.
    Switched to a new branch '123.08lua'
    
    verify it's right branch by checking last 5 logged commits
    Code:
     git log -5
    commit 591b7644eabc04a65e9a9729b151633ebb1608da
    Author: George Liu <EMAIL>
    Date:   Wed May 27 15:55:44 2015 +1000
    
        additional TCP tweaks for lua branch
    
    commit df5dc03913d5148739725f494f2b534fb4263c3a
    Author: George Liu <EMAIL>
    Date:   Wed May 27 08:54:44 2015 +1000
    
        nginx 1.9.1 default for .08 beta with lua support
    
    commit b63020c3cea4ed8610dd8b25319fd7e0369fcc90
    Author: George Liu <EMAIL>
    Date:   Mon May 25 12:33:38 2015 +1000
    
        fix typo
    
    commit 2ad40440506797c2afd20dab31d0308e974e5b7b
    Author: George Liu <EMAIL>
    Date:   Mon May 25 12:31:26 2015 +1000
    
        preserve permissions on copy for cloudflare lua external libs
    
    commit 73a334aadf6e656fa7b9b9f294fb43a0370fff1b
    Author: George Liu <EMAIL>
    Date:   Mon May 25 12:25:20 2015 +1000
    
        add cloudflare openresty Lua Upstream Cache Nginx module
    
    finally chmod +x centmin.sh
    Code:
    chmod +x centmin.sh 
    and run centmin.sh menu option 4 to recompile Nginx 1.9.1 with lua support
    Code:
    ./centmin.sh
    
    --------------------------------------------------------
    Centmin Mod 1.2.3-eva2000.08 - http://centminmod.com
    --------------------------------------------------------
                       Centmin Mod Menu               
    --------------------------------------------------------
    1).  Centmin Install
    2).  Add Nginx vhost domain
    3).  NSD setup domain name DNS
    4).  Nginx Upgrade / Downgrade
    5).  PHP Upgrade / Downgrade
    6).  XCache Re-install
    7).  APC Cache Re-install
    8).  XCache Install
    9).  APC Cache Install
    10). Memcached Server Re-install
    11). MariaDB 5.2, 5.5, 10 Upgrade Sub-Menu
    12). Zend OpCache Install/Re-install
    13). Install ioping.sh vbtechsupport.com/1239/
    14). SELinux disable
    15). Install/Re-install ImageMagick PHP Extension
    16). Change SSHD Port Number
    17). Multi-thread compression: pigz,pbzip2,lbzip2,p7zip etc
    18). Suhosin PHP Extension install
    19). Install FFMPEG and FFMPEG PHP Extension
    20). NSD Re-install
    21). Update - Nginx + PHP-FPM + Siege
    22). Add Wordpress Nginx vhost + WP Super Cache
    23). Exit
    --------------------------------------------------------
    Enter option [ 1 - 23 ] 

    Switch back fro 123.08lua to 123.08centos7beta02 branch



    switching back from 123.08lua to 123.08centos7beta02 branch and doing update for lastest .08 beta02 code is easy too

    Code:
     git stash
    Saved working directory and index state WIP on 123.08lua: 591b764 additional TCP tweaks for lua branch
    HEAD is now at 591b764 additional TCP tweaks for lua branch
    
    switch back to 123.08centos7beta02 branch
    Code:
     git checkout 123.08centos7beta02
    Switched to branch '123.08centos7beta02'
    Your branch is behind 'origin/123.08centos7beta02' by 24 commits, and can be fast-forwarded.
    
    update to latest .08 beta02 code as there's a few updates as youc an see
    Code:
     git pull
    Updating 8abe156..8da8d1c
    Fast-forward
    centmin.sh                             |   37 +++++---
    config/memcached/memcached             |   72 ++++++++++++----
    config/memcached/memcached2            |   72 ++++++++++++----
    config/php-fpm/php-fpm-2pools.conf     |    4 +-
    config/php-fpm/php-fpm-min-2pools.conf |    4 +-
    inc/downloadlinks.inc                  |   16 ++++
    inc/downloads.inc                      |  155 ++++++++++++++++++++++++++++++++
    inc/downloads_centosseven.inc          |    2 +-
    inc/downloads_centossix.inc            |    2 +-
    inc/memcached_install.inc              |   56 +++++++-----
    inc/mongodb.inc                        |   61 +++++++++++++
    inc/nginx_configure.inc                |   32 +++++--
    inc/nginx_install.inc                  |   25 +++++
    inc/nginx_upgrade.inc                  |   11 ++-
    inc/php_configure.inc                  |   12 +++
    inc/php_upgrade.inc                    |   37 ++++++--
    inc/postfix.inc                        |    9 ++
    inc/wpsetup.inc                        |    2 +-
    inc/yuminstall.inc                     |    4 +-
    inc/zendopcache_upgrade.inc            |   13 +++-
    20 files changed, 533 insertions(+), 93 deletions(-)
    create mode 100644 inc/mongodb.inc
    
    check I am on 123.08centos7beta02 again
    Code:
     git branch -a
    * 123.08centos7beta02
      123.08lua
      master
      remotes/origin/123.06stable
      remotes/origin/123.07stable
      remotes/origin/123.07stable_intel
      remotes/origin/123.08centos7beta01
      remotes/origin/123.08centos7beta02
      remotes/origin/123.08geoip
      remotes/origin/123.08lua
      remotes/origin/123.08slowfs
      remotes/origin/123.08zerodown
      remotes/origin/HEAD -> origin/master
      remotes/origin/master
    
    chmod +x centmin.sh
    Code:
     chmod +x centmin.sh
    
    check last 5 logged commits for .08 beta02
    Code:
     git log -5
    commit 8da8d1c1438ffc609efc3b82d1a64e41b45f9381
    Author: George Liu <EMAIL>
    Date:   Wed May 27 15:54:13 2015 +1000
    
        additional TCP tweaks
    
    commit 952ddda8986c8c05e36f3ebca2ed6280630a6b52
    Author: George Liu <EMAIL>
    Date:   Wed May 27 03:56:02 2015 +1000
    
        nginx 1.9.1 default for .08 beta
    
    commit 76e964f7be294aeaf60c89359d457f88e90374d0
    Author: George Liu <EMAIL>
    Date:   Sat May 23 14:54:12 2015 +1000
    
        add YUM package pngquant for .08 beta
    
    commit d189407bd59882bb42582867bcf34c08b587e305
    Author: George Liu <EMAIL>
    Date:   Sat May 23 14:16:28 2015 +1000
    
        add YUM packages optipng & jpegoptim to default install on .08 beta
    
    commit f231f33d117899d153fea7894d44514660518ab1
    Author: George Liu <EMAIL>
    Date:   Wed May 20 22:45:04 2015 +1000
    
        update inc/postfix.inc for .08 beta
    
     
    Last edited: May 28, 2015
  12. eva2000

    eva2000 Administrator Staff Member

    28,942
    6,570
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +9,751
    Local Time:
    9:21 AM
    Nginx 1.13.x
    MariaDB 5.5
    Handy command to check your local server's Centmin Mod git repo code at /usr/local/src/centminmod and the last commit made.

    First change into local server's Centmin Mod code directory and then use git log command where -1 is last commit. If you set -2 that will show last 2 commits etc.
    Code (Text):
    cd /usr/local/src/centminmod
    git log --numstat --pretty="%n%h %an %aD %n%s" --shortstat -1

    Code (Text):
    git log --numstat --pretty="%n%h %an %aD %n%s" --shortstat -1
    
    63f63bb George Liu Wed, 4 Jan 2017 10:32:26 +1000 
    2nd mysqladmin_shell.sh fix in 123.09beta01
    
    12      12      addons/mysqladmin_shell.sh
     1 file changed, 12 insertions(+), 12 deletions(-)
    
     
    • Like Like x 1