From ba4a27c92808739797409f55109a98b958af52b3 Mon Sep 17 00:00:00 2001 From: George Shaw Date: Fri, 20 Oct 2017 14:31:08 -0500 Subject: [PATCH 1/3] updated to work with and go get --- main.go | 5 +++-- private_server/logging/logging.go | 3 ++- private_server/routing/routing.go | 3 ++- public_server/logging/logging.go | 3 ++- public_server/routing/routing.go | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index d98ecee..ef83cf0 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,11 @@ package main import ( - "gPanel/private_server/routing" - "gPanel/public_server/routing" "log" "net/http" + + "github.com/Ennovar/gPanel/private_server/routing" + "github.com/Ennovar/gPanel/public_server/routing" ) func main() { diff --git a/private_server/logging/logging.go b/private_server/logging/logging.go index 9ef24d6..c9a7c2b 100644 --- a/private_server/logging/logging.go +++ b/private_server/logging/logging.go @@ -1,10 +1,11 @@ package privateLogging import ( - "gPanel/general/networking" "log" "os" "strings" + + "github.com/Ennovar/gPanel/general/networking" ) const ( diff --git a/private_server/routing/routing.go b/private_server/routing/routing.go index 71b2978..c7c696f 100644 --- a/private_server/routing/routing.go +++ b/private_server/routing/routing.go @@ -2,10 +2,11 @@ package privateRouting import ( "bufio" - "gPanel/private_server/logging" "net/http" "os" "strings" + + "github.com/Ennovar/gPanel/private_server/logging" ) type privateHost struct { diff --git a/public_server/logging/logging.go b/public_server/logging/logging.go index 5a8f194..1c9f73d 100644 --- a/public_server/logging/logging.go +++ b/public_server/logging/logging.go @@ -1,10 +1,11 @@ package publicLogging import ( - "gPanel/general/networking" "log" "os" "strings" + + "github.com/Ennovar/gPanel/general/networking" ) const ( diff --git a/public_server/routing/routing.go b/public_server/routing/routing.go index 4bb7b3f..c72c61c 100644 --- a/public_server/routing/routing.go +++ b/public_server/routing/routing.go @@ -2,10 +2,11 @@ package publicRouting import ( "bufio" - "gPanel/public_server/logging" "net/http" "os" "strings" + + "github.com/Ennovar/gPanel/public_server/logging" ) type publicWeb struct { From 2d1e63fa89d24f21c60ddd86f0b595b3d2860584 Mon Sep 17 00:00:00 2001 From: George Shaw Date: Fri, 20 Oct 2017 14:53:32 -0500 Subject: [PATCH 2/3] updated deployment and contribution guide --- README.md | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5f3a7ff..6149e5f 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,37 @@ CSS Preprocessor: __[SASS](http://sass-lang.com/)__ CSS Toolkit: __[Bootstrap 4](http://getbootstrap.com/)__ Package Manager: __[npm](https://www.npmjs.com/)__ -## Deployment +## Contribution Set-up & Deployment ```shell -# Clone the Repo -git clone https://github.com/Ennovar/gPanel.git +# Go get the repo and append it to your $GOPATH +go get https://github.com/Ennovar/gPanel.git -# Navigate to the directory -cd gPanel +# Navigate to the directory (replace $GOPATH with your actual $GOPATH) +cd $GOPATH/github.com/Ennovar/gPanel -# Start the web-hosting server -go run main.go +go get remote -v +(orgin) +``` + +To set your repo up to contribute... + +```shell +# Fork the repo and add it to the list of remotes +git remote add fork https://github.com/Ennovar/gPanel.git + +# OPTIONAL: Change the names of the remotes +git remote rename origin upstream +git remote rename fork origin +``` + +To deploy... + +```shell +# Starting gPanel +go run main.go + +# OPTIONAL: Create binary to run +go build main.go +./main ``` From e1d991203b0705d09c4298f6f059acb3bc49c7c9 Mon Sep 17 00:00:00 2001 From: George Shaw Date: Fri, 20 Oct 2017 14:56:31 -0500 Subject: [PATCH 3/3] fxied somethin stupid --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 6149e5f..d4d2cd9 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,6 @@ go get https://github.com/Ennovar/gPanel.git # Navigate to the directory (replace $GOPATH with your actual $GOPATH) cd $GOPATH/github.com/Ennovar/gPanel - -go get remote -v -(orgin) ``` To set your repo up to contribute...