File tree Expand file tree Collapse file tree 7 files changed +22
-16
lines changed
Expand file tree Collapse file tree 7 files changed +22
-16
lines changed Original file line number Diff line number Diff line change 8484 default = "" ;
8585 description = "Logging listener address" ;
8686 } ;
87+
88+ port = mkOption {
89+ type = types . port ;
90+ default = 9999 ;
91+ description = "Logging listener port" ;
92+ } ;
8793 } ;
8894
8995 server = {
Original file line number Diff line number Diff line change 297297 } ;
298298in
299299{
300+ _file = ./fss.nix ;
301+
300302 options . ghaf . logging . fss = {
301303 enable = mkOption {
302304 type = types . bool ;
Original file line number Diff line number Diff line change 107107
108108 # Logging - from globalConfig
109109 logging = {
110- inherit ( globalConfig . logging ) enable ;
111- listener . address = globalConfig . logging . listener . address or "" ;
110+ inherit ( globalConfig . logging ) enable listener ;
112111 server = {
113112 inherit ( globalConfig . logging ) enable ;
114113 endpoint = globalConfig . logging . server . endpoint or "" ;
Original file line number Diff line number Diff line change 173173 role = "client" ;
174174 } ;
175175
176- # Logging
177- logging . client . enable = globalConfig . logging . enable or false ;
176+ # Logging - from globalConfig
177+ logging = {
178+ inherit ( globalConfig . logging ) enable listener ;
179+ client . enable = globalConfig . logging . enable or false ;
180+ } ;
178181
179182 # Security
180183 security . fail2ban . enable = globalConfig . development . ssh . daemon . enable or false ;
Original file line number Diff line number Diff line change 116116 } ;
117117
118118 # Logging - from globalConfig
119- logging . client . enable = globalConfig . logging . enable or false ;
119+ logging = {
120+ inherit ( globalConfig . logging ) enable listener ;
121+ client . enable = globalConfig . logging . enable or false ;
122+ server . endpoint = globalConfig . logging . server . endpoint or "" ;
123+ } ;
120124
121125 security . fail2ban . enable = globalConfig . development . ssh . daemon . enable or false ;
122126
133137 managed = hostConfig . users . managed or { } ;
134138 } ;
135139
136- # Logging config - from globalConfig (previously from serviceModules.logging)
137- logging = {
138- enable = globalConfig . logging . enable or false ;
139- listener . address = globalConfig . logging . listener . address or "" ;
140- server . endpoint = globalConfig . logging . server . endpoint or "" ;
141- } ;
142-
143140 # GIVC configuration - from globalConfig (previously from serviceModules.givc)
144141 givc = {
145142 enable = globalConfig . givc . enable or false ;
Original file line number Diff line number Diff line change 179179
180180 # Logging - from globalConfig
181181 logging = {
182- inherit ( globalConfig . logging ) enable ;
183- listener . address = globalConfig . logging . listener . address or "" ;
184- server . endpoint = globalConfig . logging . server . endpoint or "" ;
182+ inherit ( globalConfig . logging ) enable listener ;
185183 client . enable = globalConfig . logging . enable or false ;
184+ server . endpoint = globalConfig . logging . server . endpoint or "" ;
186185 } ;
187186
188187 # Services
Original file line number Diff line number Diff line change 125125
126126 # Logging - from globalConfig (includes listener address)
127127 logging = {
128+ inherit ( globalConfig . logging ) enable listener ;
128129 client . enable = globalConfig . logging . enable or false ;
129- listener . address = globalConfig . logging . listener . address or "" ;
130130 server . endpoint = globalConfig . logging . server . endpoint or "" ;
131131 } ;
132132
You can’t perform that action at this time.
0 commit comments