No hardcoded entrypoint

diff --git a/cmd/ch-leave/main.go b/cmd/ch-leave/main.go
index 00e6311c50d38a78c5eba5eb8ec2fac24fdfad25..0d09e2d4d8b958f884f2a441c995e02e16b27486 100644 (file)
--- a/cmd/ch-leave/main.go
+++ b/cmd/ch-leave/main.go
@@ -25,7 +25,7 @@ import (
 )
 
 func main() {
-       entrypoint := flag.String("entrypoint", "mm.rnd.stcnet.ru", "Entrypoint")
+       entrypoint := flag.String("entrypoint", mmc.GetEntrypoint(), "Entrypoint")
        flag.Parse()
        log.SetFlags(log.Lshortfile)
 

diff --git a/cmd/mmc/main.go b/cmd/mmc/main.go
index 20c8da45cc6426f3216834888d1ab655f049686d..e1b2c2953b35fdebf25433651e403df40b263b1e 100644 (file)
--- a/cmd/mmc/main.go
+++ b/cmd/mmc/main.go
@@ -58,7 +58,7 @@ func rewriteIfChanged(fn string, data string) {
 }
 
 func main() {
-       entrypoint := flag.String("entrypoint", "mm.rnd.stcnet.ru", "Entrypoint")
+       entrypoint := flag.String("entrypoint", mmc.GetEntrypoint(), "Entrypoint")
        notifyCmd := flag.String("notify", "cmd/notify", "Path to notification handler")
        heartbeatCh := flag.String("heartbeat-ch", "town-square", "Channel for heartbeating")
        flag.Parse()

diff --git a/cmd/scrollback/main.go b/cmd/scrollback/main.go
index aab3312497ce02f8a2bff465933bbb6c2367c8b0..733b5715391b1fcb19b6cd6339a7953eaa58487a 100644 (file)
--- a/cmd/scrollback/main.go
+++ b/cmd/scrollback/main.go
@@ -29,7 +29,7 @@ import (
 const PerPage = 100
 
 func main() {
-       entrypoint := flag.String("entrypoint", "mm.rnd.stcnet.ru", "Entrypoint")
+       entrypoint := flag.String("entrypoint", mmc.GetEntrypoint(), "Entrypoint")
        pageNum := flag.Int("page", 0, "Page number")
        direct := flag.Bool("direct", false, "Direct channel")
        flag.Parse()

diff --git a/common.go b/common.go
index 04126017888120498d5dabc236bb75cdd8236e56..e0e2b3eb5fb6c932c1d9a4bfdf802a4f90e0fea1 100644 (file)
--- a/common.go
+++ b/common.go
@@ -101,3 +101,11 @@ func GetUsers(c *model.Client4, debugFd *os.File) (map[string]*model.User, error
        }
        return users, nil
 }
+
+func GetEntrypoint() string {
+       s := os.Getenv("MMC_ENTRYPOINT")
+       if s == "" {
+               return "mm.invalid"
+       }
+       return s
+}

diff --git a/doc/usage.texi b/doc/usage.texi
index cfd8046447afef1da1ff650597c194ecb2441ffe..d64b9990b05bdde021913e37194d34b9a9549f29 100644 (file)
--- a/doc/usage.texi
+++ b/doc/usage.texi
@@ -10,7 +10,9 @@ compile Go programs in @file{cmd} subdirectory.
 
 @item Place your MM's credentials to @env{$NETRC} (@file{~/.netrc} by
 default). For example
-@code{machine mm.example.com login stargrave@@mm.example.com password PASSWORD}.
+@code{machine mm.invalid login stargrave@@mm.invalid password PASSWORD}.
+
+@item Set @env{$MMC_ENTRYPOINT} environment variable to your entrypoint.
 
 @item Run @command{cmd/start} and you should see started @command{tmux}
 with split window and running @command{cmd/mmc}.