Browse Source
Merge pull request #206 from saltstack-formulas/fix-customlog-defaults
Fix CustomLog default values in templatestags/v0.37.4
Niels Abspoel
7 years ago
4 changed files with 8 additions and 4 deletions
+ 2
- 1
apache/vhosts/minimal.tmpl
View File
| 'LogLevel': site.get('LogLevel', 'warn'), | 'LogLevel': site.get('LogLevel', 'warn'), | ||||
| 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | ||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), | |||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log {1}'.format(map.logdir, sitename)), | |||||
| 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %b"'), | 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %b"'), | ||||
| 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %b" {0}'.format(sitename)), | |||||
| 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)) | 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)) |
+ 2
- 1
apache/vhosts/proxy.tmpl
View File
| 'LogLevel': site.get('LogLevel', 'warn'), | 'LogLevel': site.get('LogLevel', 'warn'), | ||||
| 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | ||||
| 'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\""'), | 'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\""'), | ||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), | |||||
| 'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\"" {0}'.format(sitename)), | |||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log {1}'.format(map.logdir, sitename)), | |||||
| 'ProxyRequests': site.get('ProxyRequests', 'Off'), | 'ProxyRequests': site.get('ProxyRequests', 'Off'), | ||||
| 'ProxyPreserveHost': site.get('ProxyPreserveHost', 'On'), | 'ProxyPreserveHost': site.get('ProxyPreserveHost', 'On'), |
+ 2
- 1
apache/vhosts/redirect.tmpl
View File
| 'LogLevel': site.get('LogLevel', 'warn'), | 'LogLevel': site.get('LogLevel', 'warn'), | ||||
| 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | ||||
| 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %O"'), | 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %O"'), | ||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), | |||||
| 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %O" {0}'.format(sitename)), | |||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log {1}'.format(map.logdir, sitename)), | |||||
| 'RedirectSource': site.get('RedirectSource', '/'), | 'RedirectSource': site.get('RedirectSource', '/'), | ||||
| 'RedirectTarget': site.get('RedirectTarget', 'https://{0}/'.format(sitename)), | 'RedirectTarget': site.get('RedirectTarget', 'https://{0}/'.format(sitename)), |
+ 2
- 1
apache/vhosts/standard.tmpl
View File
| 'LogLevel': site.get('LogLevel', 'warn'), | 'LogLevel': site.get('LogLevel', 'warn'), | ||||
| 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), | ||||
| 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s"'), | 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s"'), | ||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), | |||||
| 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s" {0}'.format(sitename)), | |||||
| 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log {1}'.format(map.logdir, sitename)), | |||||
| 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)), | 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)), | ||||
| 'VirtualDocumentRoot': site.get('VirtualDocumentRoot'), | 'VirtualDocumentRoot': site.get('VirtualDocumentRoot'), |
Loading…