Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
06440ef5
Commit
06440ef5
authored
Jan 16, 2017
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tech(dataproxy): moves cfg to [dataproxy]
parent
d4a96b97
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
conf/defaults.ini
+6
-3
conf/sample.ini
+7
-0
pkg/setting/setting.go
+5
-1
No files found.
conf/defaults.ini
View file @
06440ef5
...
...
@@ -47,9 +47,6 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/
# Log web requests
router_logging
=
false
# This enables data proxy logging, default is false
data_proxy_logging
=
false
# the path relative working path
static_root_path
=
public
...
...
@@ -116,6 +113,12 @@ cookie_secure = false
session_life_time
=
86400
gc_interval_time
=
86400
#################################### Data proxy ###########################
[dataproxy]
# This enables data proxy logging, default is false
logging
=
false
#################################### Analytics ###########################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
...
...
conf/sample.ini
View file @
06440ef5
...
...
@@ -107,6 +107,13 @@
# Session life time, default is 86400
;session_life_time = 86400
#################################### Data proxy ###########################
[dataproxy]
# This enables data proxy logging, default is false
;logging = false
#################################### Analytics ####################################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
...
...
pkg/setting/setting.go
View file @
06440ef5
...
...
@@ -492,7 +492,7 @@ func NewConfigContext(args *CommandLineArgs) error {
HttpAddr
=
server
.
Key
(
"http_addr"
)
.
MustString
(
DEFAULT_HTTP_ADDR
)
HttpPort
=
server
.
Key
(
"http_port"
)
.
MustString
(
"3000"
)
RouterLogging
=
server
.
Key
(
"router_logging"
)
.
MustBool
(
false
)
DataProxyLogging
=
server
.
Key
(
"data_proxy_logging"
)
.
MustBool
(
false
)
EnableGzip
=
server
.
Key
(
"enable_gzip"
)
.
MustBool
(
false
)
EnforceDomain
=
server
.
Key
(
"enforce_domain"
)
.
MustBool
(
false
)
StaticRootPath
=
makeAbsolute
(
server
.
Key
(
"static_root_path"
)
.
String
(),
HomePath
)
...
...
@@ -501,6 +501,10 @@ func NewConfigContext(args *CommandLineArgs) error {
return
err
}
// read data proxy settings
dataproxy
:=
Cfg
.
Section
(
"dataproxy"
)
DataProxyLogging
=
dataproxy
.
Key
(
"logging"
)
.
MustBool
(
false
)
// read security settings
security
:=
Cfg
.
Section
(
"security"
)
SecretKey
=
security
.
Key
(
"secret_key"
)
.
String
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment