Skip to content

Commit

Permalink
Moved configuration to be a sample
Browse files Browse the repository at this point in the history
This way when you build locally to develop, you don't need to use the
build script which also does packaging. You can just call the following:

  $ cp conf/orchestrator.conf.json.sample conf/orchestrator.conf.json
  $ # modify your configuration here
  $ go build -o orchestrator go/cmd/orchestrator/main.go
  $ ./orchestrator ...

Otherwise you'd have to fight with the default configuration if you want
to get something working locally that's different from the default
configuration.

For my vagrant local development work I rely on this and then put
orchestrator.conf.json into /etc on the virtual machine so it will load
there first, which still retain the ability to customize further.
  • Loading branch information
shuhaowu committed Jul 13, 2015
1 parent 6946a96 commit 9b031fb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
conf/orchestrator.conf.json

1 change: 0 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ for f in $(find . -name "*.go"); do go fmt $f; done

rsync -av ./resources $release_files_dir/usr/local/orchestrator/
rsync -av ./conf $release_files_dir/usr/local/orchestrator/
for f in $release_files_dir/usr/local/orchestrator/conf/*; do mv $f $f.sample; done
cp etc/init.d/orchestrator.bash $release_files_dir/etc/init.d/orchestrator
chmod +x $release_files_dir/etc/init.d/orchestrator

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"RejectHostnameResolvePattern": "",
"UnseenInstanceForgetHours": 240,
"CandidateInstanceExpireMinutes": 60,
"SnapshotTopologiesIntervalHours": 0,
"SnapshotTopologiesIntervalHours": 24,
"ReasonableReplicationLagSeconds": 10,
"VerifyReplicationFilters": false,
"ReasonableMaintenanceReplicationLagSeconds": 20,
Expand Down

0 comments on commit 9b031fb

Please sign in to comment.