Skip to content

Commit cd4f849

Browse files
committed
REORG/MINOR: config: avoiding double spaces in HCL example
1 parent fca8c79 commit cd4f849

File tree

2 files changed

+86
-86
lines changed

2 files changed

+86
-86
lines changed
Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,121 @@
11
config_version = 2
2-
name = "famous_condor"
3-
mode = "single"
4-
status = "null"
2+
name = "famous_condor"
3+
mode = "single"
4+
status = "null"
55

66
dataplaneapi {
7-
scheme = ["http"]
8-
cleanup-timeout = "10s"
9-
graceful-timeout = "15s"
10-
max-header-size = "1MiB"
11-
socket-path = "/var/run/data-plane.sock"
12-
host = "localhost"
13-
port = 80
14-
listen-limit = 1024
15-
keep-alive = "3m"
16-
read-timeout = "30s"
17-
write-timeout = "60s"
18-
show-system-info = false
19-
disable-inotify = false
20-
pid-file = "/tmp/dataplane.pid"
21-
uid = 1000
22-
gid = 1000
7+
scheme = ["http"]
8+
cleanup-timeout = "10s"
9+
graceful-timeout = "15s"
10+
max-header-size = "1MiB"
11+
socket-path = "/var/run/data-plane.sock"
12+
host = "localhost"
13+
port = 80
14+
listen-limit = 1024
15+
keep-alive = "3m"
16+
read-timeout = "30s"
17+
write-timeout = "60s"
18+
show-system-info = false
19+
disable-inotify = false
20+
pid-file = "/tmp/dataplane.pid"
21+
uid = 1000
22+
gid = 1000
2323

2424
tls {
25-
tls-host = "null"
26-
tls-port = 6443
27-
tls-certificate = "null"
28-
tls-key = "null"
29-
tls-ca = "null"
30-
tls-listen-limit = 10
31-
tls-keep-alive = "1m"
32-
tls-read-timeout = "10s"
33-
tls-write-timeout = "10s"
25+
tls-host = "null"
26+
tls-port = 6443
27+
tls-certificate = "null"
28+
tls-key = "null"
29+
tls-ca = "null"
30+
tls-listen-limit = 10
31+
tls-keep-alive = "1m"
32+
tls-read-timeout = "10s"
33+
tls-write-timeout = "10s"
3434
}
3535

3636
user "admin" {
37-
insecure = true
38-
password = "adminpwd"
37+
insecure = true
38+
password = "adminpwd"
3939
}
4040

4141
userlist {
42-
userlist = "controller"
43-
userlist-file = "null"
42+
userlist = "controller"
43+
userlist-file = "null"
4444
}
4545

4646
transaction {
47-
transaction-dir = "/tmp/haproxy"
48-
backups-number = 0
49-
backups-dir = "/tmp/backups"
50-
max-open-transactions = 20
47+
transaction-dir = "/tmp/haproxy"
48+
backups-number = 0
49+
backups-dir = "/tmp/backups"
50+
max-open-transactions = 20
5151
}
5252

5353
resources {
54-
maps-dir = "/etc/haproxy/maps"
55-
ssl-certs-dir = "/etc/haproxy/ssl"
56-
update-map-files = false
57-
update-map-files-period = 10
58-
spoe-dir = "/etc/haproxy/spoe"
59-
spoe-transaction-dir = "/tmp/spoe-haproxy"
54+
maps-dir = "/etc/haproxy/maps"
55+
ssl-certs-dir = "/etc/haproxy/ssl"
56+
update-map-files = false
57+
update-map-files-period = 10
58+
spoe-dir = "/etc/haproxy/spoe"
59+
spoe-transaction-dir = "/tmp/spoe-haproxy"
6060
}
6161

6262
advertised {
63-
api-address = "10.2.3.4"
64-
api-port = 80
63+
api-address = "10.2.3.4"
64+
api-port = 80
6565
}
6666
}
6767

6868
haproxy {
69-
config-file = "/etc/haproxy/haproxy.cfg"
70-
haproxy-bin = "haproxy"
71-
master-runtime = "null"
72-
fid = "null"
73-
master-worker-mode = false
69+
config-file = "/etc/haproxy/haproxy.cfg"
70+
haproxy-bin = "haproxy"
71+
master-runtime = "null"
72+
fid = "null"
73+
master-worker-mode = false
7474

7575
reload {
76-
reload-delay = 5
77-
reload-cmd = "null"
78-
restart-cmd = "null"
79-
reload-retention = 1
80-
validate-cmd = "null"
76+
reload-delay = 5
77+
reload-cmd = "null"
78+
restart-cmd = "null"
79+
reload-retention = 1
80+
validate-cmd = "null"
8181
}
8282
}
8383

8484
cluster {
85-
cluster-tls-dir = "null"
86-
id = "null"
87-
bootstrap_key = "null"
88-
active_bootstrap_key = "null"
89-
token = "null"
90-
url = "null"
91-
port = 80
92-
api_base_path = "null"
93-
api_nodes_path = "null"
94-
api_register_path = "null"
95-
storage-dir = "null"
96-
cert-path = "null"
97-
cert-fetched = false
98-
name = "null"
99-
description = "null"
85+
cluster-tls-dir = "null"
86+
id = "null"
87+
bootstrap_key = "null"
88+
active_bootstrap_key = "null"
89+
token = "null"
90+
url = "null"
91+
port = 80
92+
api_base_path = "null"
93+
api_nodes_path = "null"
94+
api_register_path = "null"
95+
storage-dir = "null"
96+
cert-path = "null"
97+
cert-fetched = false
98+
name = "null"
99+
description = "null"
100100
}
101101

102102
service_discovery {
103-
consuls = []
104-
aws-regions = []
103+
consuls = []
104+
aws-regions = []
105105
}
106106

107107
log {
108-
log-to = "stdout"
109-
log-file = "/var/log/dataplaneapi/dataplaneapi.log"
110-
log-level = "warning"
111-
log-format = "text"
112-
apache-common-log-format = "%h"
108+
log-to = "stdout"
109+
log-file = "/var/log/dataplaneapi/dataplaneapi.log"
110+
log-level = "warning"
111+
log-format = "text"
112+
apache-common-log-format = "%h"
113113

114114
syslog {
115-
syslog-address = "null"
116-
syslog-protocol = "tcp"
117-
syslog-tag = "dataplaneapi"
118-
syslog-level = "debug"
119-
syslog-facility = "local0"
115+
syslog-address = "null"
116+
syslog-protocol = "tcp"
117+
syslog-tag = "dataplaneapi"
118+
syslog-level = "debug"
119+
syslog-facility = "local0"
120120
}
121121
}

generate/configuration-example-hcl.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ config_version = 2
1111
{{- range .Attributes}}
1212
{{- if not .Deprecated}}
1313
{{- if eq .Type "[]string" }}
14-
{{ . | IsListItem }}{{ .FileName }} = [{{ . | QuotedExample }}]
14+
{{ . | IsListItem }}{{ .FileName }} = [{{ . | QuotedExample }}]
1515
{{- else }}
16-
{{ . | IsListItem }}{{ .FileName }} = {{ . | QuotedExample }}
16+
{{ . | IsListItem }}{{ .FileName }} = {{ . | QuotedExample }}
1717
{{- end}}
1818
{{- end}}
1919
{{- end}}
@@ -29,10 +29,10 @@ config_version = 2
2929
{{- range $index,$a := .Attributes -}}
3030
{{- if not .Deprecated -}}
3131
{{- if $SubGroup.HasACLKey }}{{- if eq $index 0 }} {{ . | QuotedExample }} { {{- else }}
32-
{{ .FileName }} = {{ . | QuotedExample }}
32+
{{ .FileName }} = {{ . | QuotedExample }}
3333
{{- end -}}{{- end -}}
3434
{{- if not $SubGroup.HasACLKey }}
35-
{{ .FileName }} = {{ . | QuotedExample }}
35+
{{ .FileName }} = {{ . | QuotedExample }}
3636
{{- end -}}
3737
{{- $indexinsideLoopFirst := 1 }}
3838
{{- end}}
@@ -46,7 +46,7 @@ config_version = 2
4646
{{- else}}
4747
{{- range .Attributes}}
4848
{{- if not .Deprecated}}
49-
{{ .SpecName }} = {{ . | QuotedExample }}
49+
{{ .SpecName }} = {{ . | QuotedExample }}
5050
{{- end}}
5151
{{- end}}
5252
{{- end}}

0 commit comments

Comments
 (0)