Revert "update reademe and use flags"

This reverts commit 07a5f9e32b.
This commit is contained in:
Eliot Whalan 2016-07-15 15:11:35 +10:00
parent 3a8b83f434
commit 0734ad5189
2 changed files with 8 additions and 20 deletions

View File

@ -25,11 +25,8 @@ sudo yum install -y go mariadb-server mariadb
* go get https://github.com/ewhal/Pastebin * go get https://github.com/ewhal/Pastebin
* nano pastebin.go * nano pastebin.go
* Configure port and database details
* make * make
```
./pastebin --db-name="pastes" --db-username="pastebin" --db-pass=""
--port=":9900" --length=6
```
## License ## License

View File

@ -7,7 +7,6 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"encoding/xml" "encoding/xml"
"flag"
"fmt" "fmt"
"html" "html"
"html/template" "html/template"
@ -28,19 +27,19 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )
var ( const (
// ADDRESS that pastebin will return links for // ADDRESS that pastebin will return links for
ADDRESS string ADDRESS = "http://localhost:9900"
// LENGTH of paste id // LENGTH of paste id
LENGTH int LENGTH = 6
// PORT that pastebin will listen on // PORT that pastebin will listen on
PORT string PORT = ":9900"
// USERNAME for database // USERNAME for database
USERNAME string USERNAME = ""
// PASS database password // PASS database password
PASS string PASS = ""
// NAME database name // NAME database name
NAME string NAME = ""
// DATABASE connection String // DATABASE connection String
DATABASE = USERNAME + ":" + PASS + "@/" + NAME + "?charset=utf8" DATABASE = USERNAME + ":" + PASS + "@/" + NAME + "?charset=utf8"
) )
@ -381,14 +380,6 @@ func RootHandler(w http.ResponseWriter, r *http.Request) {
} }
func main() { func main() {
flag.StringVar(&ADDRESS, "address", "", "host to serve pastes on")
flag.StringVar(&PORT, "port", ":9990", "host to serve pastes on")
flag.StringVar(&USERNAME, "db-username", "", "db username")
flag.StringVar(&PASS, "db-pass", "", "db pass")
flag.StringVar(&NAME, "db-name", "", "db name")
flag.IntVar(&LENGTH, "id-length", 6, "length of uploaded file IDs")
flag.Parse()
router := mux.NewRouter() router := mux.NewRouter()
router.HandleFunc("/p/{pasteId}", PasteHandler).Methods("GET") router.HandleFunc("/p/{pasteId}", PasteHandler).Methods("GET")
router.HandleFunc("/raw/{pasteId}", RawHandler).Methods("GET") router.HandleFunc("/raw/{pasteId}", RawHandler).Methods("GET")