Skip to content

Commit 0fda332

Browse files
committed
Clean up of .conf files
Consistent formatting recceiver_full - classic example of full configuration
1 parent 413445a commit 0fda332

File tree

2 files changed

+76
-47
lines changed

2 files changed

+76
-47
lines changed

server/demo.conf

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@
2626
#
2727
# Default plugins
2828
# show - Prints information to daemon log
29-
# db - Stores in sqlite3 database
3029
#
3130
# eg. print and store in database. Database config from section "[lite]"
3231
# Show config from "[show]" although show has no options at present.
3332
##procs = show, db:lite
3433

35-
procs = show
34+
procs = show, db:lite
3635

3736
# Time interval for sending recceiver advertisments
3837
#announceInterval = 15.0
@@ -69,32 +68,38 @@ idkey = 42
6968
[cf]
7069
# cf-store application
7170
# a space-separated list of infotags to set as CF Properties
72-
# infotags = archive foo bar blah
71+
#infotags = archive foo bar blah
72+
7373
# Uncomment line below to turn off the feature to add CA/PVA port info for name server to channelfinder
74-
# iocConnectionInfo = off
74+
#iocConnectionInfo = off
75+
7576
# Uncomment line below to turn on the feature to add alias records to channelfinder
76-
# alias = on
77+
#alias = on
78+
7779
# Uncomment line below to turn on the feature to add EPICS record type to channelfinder
78-
# recordType = on
80+
#recordType = on
81+
7982
# Uncomment line below to turn on the feature to add description field to channelfinder
80-
# recordDesc = on
83+
#recordDesc = on
84+
8185
# The size limit for finding channels (ie the value of the '~size' query parameter)
8286
# If not specified then the fallback is the server default
83-
# findSizeLimit = 10000
87+
#findSizeLimit = 10000
88+
8489
# Mark all channels as 'Inactive' when processor is stopped (default: True)
85-
# cleanOnStop = True
90+
#cleanOnStop = True
91+
8692
# Mark all channels as 'Inactive' when processor is started (default: True)
87-
# cleanOnStart = True
93+
#cleanOnStart = True
94+
8895
# Specify an optional id for the recceiver to be used with cleanOnStart and cleanOnStop
8996
# default value is the hostname of the machine the python interpreter is started on
90-
# recceiverID = recc1
91-
# Debug output file location.
92-
# Produces no file when not defined.
93-
# debug_file_loc = /home/devuser/recsyncdata.txt
94-
#
97+
#recceiverID = recc1
98+
9599
# Comma-separated list of VARIABLE:PropertyName,
96100
# specifying which environment VARIABLEs to pass on to the channel finder
97101
# and defining the corresponding PropertyName
98102
#environment_vars=ENGINEER:Engineer,EPICS_BASE:EpicsVersion,PWD:WorkingDirectory
103+
99104
#Specify the timezone in the time output
100-
timezone = True
105+
#timezone = True

server/cf.conf renamed to server/recceiver_full.conf

Lines changed: 55 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,66 +3,90 @@
33

44
[recceiver]
55

6+
# Logging detail level. Use python logging level name.
7+
loglevel = INFO
8+
69
# list of broadcast addresses.
7-
# default
8-
#addrlist = 255.255.255.255:5049
9-
# for local testing w/ firewall
10-
#addrlist = 127.255.255.255:5049
10+
addrlist = 255.255.255.255:5049
1111

1212
# Listen for TCP connections on this interface and port.
1313
# Port also used as source for UDP broadcasts.
1414
# Default uses wildcard address and a random port.
15-
#bind = 0.0.0.0:0
15+
bind = 0.0.0.0:0
1616

1717
# Processing chain
18-
procs = cf
18+
# sequence of plugin names seperated by ','
19+
#
20+
# Plugin names may be followed by an instance name (eg. "db:arbitrary")
21+
# which allows for more than one instance of a plugin with different
22+
# configuration
23+
#
24+
# Default plugins
25+
# show - Prints information to daemon log
26+
#
27+
# eg. print and store in database. Database config from section "[lite]"
28+
# Show config from "[show]" although show has no options at present.
29+
procs = cf, show
1930

2031
# Time interval for sending recceiver advertisments
21-
#announceInterval = 15.0
32+
announceInterval = 15.0
2233

2334
# Idle Timeout for TCP connections.
24-
#tcptimeout = 15.0
35+
tcptimeout = 15.0
2536

2637
# Time to wait before commiting updates
2738
# Doesn't effect IOC clients
28-
#commitInterval = 5.0
39+
commitInterval = 5.0
2940

3041
# Maximum concurrent "active" clients
3142
# to allow.
32-
#maxActive = 20
43+
maxActive = 20
3344

34-
# The channelFinder client is configuration information is
35-
# stored in /etc/channelfinderapi.conf as described in the client
3645

3746
[cf]
3847
# cf-store application
39-
# a space-separated list of infotags to set as CF Properties
40-
# infotags = archive foo bar blah
41-
# Uncomment line below to turn off the feature to add CA/PVA port info for name server to channelfinder
42-
# iocConnectionInfo = off
43-
# Uncomment line below to turn on the feature to add alias records to channelfinder
44-
# alias = on
45-
# Uncomment line below to turn on the feature to add EPICS record type to channelfinder
46-
# recordType = on
47-
# Uncomment line below to turn on the feature to add description field to channelfinder
48-
# recordDesc = on
48+
49+
# A space-separated list of infotags to set as CF Properties
50+
infotags = archive
51+
52+
# Feature to add CA/PVA port info for name server to channelfinder
53+
iocConnectionInfo = on
54+
55+
# Add alias records to channelfinder
56+
alias = on
57+
58+
# Add EPICS record type to channelfinder
59+
recordType = on
60+
61+
# Add description field to channelfinder
62+
recordDesc = on
63+
4964
# The size limit for finding channels (ie the value of the '~size' query parameter)
5065
# If not specified then the fallback is the server default
51-
# findSizeLimit = 10000
66+
#findSizeLimit = 10000
67+
5268
# Mark all channels as 'Inactive' when processor is stopped (default: True)
53-
# cleanOnStop = True
69+
cleanOnStop = True
70+
5471
# Mark all channels as 'Inactive' when processor is started (default: True)
55-
# cleanOnStart = True
72+
cleanOnStart = True
73+
5674
# Specify an optional id for the recceiver to be used with cleanOnStart and cleanOnStop
5775
# default value is the hostname of the machine the python interpreter is started on
58-
# recceiverID = recc1
59-
# Debug output file location.
60-
# Produces no file when not defined.
61-
# debug_file_loc = /home/devuser/recsyncdata.txt
62-
#
76+
#recceiverID = recc1
77+
6378
# Comma-separated list of VARIABLE:PropertyName,
6479
# specifying which environment VARIABLEs to pass on to the channel finder
6580
# and defining the corresponding PropertyName
66-
#environment_vars=ENGINEER:Engineer,EPICS_BASE:EpicsVersion,PWD:WorkingDirectory
81+
environment_vars=ENGINEER:Engineer,EPICS_BASE:EpicsVersion,PWD:WorkingDirectory
82+
6783
#Specify the timezone in the time output
6884
timezone = True
85+
86+
# The channelFinder client is configuration information is
87+
# stored in /etc/channelfinderapi.conf as described in the client
88+
# Can be configured to be this file, like so:
89+
[DEFAULT]
90+
BaseURL=http://channelfinder.site:8080/ChannelFinder
91+
username=MyUserName
92+
password=MyPassword

0 commit comments

Comments
 (0)