diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/config/config.go | 5 | ||||
| -rw-r--r-- | pkg/config/config_test.go | 29 |
2 files changed, 31 insertions, 3 deletions
diff --git a/pkg/config/config.go b/pkg/config/config.go index 0e85b5a..6ac6d05 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -227,7 +227,7 @@ func defaultConfiguration() *configuration { return &configuration{ Scan: defaultScan(), RootReadme: "", - ListenAddr: "http//0.0.0.0:8080", + ListenAddr: defaultAddr(), Repositories: make([]*GitRepositoryConfiguration, 0), } } @@ -237,7 +237,10 @@ func defaultScan() *scan { Public: false, Path: "", } +} +func defaultAddr() string { + return "tcp://localhost:8080" } func defaultRepisotryConfiguration(path string) *GitRepositoryConfiguration { diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 9109ecb..2d779c5 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -22,6 +22,7 @@ func TestFileParsing(t *testing.T) { Public: false, Path: "/srv/git", }, + ListenAddr: defaultAddr(), Repositories: []*GitRepositoryConfiguration{}, }, }, @@ -36,6 +37,7 @@ scan "/srv/git" { Public: true, Path: "/srv/git", }, + ListenAddr: defaultAddr(), Repositories: []*GitRepositoryConfiguration{}, }, }, @@ -43,7 +45,8 @@ scan "/srv/git" { name: "minimal repository", config: `repository /srv/git/cerrado.git`, expectedConfig: &configuration{ - Scan: defaultScan(), + Scan: defaultScan(), + ListenAddr: defaultAddr(), Repositories: []*GitRepositoryConfiguration{ { Name: "cerrado.git", @@ -63,7 +66,8 @@ repository /srv/git/cerrado.git { public true }`, expectedConfig: &configuration{ - Scan: defaultScan(), + Scan: defaultScan(), + ListenAddr: defaultAddr(), Repositories: []*GitRepositoryConfiguration{ { Name: "cerrado", @@ -75,8 +79,28 @@ repository /srv/git/cerrado.git { }, }, { + name: "minimal listen", + config: ``, + expectedConfig: &configuration{ + Scan: defaultScan(), + ListenAddr: defaultAddr(), + Repositories: []*GitRepositoryConfiguration{}, + }, + }, + { + name: "complete listen", + config: `listen-addr unix://var/run/cerrado/cerrado.sock`, + expectedConfig: &configuration{ + Scan: defaultScan(), + ListenAddr: "unix://var/run/cerrado/cerrado.sock", + Repositories: []*GitRepositoryConfiguration{}, + }, + }, + { name: "complete", config: ` +listen-addr unix://var/run/cerrado/cerrado.sock + scan "/srv/git" { public true } @@ -93,6 +117,7 @@ repository /srv/git/cerrado.git { Public: true, Path: "/srv/git", }, + ListenAddr: "unix://var/run/cerrado/cerrado.sock", Repositories: []*GitRepositoryConfiguration{ { Name: "linux.git", |