Skip to content

Commit

Permalink
Rename the path name from chenglch to xcat2
Browse files Browse the repository at this point in the history
As golang relys on path name heavily, this patch just rename
the path for the owner to make the project compilable.
  • Loading branch information
chenglch committed Feb 14, 2018
1 parent 9cfe465 commit dbe1ca0
Show file tree
Hide file tree
Showing 31 changed files with 50 additions and 50 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ GOPATH?=$(shell pwd)
export GOPATH
PATH+=:$(shell pwd)/bin
export PATH
GITHUB_DIR=${GOPATH}/src/github.com/chenglch/
REPO_DIR=${GOPATH}/src/github.com/chenglch/goconserver
GITHUB_DIR=${GOPATH}/src/github.com/xcat2/
REPO_DIR=${GOPATH}/src/github.com/xcat2/goconserver
CURRENT_DIR=$(shell pwd)
REPO_DIR_LINK=$(shell readlink -f ${REPO_DIR})
SERVER_CONF_FILE=/etc/goconserver/server.conf
Expand All @@ -27,7 +27,7 @@ LDFLAGS=-ldflags "-X main.Version=${VERSION} -X main.BuildTime=${BUILD_TIME} -X
all: build
deps:
go get github.com/Masterminds/glide
glide install
${GOPATH}/bin/glide install

link:
REPO_DIR=${REPO_DIR}; \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ api interface.

### Setup goconserver from binary
Download the binary tarball for release from
[goconserver](https://github.com/chenglch/goconserver/releases)
[goconserver](https://github.com/xcat2/goconserver/releases)
```
tar xvfz goconserver_linux_amd64.tar.gz
cd goconserver_linux_amd64
Expand Down Expand Up @@ -88,7 +88,7 @@ Please setup golang SDK(1.9 or higher), GOPATH environment variable and
### Build and install

```
git clone https://github.com/chenglch/goconserver.git
git clone https://github.com/xcat2/goconserver.git
cd goconserver
make deps
make install
Expand Down
2 changes: 1 addition & 1 deletion api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ POST /nodes
"name": "node2",
"driver": "ssh",
"params": {
"user": "chenglch",
"user": "xcat2",
"host": "10.0.0.2",
"port": "22",
"private_key": "~/.ssh/id_rsa"
Expand Down
2 changes: 1 addition & 1 deletion api/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"encoding/json"
"github.com/chenglch/goconserver/console"
"github.com/xcat2/goconserver/console"
"github.com/gorilla/mux"
)

Expand Down
8 changes: 4 additions & 4 deletions api/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import (
"io/ioutil"
"net/http"

"github.com/chenglch/goconserver/common"
"github.com/chenglch/goconserver/console"
"github.com/chenglch/goconserver/storage"
"github.com/xcat2/goconserver/common"
"github.com/xcat2/goconserver/console"
"github.com/xcat2/goconserver/storage"
"github.com/gorilla/mux"
)

var (
nodeManager *console.NodeManager
plog = common.GetLogger("github.com/chenglch/goconserver/api/node")
plog = common.GetLogger("github.com/xcat2/goconserver/api/node")
serverConfig = common.GetServerConfig()
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/congo.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"fmt"
"github.com/chenglch/goconserver/console"
"github.com/xcat2/goconserver/console"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion common/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const (
)

var (
plog = GetLogger("github.com/chenglch/goconserver/common")
plog = GetLogger("github.com/xcat2/goconserver/common")
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion console/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package console

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal"
"os"
Expand Down
2 changes: 1 addition & 1 deletion console/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"golang.org/x/crypto/ssh/terminal"
"io"
"net"
Expand Down
6 changes: 3 additions & 3 deletions console/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package console
import (
"bytes"
"fmt"
"github.com/chenglch/goconserver/common"
pl "github.com/chenglch/goconserver/console/pipeline"
"github.com/chenglch/goconserver/plugins"
"github.com/xcat2/goconserver/common"
pl "github.com/xcat2/goconserver/console/pipeline"
"github.com/xcat2/goconserver/plugins"
"io"
"net"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion console/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package console

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"os"
)

Expand Down
4 changes: 2 additions & 2 deletions console/pipeline/base.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package logger

import (
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"time"
)

Expand All @@ -14,7 +14,7 @@ const (
var (
PUBLISHER_INIT_MAP = map[string]func(interface{}) (Publisher, error){}
LOGGER_INIT_MAP = map[string]func() Logger{}
plog = common.GetLogger("github.com/chenglch/goconserver/console/logger")
plog = common.GetLogger("github.com/xcat2/goconserver/console/logger")
serverConfig = common.GetServerConfig()
)

Expand Down
2 changes: 1 addition & 1 deletion console/pipeline/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package logger

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"os"
"path/filepath"
)
Expand Down
2 changes: 1 addition & 1 deletion console/pipeline/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"strings"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion console/pipeline/pipeline.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package logger

import (
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"sync"
)

Expand Down
2 changes: 1 addition & 1 deletion console/pipeline/tcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package logger
import (
"crypto/tls"
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"net"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion console/pipeline/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package logger

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"net"
"time"
)
Expand Down
4 changes: 2 additions & 2 deletions console/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package console
import (
"context"
"fmt"
"github.com/chenglch/goconserver/common"
pb "github.com/chenglch/goconserver/console/consolepb"
"github.com/xcat2/goconserver/common"
pb "github.com/xcat2/goconserver/console/consolepb"
google_protobuf "github.com/golang/protobuf/ptypes/empty"
net_context "golang.org/x/net/context"
"google.golang.org/grpc"
Expand Down
12 changes: 6 additions & 6 deletions console/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"github.com/chenglch/goconserver/common"
pb "github.com/chenglch/goconserver/console/consolepb"
pl "github.com/chenglch/goconserver/console/pipeline"
"github.com/chenglch/goconserver/plugins"
"github.com/chenglch/goconserver/storage"
"github.com/xcat2/goconserver/common"
pb "github.com/xcat2/goconserver/console/consolepb"
pl "github.com/xcat2/goconserver/console/pipeline"
"github.com/xcat2/goconserver/plugins"
"github.com/xcat2/goconserver/storage"
"net"
"net/http"
"os"
Expand All @@ -32,7 +32,7 @@ const (
)

var (
plog = common.GetLogger("github.com/chenglch/goconserver/console")
plog = common.GetLogger("github.com/xcat2/goconserver/console")
nodeManager *NodeManager
serverConfig = common.GetServerConfig()
STATUS_MAP = map[int]string{
Expand Down
2 changes: 1 addition & 1 deletion dirty-debuild
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ then
echo
echo "Examples:"
echo " ${0##*/} goconserver_linux_ppc64le.tar.gz"
echo " ${0##*/} https://github.com/chenglch/goconserver/files/1505167/goconserver_linux_ppc64le.tar.gz"
echo " ${0##*/} https://github.com/xcat2/goconserver/files/1505167/goconserver_linux_ppc64le.tar.gz"
exit 0
fi

Expand Down
4 changes: 2 additions & 2 deletions dirty-rpmbuild
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ then
echo
echo "Examples:"
echo " ${0##*/} goconserver_linux_ppc64le.tar.gz"
echo " ${0##*/} https://github.com/chenglch/goconserver/files/1505167/goconserver_linux_ppc64le.tar.gz"
echo " ${0##*/} https://github.com/xcat2/goconserver/files/1505167/goconserver_linux_ppc64le.tar.gz"
exit 0
fi

Expand Down Expand Up @@ -87,7 +87,7 @@ Release: snap$(date '+%Y%m%d%H%M')
License: EPL
Group: Applications/System
BuildArch: ${ARCH}
URL: https://github.com/chenglch/goconserver/
URL: https://github.com/xcat2/goconserver/
Vendor: IBM Corp.
Packager: IBM Corp.
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Expand Down
2 changes: 1 addition & 1 deletion etc/systemd/goconserver.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=goconserver console daemon
Documentation=https://github.com/chenglch/goconserver
Documentation=https://github.com/xcat2/goconserver

[Service]
LimitNOFILE=65535
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: .
import:
- package: github.com/chenglch/goconserver
- package: github.com/xcat2/goconserver
subpackages:
- api
- common
Expand Down
4 changes: 2 additions & 2 deletions goconserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"github.com/chenglch/goconserver/api"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/api"
"github.com/xcat2/goconserver/common"
"github.com/gorilla/mux"
"github.com/spf13/cobra"
"io/ioutil"
Expand Down
4 changes: 2 additions & 2 deletions plugins/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package plugins

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"io"
)

var (
DRIVER_INIT_MAP = map[string]func(string, map[string]string) (ConsolePlugin, error){}
DRIVER_VALIDATE_MAP = map[string]func(string, map[string]string) error{}
plog = common.GetLogger("github.com/chenglch/goconserver/plugins")
plog = common.GetLogger("github.com/xcat2/goconserver/plugins")
)

type ConsoleSession interface {
Expand Down
2 changes: 1 addition & 1 deletion plugins/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package plugins

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"github.com/kr/pty"
"os"
"os/exec"
Expand Down
2 changes: 1 addition & 1 deletion plugins/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"time"

"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"golang.org/x/crypto/ssh"
"net"
"os"
Expand Down
2 changes: 1 addition & 1 deletion plugins/sshcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package plugins

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"golang.org/x/crypto/ssh"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"github.com/coreos/etcd/clientv3"
"os"
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion storage/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storage
import (
"encoding/json"
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
"io/ioutil"
"path"
"reflect"
Expand Down
4 changes: 2 additions & 2 deletions storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package storage

import (
"fmt"
"github.com/chenglch/goconserver/common"
"github.com/xcat2/goconserver/common"
)

var (
serverConfig = common.GetServerConfig()
plog = common.GetLogger("github.com/chenglch/goconserver/storage")
plog = common.GetLogger("github.com/xcat2/goconserver/storage")
STORAGE_INIT_MAP = map[string]func() StorInterface{}
)

Expand Down

0 comments on commit dbe1ca0

Please sign in to comment.