nixos/httpd: rename apache log files to have a .log file extension (#54529)
nixos/httpd: rename apache log files to have a .log file extension
This commit is contained in:
parent
6b27008fb5
commit
c6cd07707b
|
@ -430,6 +430,12 @@
|
||||||
of maintainers.
|
of maintainers.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The httpd service now saves log files with a .log file extension by default for
|
||||||
|
easier integration with the logrotate service.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The owncloud server packages and httpd subservice module were removed
|
The owncloud server packages and httpd subservice module were removed
|
||||||
|
|
|
@ -151,7 +151,7 @@ let
|
||||||
|
|
||||||
|
|
||||||
loggingConf = (if mainCfg.logFormat != "none" then ''
|
loggingConf = (if mainCfg.logFormat != "none" then ''
|
||||||
ErrorLog ${mainCfg.logDir}/error_log
|
ErrorLog ${mainCfg.logDir}/error.log
|
||||||
|
|
||||||
LogLevel notice
|
LogLevel notice
|
||||||
|
|
||||||
|
@ -160,7 +160,7 @@ let
|
||||||
LogFormat "%{Referer}i -> %U" referer
|
LogFormat "%{Referer}i -> %U" referer
|
||||||
LogFormat "%{User-agent}i" agent
|
LogFormat "%{User-agent}i" agent
|
||||||
|
|
||||||
CustomLog ${mainCfg.logDir}/access_log ${mainCfg.logFormat}
|
CustomLog ${mainCfg.logDir}/access.log ${mainCfg.logFormat}
|
||||||
'' else ''
|
'' else ''
|
||||||
ErrorLog /dev/null
|
ErrorLog /dev/null
|
||||||
'');
|
'');
|
||||||
|
@ -261,8 +261,8 @@ let
|
||||||
'' else ""}
|
'' else ""}
|
||||||
|
|
||||||
${if !isMainServer && mainCfg.logPerVirtualHost then ''
|
${if !isMainServer && mainCfg.logPerVirtualHost then ''
|
||||||
ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
|
ErrorLog ${mainCfg.logDir}/error-${cfg.hostName}.log
|
||||||
CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${cfg.logFormat}
|
CustomLog ${mainCfg.logDir}/access-${cfg.hostName}.log ${cfg.logFormat}
|
||||||
'' else ""}
|
'' else ""}
|
||||||
|
|
||||||
${optionalString (robotsTxt != "") ''
|
${optionalString (robotsTxt != "") ''
|
||||||
|
|
Loading…
Reference in a new issue