> 系统+安全 > Git – 安装 Nginx http代理 常用命令 gitlab 前台git | git diff

Git – 安装 Nginx http代理 常用命令 gitlab 前台git | git diff

系统+安全 Liemer_Lius 701℃

Git的安装

参考：https://blog.csdn.net/name_is_wl/article/details/86705032

在这里，采用yum直接安装的方式。

安装依赖包：

> yum install -y fcgi-devel autoconf libtool automake fcgiwrap  # 安装依赖，fcgiwrap是http代理用的。

安装Git：

yum安装：
> yum install -y git
源码安装：
https://github.com/git/git/releases/tag/v2.11.0  # 下载源码
make prefix=/usr/local/git-2.11 all
make prefix=/usr/local/git-2.11 install
> vim /etc/profile.d/git.sh
export PATH=$PATH:/usr/local/git-2.11/bin
> useradd -m -d /home/git -s /bin/git-shell git  # 默认shell改为/bin/git-shell，防止被暴力ssh攻击
> grep git /etc/passwd
git:x:1002:1002::/home/git:/bin/git-shell
> passwd git

Git用Nginx http代理

首先，上面已经安装完了fcgiwrap，这个是必须要装的，官方提供的启动脚本：

https://www.nginx.com/resources/wiki/start/topics/examples/fcgiwrap/

> vim /etc/init.d/fcgiwrap
#!/usr/bin/perl

use strict;
use warnings FATAL => qw( all );

use IO::Socket::UNIX;

my $bin_path = '/usr/local/bin/fcgiwrap';
my $socket_path = $ARGV[0] || '/tmp/cgi.sock';
my $num_children = $ARGV[1] || 1;

close STDIN;

unlink $socket_path;
my $socket = IO::Socket::UNIX->new(
    Local => $socket_path,
    Listen => 100,
);

die "Cannot create socket at $socket_path: $!\n" unless $socket;

for (1 .. $num_children) {
    my $pid = fork;
    die "Cannot fork: $!" unless defined $pid;
    next if $pid;

    exec $bin_path;
    die "Failed to exec $bin_path: $!\n";
}

> chmod +x /etc/init.d/fcgiwrap  && /etc/init.d/fcgiwrap # 启动服务

编辑虚拟server，添加git server地址配置：

> vim /usr/local/nginx/conf/conf.d/git.conf
server {
        listen      8000;
        server_name localhost;
        root /home/git/git_repo;
 
        client_max_body_size 100m;
 
        auth_basic "git";
        auth_basic_user_file /usr/local/nginx-1.18.0/conf/pass.db;
 
        location ~(/.*) {
           fastcgi_pass  unix:/tmp/cgi.sock;
           fastcgi_param SCRIPT_FILENAME   /usr/libexec/git-core/git-http-backend;
           fastcgi_param PATH_INFO         $1;
           fastcgi_param GIT_HTTP_EXPORT_ALL "";
           fastcgi_param GIT_PROJECT_ROOT  /home/git/git_repo;
           fastcgi_param REMOTE_USER $remote_user;
           include fastcgi_params;
        }
     }
> /usr/local/nginx/sbin/nginx -t && /usr/local/nginx/sbin/nginx &   # 启动Nginx

其中的pass.db文件里的内容，通过在先生成，或者命令生成：

https://tool.oschina.net/htpasswd

算法采用Crypt (all Unix servers)，输入用户名密码点击生成（随机生成，每次结果都不一样）。

或者采用htpasswd命令（依赖yum install httpd-tools）

使用方法：

> htpasswd
Usage:
	htpasswd [-cimB25dpsDv] [-C cost] [-r rounds] passwordfile username
	htpasswd -b[cmB25dpsDv] [-C cost] [-r rounds] passwordfile username password

	htpasswd -n[imB25dps] [-C cost] [-r rounds] username
	htpasswd -nb[mB25dps] [-C cost] [-r rounds] username password
 -c  Create a new file.
 -n  Don't update file; display results on stdout.
 -b  Use the password from the command line rather than prompting for it.
 -i  Read password from stdin without verification (for script usage).
 -m  Force MD5 encryption of the password (default).
 -2  Force SHA-256 crypt() hash of the password (secure).
 -5  Force SHA-512 crypt() hash of the password (secure).
 -B  Force bcrypt aencryption of the password (very secure).
 -C  Set the computing time used for the bcrypt algorithm
     (higher is more secure but slower, default: 5, valid: 4 to 31).
 -r  Set the number of rounds used for the SHA-256, SHA-512 algorithms
     (higher is more secure but slower, default: 5000).
 -d  Force CRYPT encryption of the password (8 chars max, insecure).
 -s  Force SHA-1 encryption of the password (insecure).
 -p  Do not encrypt the password (plaintext, insecure).
 -D  Delete the specified user.
 -v  Verify password for the specified user.
On other systems than Windows and NetWare the '-p' flag will probably not work.
The SHA-1 algorithm does not use a salt and is less secure than the MD5 algorithm.

> htpasswd -d /usr/local/nginx-1.18.0/conf/pass.db git
New password: 
Re-type new password: 
Warning: Password truncated to 8 characters by CRYPT algorithm.
Updating password for user git
> cat pass.db 
git:A/u4e/3BOfPH2

启动nginx，测试代理即可。

Git常用命令

> git init --bare lius.git   # init一共空仓库
Initialized empty Git repository in /root/test/lius.git/
> git clone http://git@localhost:8000/lius.git   # 克隆，能成功则说明http代理成功
Cloning into 'lius'...
Password for 'http://git@localhost:8000': 
remote: Counting objects: 47, done.
remote: Compressing objects: 100% (33/33), done.
remote: Total 47 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (47/47), done.
> ls
lius
> cd lius
> vim src/main/java/com/test/jenkinsdemo/DemoController.java
> git commit src/main/java/com/test/jenkinsdemo/DemoController.java
Aborting commit due to empty commit message.  # 不可无commit message
> git commit -m "First edit..." src/main/java/com/test/jenkinsdemo/DemoController.java  # 提交，-m指定commit message
[master 128b68b] First edit...
 Committer: root <root@localhost.localdomain>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 2 insertions(+), 2 deletions(-)
> git push   # push到master分支
warning: push.default is unset; its implicit value is changing in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use:

  git config --global push.default matching

To squelch this message and adopt the new behavior now, use:

  git config --global push.default simple

See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)

Password for 'http://git@localhost:8000': 
Counting objects: 17, done.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (9/9), 688 bytes | 0 bytes/s, done.
Total 9 (delta 2), reused 0 (delta 0)
To http://git@localhost:8000/lius.git
   bb75489..128b68b  master -> master

> git clone git@localhost:~/liemer.git  # 通过ssh来clone，类似scp的远端路径格式
Cloning into 'liemer'...
git@localhost's password: 
warning: You appear to have cloned an empty repository.

# git config --system --unset credential.helper   // 重置用户登陆信息
# git config --global credential.helper store        // 保存用户登陆信息

Gitlab搭建

https://www.cnblogs.com/Alex-qiu/p/7845626.html

Git diff

git diff可以对比出两次commit_id之间的差异, 通常用于比对增量更新.

# git diff --name-only --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]   # 添加各种过滤器
Added (A): 新增
Copied (C): 复制
Deleted (D): 删除
Modified (M): 修改
Renamed (R): 重命名
Have their type (i.e. regular file, symlink, submodule, …) changed (T): 属性修改
Unmerged (U): 未合并的
Unknown (X): 未知的
Have had their pairing Broken (B): ..损坏的, 不知道怎么翻译...

# git diff --name-only --diff-filter=MA  # 常用的是修改和新增的

遇到过一个报错：
# git diff --diff-filter=MA --name-only d8d9cf8c182fbb0641e3db848be3650019809cd4 b40a8301d427e099de3dea2824badc5b2eed30db
error: Could not access 'd8d9cf8c182fbb0641e3db848be3650019809cd4
这个是因为没有在Git正确的目录里面，cd到有.git的正确目录再试试

Git便捷提交小脚本

#!/bin/bash
if [ $# -lt 1 ]; then
    echo "Usage: ./`basename $0` 'update files' 'commit information'"
    exit
fi

function ECHO() {
    local TEXT="${1}"; local COLOR_NUM="${2}"
    local COLOR="37"
    if [ "x${COLOR_NUM}" != "x" ]; then
        COLOR="${COLOR_NUM}"
    fi
    echo -e "\033[${COLOR}m${TEXT}\033[0m"
}

# 添加文件到Git
ECHO ">>> Add files to commit list..." 33
for i in `echo $1`; do
    if [ ! -e $i ]; then
        ECHO "$i not exist..." 31
        exit
    else
        git add $i
        if [ $? -ne 0 ]; then
            ECHO "Add file failed..." 31
            exit
        else
            ECHO "Add file successfully..." 32
        fi
    fi
done
 
# 提交文件到Git
ECHO ">>> Commit files to git..." 33
if [ ! -z "$2" ]; then
    git commit -m "$2"
else
    git commit -m "Update $1"
fi

if [ $? -ne 0 ]; then
    ECHO "Commit file failed..." 31
    exit
else
    ECHO "Commit file successfully..." 32
fi

# 拉取文件
ECHO ">>> Pull from git..."
git pull
if [ $? -ne 0 ]; then
    ECHO "Pull failed..." 31
    exit
else
    ECHO "Pull successfully..." 32
fi

# Push文件到Git
ECHO ">>> Push to git..." 33
git push
if [ $? -ne 0 ]; then
    ECHO "Push failed..." 31
    exit
else
    ECHO "Push successfully..." 32
fi

 

 

 

 

 

转载请注明：liutianfeng.com » Git – 安装 Nginx http代理 常用命令 gitlab 前台git | git diff

喜欢 (7)

评论已关闭。