1diff --git a/config.example.scfg b/config.example.scfg
2index 0c27591435696f433122fed28814153e6e6edceb..5c3e5e4ff8452643ed462be5a8d494f9c4499d18 100644
3--- a/config.example.scfg
4+++ b/config.example.scfg
5@@ -7,9 +7,15 @@ passphrase $2a$14$VnB/ZcB1DUDkMnosRA6Y7.dj8h5eroslDxTeXlLwfQX/x86mh6WAq
6 aes-key 8XHptZxSWCGs1m7QzztX5zNQ7D9NiQevVX0DaUTNMbDpRwFzoJiB0U7K6O/kqIt01jJVgzBUfiR8ES46ZLLb4w==
7 syntax-highlight monokailight
8
9+
10+scan /srv/git/private {
11+ public false
12+}
13+
14 scan /srv/git/ {
15 public true
16 }
17+
18
19 repository /srv/git/cerrado.git {
20 name cerrado
21diff --git a/pkg/config/config.go b/pkg/config/config.go
22index c17e6df4ca913f882912747f4e76aa240976a158..1ad5108b7b9319683627faa0e89059686d9b0a10 100644
23--- a/pkg/config/config.go
24+++ b/pkg/config/config.go
25@@ -30,7 +30,7 @@
26 // configuration represents file configuration.
27 // fields needs to be exported to cmp to work
28 configuration struct {
29- Scan *scan
30+ Scans []*scan
31 RootReadme string
32 ListenAddr string
33 Passphrase string
34@@ -82,10 +82,12 @@ rootReadme: config.RootReadme,
35 syntaxHighlight: config.SyntaxHighlight,
36 }
37
38- if config.Scan.Path != "" {
39- err = repo.expandOnScanPath(config.Scan.Path, config.Scan.Public)
40- if err != nil {
41- return nil, err
42+ for _, scan := range config.Scans {
43+ if scan.Path != "" {
44+ err = repo.expandOnScanPath(scan.Path, scan.Public)
45+ if err != nil {
46+ return nil, err
47+ }
48 }
49 }
50
51@@ -179,7 +181,7 @@ }
52
53 config := defaultConfiguration()
54
55- err = setScan(block, config.Scan)
56+ err = setScan(block, &config.Scans)
57 if err != nil {
58 return nil, err
59 }
60@@ -269,18 +271,15 @@ }
61
62 func defaultConfiguration() *configuration {
63 return &configuration{
64- Scan: defaultScan(),
65+ Scans: defaultScans(),
66 RootReadme: "",
67 ListenAddr: defaultAddr(),
68 Repositories: make([]*GitRepositoryConfiguration, 0),
69 }
70 }
71
72-func defaultScan() *scan {
73- return &scan{
74- Public: false,
75- Path: "",
76- }
77+func defaultScans() []*scan {
78+ return []*scan{}
79 }
80
81 func defaultAddr() string {
82@@ -322,18 +321,27 @@ scanDir := block.Get("listen-addr")
83 return setString(scanDir, listenAddr)
84 }
85
86-func setScan(block scfg.Block, scan *scan) error {
87- scanDir := block.Get("scan")
88- if scanDir == nil {
89- return nil
90- }
91- err := setString(scanDir, &scan.Path)
92- if err != nil {
93- return err
94+func setScan(block scfg.Block, scans *[]*scan) error {
95+ for _, scanDir := range block.GetAll("scan") {
96+ s := &scan{}
97+ if scanDir == nil {
98+ return nil
99+ }
100+ err := setString(scanDir, &s.Path)
101+ if err != nil {
102+ return err
103+ }
104+
105+ public := scanDir.Children.Get("public")
106+ err = setBool(public, &s.Public)
107+ if err != nil {
108+ return err
109+ }
110+
111+ *scans = append(*scans, s)
112 }
113
114- public := scanDir.Children.Get("public")
115- return setBool(public, &scan.Public)
116+ return nil
117 }
118
119 func setBool(dir *scfg.Directive, field *bool) error {
120diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
121index 9080351a01193f3637fe3a501fb5c6b4b967a379..cc58ce966db251429c66f6fa18baaa4eda2b339f 100644
122--- a/pkg/config/config_test.go
123+++ b/pkg/config/config_test.go
124@@ -18,9 +18,11 @@ {
125 name: "minimal scan",
126 config: `scan "/srv/git"`,
127 expectedConfig: &configuration{
128- Scan: &scan{
129- Public: false,
130- Path: "/srv/git",
131+ Scans: []*scan{
132+ {
133+ Public: false,
134+ Path: "/srv/git",
135+ },
136 },
137 ListenAddr: defaultAddr(),
138 Repositories: []*GitRepositoryConfiguration{},
139@@ -33,9 +35,11 @@ scan "/srv/git" {
140 public true
141 }`,
142 expectedConfig: &configuration{
143- Scan: &scan{
144- Public: true,
145- Path: "/srv/git",
146+ Scans: []*scan{
147+ {
148+ Public: true,
149+ Path: "/srv/git",
150+ },
151 },
152 ListenAddr: defaultAddr(),
153 Repositories: []*GitRepositoryConfiguration{},
154@@ -45,7 +49,7 @@ {
155 name: "minimal repository",
156 config: `repository /srv/git/cerrado.git`,
157 expectedConfig: &configuration{
158- Scan: defaultScan(),
159+ Scans: defaultScans(),
160 ListenAddr: defaultAddr(),
161 Repositories: []*GitRepositoryConfiguration{
162 {
163@@ -68,7 +72,7 @@ public true
164 about readme.txt
165 }`,
166 expectedConfig: &configuration{
167- Scan: defaultScan(),
168+ Scans: defaultScans(),
169 ListenAddr: defaultAddr(),
170 Repositories: []*GitRepositoryConfiguration{
171 {
172@@ -85,7 +89,7 @@ {
173 name: "minimal listen",
174 config: ``,
175 expectedConfig: &configuration{
176- Scan: defaultScan(),
177+ Scans: defaultScans(),
178 ListenAddr: defaultAddr(),
179 Repositories: []*GitRepositoryConfiguration{},
180 },
181@@ -94,7 +98,7 @@ {
182 name: "complete listen",
183 config: `listen-addr unix://var/run/cerrado/cerrado.sock`,
184 expectedConfig: &configuration{
185- Scan: defaultScan(),
186+ Scans: defaultScans(),
187 ListenAddr: "unix://var/run/cerrado/cerrado.sock",
188 Repositories: []*GitRepositoryConfiguration{},
189 },
190@@ -120,9 +124,11 @@ public true
191 about readme.txt
192 }`,
193 expectedConfig: &configuration{
194- Scan: &scan{
195- Public: true,
196- Path: "/srv/git",
197+ Scans: []*scan{
198+ {
199+ Public: true,
200+ Path: "/srv/git",
201+ },
202 },
203 ListenAddr: "unix://var/run/cerrado/cerrado.sock",
204 Passphrase: "$2a$14$VnB/ZcB1DUDkMnosRA6Y7.dj8h5eroslDxTeXlLwfQX/x86mh6WAq",