Skip to content

Rearranged folders #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexlyulkov merged 2 commits into from
Oct 5, 2015
Merged

Rearranged folders #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9afc9a3
Fixed imports
alexlyulkov Oct 5, 2015
a3db86b
More folders arrangments
alexlyulkov Oct 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ ETCD_FLAGS := TELEPORT_TEST_ETCD_NODES=${ETCD_NODES}
.PHONY: install test test-with-etcd remove-temp files test-package update test-grep-package cover-package cover-package-with-etcd run profile sloccount set-etcd install-assets docs-serve

install: remove-temp-files
go install github.com/gravitational/teleport/teleport
go install github.com/gravitational/teleport/tctl
go install github.com/gravitational/teleport/telescope/telescope
go install github.com/gravitational/teleport/telescope/telescope/tscopectl
go install github.com/gravitational/teleport/tool/teleport
go install github.com/gravitational/teleport/tool/tctl
go install github.com/gravitational/teleport/tool/telescope/telescope
go install github.com/gravitational/teleport/tool/tscopectl

install-assets:
go get github.com/jteeuwen/go-bindata/go-bindata
Expand Down
4 changes: 2 additions & 2 deletions auth/ap.go → lib/auth/ap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package auth
import (
"time"

"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/lib/backend"
"github.com/gravitational/teleport/lib/services"
)

// AccessPoint is a interface needed by nodes to control the access
Expand Down
8 changes: 4 additions & 4 deletions auth/api.go → lib/auth/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"net"
"net/http"

"github.com/gravitational/teleport/events"
"github.com/gravitational/teleport/recorder"
"github.com/gravitational/teleport/session"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/events"
"github.com/gravitational/teleport/lib/recorder"
"github.com/gravitational/teleport/lib/session"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/oxy/trace"
Expand Down
4 changes: 2 additions & 2 deletions auth/auth.go → lib/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/session"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
"github.com/gravitational/teleport/backend/encryptedbk"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/lib/backend/encryptedbk"
"github.com/gravitational/teleport/lib/services"
)

// Authority implements minimal key-management facility for generating OpenSSH
Expand Down
6 changes: 3 additions & 3 deletions auth/auth_test.go → lib/auth/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
authority "github.com/gravitational/teleport/auth/native"
"github.com/gravitational/teleport/backend/boltbk"
"github.com/gravitational/teleport/backend/encryptedbk"
authority "github.com/gravitational/teleport/lib/auth/native"
"github.com/gravitational/teleport/lib/backend/boltbk"
"github.com/gravitational/teleport/lib/backend/encryptedbk"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"

Expand Down
12 changes: 6 additions & 6 deletions auth/clt.go → lib/auth/clt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"time"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/events"
"github.com/gravitational/teleport/recorder"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/session"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/events"
"github.com/gravitational/teleport/lib/recorder"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/session"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/roundtrip"
Expand Down
8 changes: 4 additions & 4 deletions auth/init.go → lib/auth/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend/encryptedbk"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/sshutils"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/backend/encryptedbk"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/sshutils"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
Expand Down
0 auth/native/native.go → lib/auth/native/native.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion auth/native/native_test.go → lib/auth/native/native_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package native
import (
"testing"

"github.com/gravitational/teleport/auth/test"
"github.com/gravitational/teleport/lib/auth/test"

. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
)
Expand Down
0 auth/openssh/oauth.go → lib/auth/openssh/oauth.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion auth/openssh/oauth_test.go → lib/auth/openssh/oauth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package openssh
import (
"testing"

"github.com/gravitational/teleport/auth/test"
"github.com/gravitational/teleport/lib/auth/test"

. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
)
Expand Down
4 changes: 2 additions & 2 deletions auth/register.go → lib/auth/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"io/ioutil"
"strings"

"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/trace"
"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"
Expand Down
12 changes: 6 additions & 6 deletions auth/srv.go → lib/auth/srv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"time"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/events"
"github.com/gravitational/teleport/recorder"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/session"
"github.com/gravitational/teleport/lib/backend"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/events"
"github.com/gravitational/teleport/lib/recorder"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/session"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/form"
Expand Down
22 changes: 11 additions & 11 deletions auth/srv_test.go → lib/auth/srv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import (
"time"

"github.com/gravitational/teleport"
authority "github.com/gravitational/teleport/auth/native"
"github.com/gravitational/teleport/backend/boltbk"
"github.com/gravitational/teleport/backend/encryptedbk"
"github.com/gravitational/teleport/events/boltlog"
etest "github.com/gravitational/teleport/events/test"
rtest "github.com/gravitational/teleport/recorder/test"
"github.com/gravitational/teleport/services"

"github.com/gravitational/teleport/recorder"
"github.com/gravitational/teleport/recorder/boltrec"
"github.com/gravitational/teleport/session"
authority "github.com/gravitational/teleport/lib/auth/native"
"github.com/gravitational/teleport/lib/backend/boltbk"
"github.com/gravitational/teleport/lib/backend/encryptedbk"
"github.com/gravitational/teleport/lib/events/boltlog"
etest "github.com/gravitational/teleport/lib/events/test"
rtest "github.com/gravitational/teleport/lib/recorder/test"
"github.com/gravitational/teleport/lib/services"

"github.com/gravitational/teleport/lib/recorder"
"github.com/gravitational/teleport/lib/recorder/boltrec"
"github.com/gravitational/teleport/lib/session"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
Expand Down
2 changes: 1 addition & 1 deletion auth/test/suite.go → lib/auth/test/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/gravitational/teleport/Godeps/_workspace/src/golang.org/x/crypto/ssh"
"github.com/gravitational/teleport/auth"
"github.com/gravitational/teleport/lib/auth"

. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
)
Expand Down
6 changes: 3 additions & 3 deletions auth/tun.go → lib/auth/tun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http"
"sync"

"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/sshutils"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/sshutils"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/roundtrip"
Expand Down
20 changes: 10 additions & 10 deletions auth/tun_test.go → lib/auth/tun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import (
"net/url"
"path/filepath"

authority "github.com/gravitational/teleport/auth/native"
"github.com/gravitational/teleport/backend/boltbk"
"github.com/gravitational/teleport/backend/encryptedbk"
"github.com/gravitational/teleport/events/boltlog"
"github.com/gravitational/teleport/recorder"
"github.com/gravitational/teleport/recorder/boltrec"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/session"
"github.com/gravitational/teleport/sshutils"
"github.com/gravitational/teleport/utils"
authority "github.com/gravitational/teleport/lib/auth/native"
"github.com/gravitational/teleport/lib/backend/boltbk"
"github.com/gravitational/teleport/lib/backend/encryptedbk"
"github.com/gravitational/teleport/lib/events/boltlog"
"github.com/gravitational/teleport/lib/recorder"
"github.com/gravitational/teleport/lib/recorder/boltrec"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/session"
"github.com/gravitational/teleport/lib/sshutils"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/secret"
Expand Down
0 backend/backend.go → lib/backend/backend.go
View file
Open in desktop
File renamed without changes.
0 backend/boltbk/boltbk.go → lib/backend/boltbk/boltbk.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/boltbk/boltbk_test.go → lib/backend/boltbk/boltbk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"path/filepath"
"testing"

"github.com/gravitational/teleport/backend/test"
"github.com/gravitational/teleport/lib/backend/test"

. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion backend/boltbk/boltcfg.go → lib/backend/boltbk/boltcfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/trace"
"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/lib/backend"
)

// cfg represents JSON config for bolt backlend
Expand Down
0 backend/codec.go → lib/backend/codec.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/encryptedbk/boltkeystore_test.go → lib/backend/encryptedbk/boltkeystore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
Expand Down
4 changes: 2 additions & 2 deletions backend/encryptedbk/encryptedbk.go → lib/backend/encryptedbk/encryptedbk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/trace"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/backend"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
)

type EncryptedBackend struct {
Expand Down
6 changes: 3 additions & 3 deletions backend/encryptedbk/encryptedbk_test.go → lib/backend/encryptedbk/encryptedbk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"path/filepath"
"testing"

"github.com/gravitational/teleport/backend/boltbk"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/backend/test"
"github.com/gravitational/teleport/lib/backend/boltbk"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/backend/test"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
Expand Down
0 backend/encryptedbk/encryptor/encryptor.go → ...ackend/encryptedbk/encryptor/encryptor.go
View file
Open in desktop
File renamed without changes.
0 backend/encryptedbk/encryptor/gpg_test.go → ...backend/encryptedbk/encryptor/gpg_test.go
View file
Open in desktop
File renamed without changes.
0 ...end/encryptedbk/encryptor/gpgencryptor.go → ...end/encryptedbk/encryptor/gpgencryptor.go
View file
Open in desktop
File renamed without changes.
0 backend/encryptedbk/encryptor/nacl_test.go → ...ackend/encryptedbk/encryptor/nacl_test.go
View file
Open in desktop
File renamed without changes.
0 ...nd/encryptedbk/encryptor/naclencryptor.go → ...nd/encryptedbk/encryptor/naclencryptor.go
View file
Open in desktop
File renamed without changes.
0 backend/encryptedbk/encryptor/testsuite.go → ...ackend/encryptedbk/encryptor/testsuite.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions backend/encryptedbk/keystore.go → lib/backend/encryptedbk/keystore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/trace"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend/boltbk"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/backend/boltbk"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
)

type KeyStore interface {
Expand Down
4 changes: 2 additions & 2 deletions backend/encryptedbk/replicatedbk.go → lib/backend/encryptedbk/replicatedbk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/trace"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/backend"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
)

type ReplicatedBackend struct {
Expand Down
6 changes: 3 additions & 3 deletions backend/encryptedbk/replicatedbk_test.go → lib/backend/encryptedbk/replicatedbk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/backend/boltbk"
"github.com/gravitational/teleport/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/backend/test"
"github.com/gravitational/teleport/lib/backend/boltbk"
"github.com/gravitational/teleport/lib/backend/encryptedbk/encryptor"
"github.com/gravitational/teleport/lib/backend/test"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
Expand Down
2 changes: 1 addition & 1 deletion backend/etcdbk/cfg.go → lib/backend/etcdbk/cfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/lib/backend"
)

// cfg represents JSON config for etcd backlend
Expand Down
2 changes: 1 addition & 1 deletion backend/etcdbk/etcd.go → lib/backend/etcdbk/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/lib/backend"
)

type BackendOption func(b *bk) error
Expand Down
2 changes: 1 addition & 1 deletion backend/etcdbk/etcd_test.go → lib/backend/etcdbk/etcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
"github.com/gravitational/teleport/backend/test"
"github.com/gravitational/teleport/lib/backend/test"

. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion backend/test/suite.go → lib/backend/test/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/lemma/random"
"github.com/gravitational/teleport/backend"
"github.com/gravitational/teleport/lib/backend"

. "github.com/gravitational/teleport/Godeps/_workspace/src/gopkg.in/check.v1"
)
Expand Down
6 changes: 3 additions & 3 deletions cp/auth.go → lib/cp/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"io"
"net/http"

"github.com/gravitational/teleport/auth"
"github.com/gravitational/teleport/sshutils"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/auth"
"github.com/gravitational/teleport/lib/sshutils"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/julienschmidt/httprouter"
Expand Down
8 changes: 4 additions & 4 deletions cp/cp.go → lib/cp/cp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid"
"github.com/gravitational/teleport/events"
"github.com/gravitational/teleport/services"
"github.com/gravitational/teleport/sshutils/scp"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/events"
"github.com/gravitational/teleport/lib/services"
"github.com/gravitational/teleport/lib/sshutils/scp"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/codahale/lunk"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/form"
Expand Down
4 changes: 2 additions & 2 deletions cp/proxy.go → lib/cp/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"sync"

"github.com/gravitational/teleport/auth"
"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/auth"
"github.com/gravitational/teleport/lib/utils"

"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/gravitational/log"
"github.com/gravitational/teleport/Godeps/_workspace/src/github.com/mailgun/oxy/forward"
Expand Down
2 changes: 1 addition & 1 deletion cp/srv.go → lib/cp/srv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

"github.com/gravitational/teleport/utils"
"github.com/gravitational/teleport/lib/utils"
)

// CPSrv implements Control Panel server
Expand Down
0 cp/tpl.go → lib/cp/tpl.go
View file
Open in desktop
File renamed without changes.
Loading