diff options
26 files changed, 243 insertions, 90 deletions
diff --git a/doc/install_gogs_from_binary_on_ubuntu.md b/doc/install_gogs_from_binary_on_ubuntu.md new file mode 100644 index 00000000..6d004106 --- /dev/null +++ b/doc/install_gogs_from_binary_on_ubuntu.md @@ -0,0 +1,26 @@ +### Binary install gogs on ubuntu 14.04 LTS + +### create user and install denpendency +- sudo adduser git +- sudo apt-get update +- sudo apt-get upgrade +- sudo apt-get install git +- sudo apt-get install mysql-server + +### create the database +- $mysql -u root -p +- mysql> SET GLOBAL storage_engine = 'InnoDB'; +- mysql> CREATE DATABASE gogs CHARACTER SET utf8 COLLATE utf8_bin; +- mysql> GRANT ALL PRIVILEGES ON gogs.* TO 'root'@'localhost' IDENTIFIED BY 'password'; +- mysql> FLUSH PRIVILEGES; +- mysql> QUIT + +### install the gogs +- mkdir gogs +- cd gogs +- curl -L http://gobuild.io/github.com/gogits/gogs/v0.2.0/linux/amd64 -o v0.2.0.zip +- unzip v0.2.0.zip +- ./start.sh + +> The up-to-date binary could be found at +> http://gobuild.io/download/github.com/gogits/gogs diff --git a/doc/install_gogs_from_source_on_ubuntu.md b/doc/install_gogs_from_source_on_ubuntu.md new file mode 100644 index 00000000..b8ae6fc7 --- /dev/null +++ b/doc/install_gogs_from_source_on_ubuntu.md @@ -0,0 +1,48 @@ +##Install gogs under ubuntu 14.04 LTS 32bit from source code + +###Requirements +- Go Programming Language: Version >= 1.2 +- git(bash): Version >= 1.6.6(both server and client) +- MySQL: Version >= 5.1 or PostgreSQL or NOTHING. + +### Create the user which will run git +- sudo adduser git +- su git + +### Install git and Mysql-server +- sudo apt-get install git +- sudo apt-get install mysql-server + +### Create database +- $ mysql -u root -p +- mysql> SET GLOBAL storage_engine = 'InnoDB'; +- mysql> CREATE DATABASE gogs CHARACTER SET utf8 COLLATE utf8_bin; +- mysql> GRANT ALL PRIVILEGES ON gogs.* TO 'root'@'localhost' IDENTIFIED BY 'pasword'; +- mysql> FLUSH PRIVILEGES; +- mysql> QUIT + +### install go from source +- sudo apt-get install build-essential +- sudo apt-get install mercurial +- hg clone -r release https://go.googlecode.com/hg/ /home/git/golang/ + + +- echo export GOROOT=/home/git/golang >>.bashrc +- echo export GOARCH=386 >>.bashrc +- echo export GOOS=linux >>.bashrc +- echo export GOBIN= /home/git/golang/bin >>.bashrc +- echo export GOPATH=$HOME/app/Go >>.bashrc +- echo PATH=${PATH}: /$HOME/golang/bin >>.bashrc +- cd $GOROOT/src +- ./make.bash + +### Download and install dependencies +- $ go get -u github.com/gogits/gogs + +### Build main program +- $ cd $GOPATH/src/github.com/gogits/gogs +- $ go build +- $ ./start.sh + +### At present, you could access gogs from http://localhost:3000 + diff --git a/dockerfiles/README.md b/dockerfiles/README.md index cb9221d9..fc27bdf4 100644 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -1,15 +1,14 @@ -### Gogs Install With Docker +### Install Gogs With Docker - - -#### Gogs With MySQL - -Deply gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the confis: +Deploying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the configs: ``` -MYSQL_PASSWORD="YOUR_MYSQL_PASSWORD" -MYSQL_RUN_NAME="YOUR_MYSQL_RUN_NAME" -HOST_PORT="YOUR_HOST_PORT" +DB_TYPE="YOUR_DB_TYPE" # type of database, support 'mysql' and 'postgres' +MEM_TYPE="YOUR_MEM_TYPE" # type of memory database, support 'redis' and 'memcache' +DB_PASSWORD="YOUR_DB_PASSWORD" # The database password. +DB_RUN_NAME="YOUR_DB_RUN_NAME" # The --name option value when run the database image. +MEM_RUN_NAME="YOUR_MEM_RUN_NAME" # The --name option value when run the mem database image. +HOST_PORT="YOUR_HOST_PORT" # The port on host, which will be redirected to the port 3000 inside gogs container. ``` And run: @@ -22,13 +21,13 @@ The build might take some time, just be paient. After it finishes, you will rece ``` Now we have the MySQL image(running) and gogs image, use the follow command to start gogs service( the content might be different, according to your own configs): - docker run -i -t --link gogs_mysql:db -p 3333:3000 gogs/gogits + docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs ``` Just follow the message, run: ``` - docker run -i -t --link gogs_mysql:db -p 3333:3000 gogs/gogits + docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs ``` Now we have gogs running! Open the browser and navigate to: @@ -38,22 +37,4 @@ http://YOUR_HOST_IP:YOUR_HOST_PORT ``` Let's 'gogs'! - -#### Gogs With PostgreSQL - -Installing Gogs with PostgreSQL is nearly the same with installing it with MySQL. What you do is just change the DB_TYPE in build.sh to 'postgres'. - -#### Gogs, MySQL With Redis - - -#### Gogs, MySQL With Memcached - - -#### Gogs, PostgreSQL With Redis - - -#### Gogs, PostgreSQL With Memcached - - - - +Ouya~ diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh index 272424c8..83f7e9a5 100755 --- a/dockerfiles/build.sh +++ b/dockerfiles/build.sh @@ -1,29 +1,68 @@ # Configs of the docker images, you might have specify your own configs here. -# type of database, support 'mysql' and 'postgres' -DB_TYPE="postgres" -DB_PASSWORD="YOUR_DB_PASSWORD" -DB_RUN_NAME="YOUR_DB_RUN_NAME" -HOST_PORT="YOUR_HOST_PORT" + +DB_TYPE="YOUR_DB_TYPE" # type of database, support 'mysql' and 'postgres' +MEM_TYPE="YOUR_MEM_TYPE" # type of memory database, support 'redis' and 'memcache' +DB_PASSWORD="YOUR_DB_PASSWORD" # The database password. +DB_RUN_NAME="YOUR_DB_RUN_NAME" # The --name option value when run the database image. +MEM_RUN_NAME="YOUR_MEM_RUN_NAME" # The --name option value when run the mem database image. +HOST_PORT="YOUR_HOST_PORT" # The port on host, which will be redirected to the port 3000 inside gogs container. + +# apt source, you can select 'nchc'(mirror in Taiwan) or 'aliyun'(best for mainlance China users) according to your network, if you could connect to the official unbunt mirror in a fast speed, just leave it to "". +APT_SOURCE="" # Replace the database root password in database image Dockerfile. sed -i "s/THE_DB_PASSWORD/$DB_PASSWORD/g" images/$DB_TYPE/Dockerfile # Replace the database root password in gogits image deploy.sh file. sed -i "s/THE_DB_PASSWORD/$DB_PASSWORD/g" images/gogits/deploy.sh +# Replace the apt source in gogits image Dockerfile. +sed -i "s/#$APT_SOURCE#//" images/gogits/Dockerfile +# Uncomment the installation of database lib in gogs Dockerfile +sed -i "s/#$DB_TYPE#//" images/gogits/Dockerfile # Replace the database type in gogits image deploy.sh file. sed -i "s/THE_DB_TYPE/$DB_TYPE/g" images/gogits/deploy.sh +if [ $MEM_TYPE != "" ] + then + # Replace the mem configs in deploy.sh + sed -i "s/THE_MEM_TYPE/$MEM_TYPE/g" images/gogits/deploy.sh + # Uncomment the installation of go mem lib + sed -i "s/#$MEM_TYPE#//" images/gogits/Dockerfile + + # Add the tags when get gogs + sed -i "s#RUN go get -u -d github.com/gogits/gogs#RUN go get -u -d -tags $MEM_TYPE github.com/gogits/gogs#g" images/gogits/Dockerfile + # Append the tag in gogs build + GOGS_BUILD_LINE=`awk '$0 ~ str{print NR}' str="go build" images/gogits/Dockerfile` + # Append the build tags + sed -i "${GOGS_BUILD_LINE}s/$/ -tags $MEM_TYPE/" images/gogits/Dockerfile + + cd images/$MEM_TYPE + docker build -t gogits/$MEM_TYPE . + docker run -d --name $MEM_RUN_NAME gogits/$MEM_TYPE + MEM_LINK=" --link $MEM_RUN_NAME:mem " + cd ../../ +fi + # Build the database image cd images/$DB_TYPE -docker build -t gogs/$DB_TYPE . +docker build -t gogits/$DB_TYPE . # + + ## Build the gogits image cd ../gogits -docker build -t gogs/gogits . + +docker build -t gogits/gogs . + +#sed -i "s#RUN go get -u -tags $MEM_TYPE github.com/gogits/gogs#RUN go get -u github.com/gogits/gogs#g" Dockerfile + +# Remove the appended tags in go build line(if there is any) +sed -i "s/ -tags $MEM_TYPE//" Dockerfile + # ## Run MySQL image with name -docker run -d --name $DB_RUN_NAME gogs/$DB_TYPE +docker run -d --name $DB_RUN_NAME gogits/$DB_TYPE # ## Run gogits image and link it to the database image echo "Now we have the $DB_TYPE image(running) and gogs image, use the follow command to start gogs service:" -echo -e "\033[33m docker run -i -t --link $DB_RUN_NAME:db -p $HOST_PORT:3000 gogs/gogits \033[0m" +echo -e "\033[33m docker run -i -t --link $DB_RUN_NAME:db $MEM_LINK -p $HOST_PORT:3000 gogits/gogs \033[0m" diff --git a/dockerfiles/images/gogits/Dockerfile b/dockerfiles/images/gogits/Dockerfile index 410bb9cb..25d1dd5e 100644 --- a/dockerfiles/images/gogits/Dockerfile +++ b/dockerfiles/images/gogits/Dockerfile @@ -3,7 +3,9 @@ MAINTAINER Meaglith Ma <genedna@gmail.com> (@genedna) ENV DEBIAN_FRONTEND noninteractive -RUN echo "deb http://mirrors.aliyun.com/ubuntu/ saucy main restricted" > /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security multiverse" >> /etc/apt/sources.list +#aliyun#RUN echo "deb http://mirrors.aliyun.com/ubuntu/ saucy main restricted" > /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security multiverse" >> /etc/apt/sources.list + +#nchc#RUN echo "deb http://free.nchc.org.tw/ubuntu/ saucy main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security multiverse" >> /etc/apt/source.list && echo "deb http://extras.ubuntu.com/ubuntu saucy main" >> /etc/apt/source.list && echo "deb-src http://extras.ubuntu.com/ubuntu saucy main" >> /etc/apt/source.list RUN mkdir -p /go ENV PATH /usr/local/go/bin:/go/bin:$PATH @@ -11,14 +13,13 @@ ENV GOROOT /usr/local/go ENV GOPATH /go RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip wget ca-certificates build-essential +RUN apt-get install -yq vim RUN curl -s http://docker.u.qiniudn.com/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 -# You may need a proxy, if github is very slow. -#RUN http_proxy=106.187.38.45:3128 go get -u github.com/gogits/gogs -RUN go get -u github.com/gogits/gogs -RUN cd $GOPATH/src/github.com/gogits/gogs && go build +RUN go get -u -d github.com/gogits/gogs +RUN cd $GOPATH/src/github.com/gogits/gogs && git checkout dev && git pull origin dev && go install && go build -tags redis # Clean all the unused packages RUN apt-get autoremove -y diff --git a/dockerfiles/images/gogits/deploy.sh b/dockerfiles/images/gogits/deploy.sh index 47e13260..94085248 100644 --- a/dockerfiles/images/gogits/deploy.sh +++ b/dockerfiles/images/gogits/deploy.sh @@ -4,22 +4,47 @@ DB_TYPE=THE_DB_TYPE DB_PASSWORD=THE_DB_PASSWORD DB_ALIAS=DB +MEM_TYPE=THE_MEM_TYPE + DB_TYPE_LINE=`awk '$0 ~ str{print NR}' str="DB_TYPE = mysql" $GOPATH/src/github.com/gogits/gogs/conf/app.ini` DB_PASSWORD_LINE=`awk '$0 ~ str{print NR+1}' str="USER = root" $GOPATH/src/github.com/gogits/gogs/conf/app.ini` sed -i "${DB_TYPE_LINE}s/.*$/DB_TYPE = $DB_TYPE/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini sed -i "${DB_PASSWORD_LINE}s/.*$/PASSWD = $DB_PASSWORD/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini -if [ $DB_TYPE = "postgres" ] + + +if [ $MEM_TYPE != "" ] then - # Add the postgres in gogs image. - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 - echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list - apt-get update - apt-get -y -q install python-software-properties software-properties-common - apt-get -y -q install postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3 + MEM_HOST_LINE=`awk '$0 ~ str{print NR+6}' str="ADAPTER = memory" $GOPATH/src/github.com/gogits/gogs/conf/app.ini` + + _MEM_ADDR=`echo $MEM_PORT | cut -d '/' -f 3 | cut -d ':' -f 1` + _MEM_PORT=`echo $MEM_PORT | cut -d '/' -f 3 | cut -d ':' -f 2` + + # take advantage of memory db for adapter and provider + sed -i "s/ADAPTER = memory/ADAPTER = $MEM_TYPE/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini + # Comment the memory interval since we don't use 'memory' as adapter + sed -i "s/INTERVAL = 60/;INTERVAL = 60/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini + + + case $MEM_TYPE in + "redis") + # Modify the adapter host + sed -i "${MEM_HOST_LINE}s/.*/HOST = $_MEM_ADDR:$_MEM_PORT/" $GOPATH/src/github.com/gogits/gogs/conf/app.ini + sed -i "s/PROVIDER = file/PROVIDER = $MEM_TYPE/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini + # Modify the provider config + sed -i "s#PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = $_MEM_ADDR:$_MEM_PORT#g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini + ;; + + "memcache") + # Modify the adapter host + sed -i "${MEM_HOST_LINE}s/.*/HOST = $_MEM_ADDR:$_MEM_PORT/" $GOPATH/src/github.com/gogits/gogs/conf/app.ini + ;; + esac + fi + ## Replace the database address and port # When using --link in docker run, the database image's info looks like this: # DB_PORT=tcp://172.17.0.2:3306 diff --git a/dockerfiles/images/memcached/.gitkeep b/dockerfiles/images/memcache/.gitkeep index e69de29b..e69de29b 100644 --- a/dockerfiles/images/memcached/.gitkeep +++ b/dockerfiles/images/memcache/.gitkeep diff --git a/dockerfiles/images/memcache/Dockerfile b/dockerfiles/images/memcache/Dockerfile new file mode 100644 index 00000000..2466c1f5 --- /dev/null +++ b/dockerfiles/images/memcache/Dockerfile @@ -0,0 +1,26 @@ +FROM ubuntu + +# Set the file maintainer (your name - the file's author) +MAINTAINER Borja Burgos <borja@tutum.co> + +ENV DEBIAN_FRONTEND noninteractive + +# Update the default application repository sources list +RUN apt-get update + +# Install Memcached +RUN apt-get install -y memcached + +# Port to expose (default: 11211) +EXPOSE 11211 + +# Default Memcached run command arguments +# Change to limit memory when creating container in Tutum +CMD ["-m", "64"] + +# Set the user to run Memcached daemon +USER daemon + +# Set the entrypoint to memcached binary +ENTRYPOINT memcached + diff --git a/dockerfiles/images/mysql/Dockerfile b/dockerfiles/images/mysql/Dockerfile index 9b163e32..8fff5a19 100644 --- a/dockerfiles/images/mysql/Dockerfile +++ b/dockerfiles/images/mysql/Dockerfile @@ -10,7 +10,7 @@ RUN add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -s RUN apt-get --yes --force-yes update RUN apt-get --yes --force-yes upgrade -ENV MYSQL_PASSWORD THE_MYSQL_PASSWORD +ENV MYSQL_PASSWORD THE_DB_PASSWORD RUN echo "mysql-server mysql-server/root_password password $MYSQL_PASSWORD" | debconf-set-selections RUN echo "mysql-server mysql-server/root_password_again password $MYSQL_PASSWORD" | debconf-set-selections diff --git a/dockerfiles/images/postgres/Dockerfile b/dockerfiles/images/postgres/Dockerfile index 9f026600..44e82b7d 100644 --- a/dockerfiles/images/postgres/Dockerfile +++ b/dockerfiles/images/postgres/Dockerfile @@ -1,6 +1,8 @@ FROM ubuntu MAINTAINER SvenDowideit@docker.com +ENV DEBIAN_FRONTEND noninteractive + # Add the PostgreSQL PGP key to verify their Debian packages. # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 diff --git a/dockerfiles/images/redis/Dockerfile b/dockerfiles/images/redis/Dockerfile new file mode 100644 index 00000000..d8b24d5a --- /dev/null +++ b/dockerfiles/images/redis/Dockerfile @@ -0,0 +1,14 @@ +FROM stackbrew/ubuntu:saucy +MAINTAINER Meaglith Ma <genedna@gmail.com> (@genedna), Lance Ju <juzhenatpku@gmail.com> (@crystaldust) + +ENV DEBIAN_FRONTEND noninteractive + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && apt-get install -y redis-server +# Usually redis doesn't need a password +#RUN sed -i "s/# requirepass foobared/requirepass THE_REDIS_PASSWORD/g" /etc/redis/redis.conf +EXPOSE 6379 +ENTRYPOINT ["/usr/bin/redis-server"] +CMD ["--bind", "0.0.0.0"] + @@ -19,7 +19,7 @@ import ( // Test that go1.2 tag above is included in builds. main.go refers to this definition. const go12tag = true -const APP_VER = "0.3.0.0421 Alpha" +const APP_VER = "0.3.0.0422 Alpha" func init() { base.AppVer = APP_VER diff --git a/models/repo.go b/models/repo.go index 19fe6e28..2011ed7d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -47,16 +47,16 @@ func NewRepoContext() { zip.Verbose = false // Check if server has basic git setting. - stdout, _, err := com.ExecCmd("git", "config", "--get", "user.name") - if err != nil { - fmt.Printf("repo.init(fail to get git user.name): %v", err) + stdout, stderr, err := com.ExecCmd("git", "config", "--get", "user.name") + if strings.Contains(stderr, "fatal:") { + fmt.Printf("repo.NewRepoContext(fail to get git user.name): %s", stderr) os.Exit(2) - } else if len(stdout) == 0 { - if _, _, err = com.ExecCmd("git", "config", "--global", "user.email", "gogitservice@gmail.com"); err != nil { - fmt.Printf("repo.init(fail to set git user.email): %v", err) + } else if err != nil || len(strings.TrimSpace(stdout)) == 0 { + if _, stderr, err = com.ExecCmd("git", "config", "--global", "user.email", "gogitservice@gmail.com"); err != nil { + fmt.Printf("repo.NewRepoContext(fail to set git user.email): %s", stderr) os.Exit(2) - } else if _, _, err = com.ExecCmd("git", "config", "--global", "user.name", "Gogs"); err != nil { - fmt.Printf("repo.init(fail to set git user.name): %v", err) + } else if _, stderr, err = com.ExecCmd("git", "config", "--global", "user.name", "Gogs"); err != nil { + fmt.Printf("repo.NewRepoContext(fail to set git user.name): %s", stderr) os.Exit(2) } } @@ -352,7 +352,6 @@ func CreateRepository(user *User, name, desc, lang, license string, private, mir func extractGitBareZip(repoPath string) error { z, err := zip.Open("conf/content/git-bare.zip") if err != nil { - fmt.Println("shi?") return err } defer z.Close() @@ -364,21 +363,14 @@ func extractGitBareZip(repoPath string) error { func initRepoCommit(tmpPath string, sig *git.Signature) (err error) { var stderr string if _, stderr, err = com.ExecCmdDir(tmpPath, "git", "add", "--all"); err != nil { - return err - } else if strings.Contains(stderr, "fatal:") { return errors.New("git add: " + stderr) } - if _, stderr, err = com.ExecCmdDir(tmpPath, "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), "-m", "Init commit"); err != nil { - return err - } else if strings.Contains(stderr, "fatal:") { return errors.New("git commit: " + stderr) } if _, stderr, err = com.ExecCmdDir(tmpPath, "git", "push", "origin", "master"); err != nil { - return err - } else if strings.Contains(stderr, "fatal:") { return errors.New("git push: " + stderr) } return nil diff --git a/modules/base/base_redis.go b/modules/base/base_redis.go index 327af841..42430df7 100644 --- a/modules/base/base_redis.go +++ b/modules/base/base_redis.go @@ -4,6 +4,7 @@ package base import ( _ "github.com/gogits/cache/redis" + _ "github.com/gogits/session/redis" ) func init() { diff --git a/routers/repo/release.go b/routers/repo/release.go index a4baa479..b386bac8 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -87,7 +87,6 @@ func Releases(ctx *middleware.Context) { return } tags.rels[i].NumCommitsBehind = commitsCount - tags.rels[i].NumCommits - tags.rels[i].Created = commit.Author.When } } diff --git a/routers/repo/repo.go b/routers/repo/repo.go index f733378b..76964dff 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -134,7 +134,6 @@ func Single(ctx *middleware.Context, params martini.Params) { } entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename) - if err != nil && err != git.ErrNotExist { ctx.Handle(404, "repo.Single(GetTreeEntryByPath)", err) return diff --git a/routers/user/setting.go b/routers/user/setting.go index a8fdc116..019044c5 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -66,7 +66,7 @@ func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) { log.Trace("%s User setting updated: %s", ctx.Req.RequestURI, ctx.User.LowerName) ctx.Flash.Success("Your profile has been successfully updated.") - ctx.Redirect("/user/setting") + ctx.Redirect("/user/settings") } func SettingSocial(ctx *middleware.Context) { @@ -122,7 +122,7 @@ func SettingPasswordPost(ctx *middleware.Context, form auth.UpdatePasswdForm) { ctx.Flash.Success("Password is changed successfully. You can now sign in via new password.") } - ctx.Redirect("/user/setting/password") + ctx.Redirect("/user/settings/password") } func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) { @@ -181,7 +181,7 @@ func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) { } else { log.Trace("%s User SSH key added: %s", ctx.Req.RequestURI, ctx.User.LowerName) ctx.Flash.Success("New SSH Key has been added!") - ctx.Redirect("/user/setting/ssh") + ctx.Redirect("/user/settings/ssh") return } } @@ -159,7 +159,7 @@ func runServ(k *cli.Context) { qlog.Fatal(err) } if !has { - has, err = models.HasAccess(user.Name, repoPath, models.AU_WRITABLE) + has, err = models.HasAccess(user.Name, path.Join(repoUserName, repoName), models.AU_WRITABLE) if err != nil { println("Internal error") qlog.Fatal(err) diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index e5b22192..932cae36 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -21,7 +21,7 @@ <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}"> <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/> </a> - <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/setting" data-toggle="tooltip" data-placement="bottom" title="Setting"><i class="fa fa-cogs fa-lg"></i></a> + <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/settings" data-toggle="tooltip" data-placement="bottom" title="Settings"><i class="fa fa-cogs fa-lg"></i></a> {{if .IsAdmin}}<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="/admin" data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a>{{end}} <div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo"> <button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button> diff --git a/templates/issue/user.tmpl b/templates/issue/user.tmpl index 1d49395c..812d9d8e 100644 --- a/templates/issue/user.tmpl +++ b/templates/issue/user.tmpl @@ -29,7 +29,7 @@ <div class="filter-option"> <div class="btn-group"> <a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="/issues?type={{.ViewType}}&repoid={{.RepoId}}">{{.OpenIssueCount}} Open</a> - <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="/issues?state=closed&type={{.ViewType}}&repoid={{.RepoId}}">{{.ClosedIssueCount}} Close</a> + <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="/issues?state=closed&type={{.ViewType}}&repoid={{.RepoId}}">{{.ClosedIssueCount}} Closed</a> </div> </div> <div class="issues list-group"> diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl index cba9cce0..c55d27fa 100644 --- a/templates/user/password.tmpl +++ b/templates/user/password.tmpl @@ -5,7 +5,7 @@ <div id="user-setting-container" class="col-md-9"> <div id="setting-pwd"> <h4>Password</h4> - <form class="form-horizontal" id="password-form" method="post" action="/user/setting/password"> + <form class="form-horizontal" id="password-form" method="post" action="/user/settings/password"> {{.CsrfTokenHtml}} {{template "base/alert" .}} <div class="form-group"> diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl index 8eb7be48..bf9aac11 100644 --- a/templates/user/publickey.tmpl +++ b/templates/user/publickey.tmpl @@ -21,7 +21,7 @@ </ul> <div class="modal fade" id="ssh-add-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-dialog"> - <form class="modal-content form-horizontal" id="ssh-form" method="post" action="/user/setting/ssh/"> + <form class="modal-content form-horizontal" id="ssh-form" method="post" action="/user/settings/ssh/"> {{.CsrfTokenHtml}} <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl index 59357d7c..56d859fe 100644 --- a/templates/user/setting.tmpl +++ b/templates/user/setting.tmpl @@ -5,7 +5,7 @@ <div id="user-setting-container" class="col-md-9"> <div id="setting-pwd"> <h4>Account Profile</h4> - <form class="form-horizontal" id="password-form" method="post" action="/user/setting"> + <form class="form-horizontal" id="password-form" method="post" action="/user/settings"> {{.CsrfTokenHtml}} {{template "base/alert" .}} <p>Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.</p> @@ -13,7 +13,7 @@ <label class="col-md-2 control-label" for="user-setting-username">Username<strong class="text-danger">*</strong></label> <div class="col-md-8"> <input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}" title="{{.SignedUser.Name}}" id="user-setting-username"> - <p class="help-block hidden"><span class="text-danger">Cautious : </span>your username is changing !</p> + <p class="help-block hidden"><span class="text-danger">Caution : </span>your username is changing !</p> </div> </div> diff --git a/templates/user/setting_nav.tmpl b/templates/user/setting_nav.tmpl index 9c7ae520..387fe950 100644 --- a/templates/user/setting_nav.tmpl +++ b/templates/user/setting_nav.tmpl @@ -1,11 +1,11 @@ <div id="user-setting-nav" class="col-md-3"> - <h4>Account Setting</h4> + <h4>Account Settings</h4> <ul class="list-group"> - <li class="list-group-item{{if .IsUserPageSetting}} list-group-item-success{{end}}"><a href="/user/setting">Account Profile</a></li> - <li class="list-group-item{{if .IsUserPageSettingSocial}} list-group-item-success{{end}}"><a href="/user/setting/social">Social Account</a></li> - <li class="list-group-item{{if .IsUserPageSettingPasswd}} list-group-item-success{{end}}"><a href="/user/setting/password">Password</a></li> + <li class="list-group-item{{if .IsUserPageSetting}} list-group-item-success{{end}}"><a href="/user/settings">Account Profile</a></li> + <li class="list-group-item{{if .IsUserPageSettingSocial}} list-group-item-success{{end}}"><a href="/user/settings/social">Social Account</a></li> + <li class="list-group-item{{if .IsUserPageSettingPasswd}} list-group-item-success{{end}}"><a href="/user/settings/password">Password</a></li> <!-- <li class="list-group-item{{if .IsUserPageSettingNotify}} list-group-item-success{{end}}"><a href="/user/setting/notification">Notifications</a></li> --> - <li class="list-group-item{{if .IsUserPageSettingSSH}} list-group-item-success{{end}}"><a href="/user/setting/ssh/">SSH Keys</a></li> + <li class="list-group-item{{if .IsUserPageSettingSSH}} list-group-item-success{{end}}"><a href="/user/settings/ssh/">SSH Keys</a></li> <!-- <li class="list-group-item{{if .IsUserPageSettingSecurity}} list-group-item-success{{end}}"><a href="/user/setting/security">Security</a></li> --> <li class="list-group-item{{if .IsUserPageSettingDelete}} list-group-item-success{{end}}"><a href="/user/delete">Delete Account</a></li> </ul> @@ -20,7 +20,7 @@ var CmdUpdate = cli.Command{ Name: "update", Usage: "This command just should be called by ssh shell", Description: ` -gogs serv provide access auth for repositories`, +gogs update get pushed info and insert into database`, Action: runUpdate, Flags: []cli.Flag{}, } @@ -94,8 +94,8 @@ func runWeb(*cli.Context) { m.Group("/user", func(r martini.Router) { r.Get("/delete", user.Delete) r.Post("/delete", user.DeletePost) - r.Get("/setting", user.Setting) - r.Post("/setting", bindIgnErr(auth.UpdateProfileForm{}), user.SettingPost) + r.Get("/settings", user.Setting) + r.Post("/settings", bindIgnErr(auth.UpdateProfileForm{}), user.SettingPost) }, reqSignIn) m.Group("/user", func(r martini.Router) { r.Get("/feeds", middleware.Bind(auth.FeedsForm{}), user.Feeds) @@ -105,7 +105,7 @@ func runWeb(*cli.Context) { r.Post("/forget_password", user.ForgotPasswdPost) r.Get("/logout", user.SignOut) }) - m.Group("/user/setting", func(r martini.Router) { + m.Group("/user/settings", func(r martini.Router) { r.Get("/social", user.SettingSocial) r.Get("/password", user.SettingPassword) r.Post("/password", bindIgnErr(auth.UpdatePasswdForm{}), user.SettingPasswordPost) |