From ed2ae27700b44b5230ad83196b0fd564bd06ebeb Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 7 Dec 2021 15:03:57 +0100
Subject: [PATCH] copr-be: don't add access_log.conf

The only configuration option there is to "load" the module, and that
can be easily done directly in lighttpd.conf.
---
 .../backend/files/lighttpd/access_log.conf    | 28 -------------------
 roles/copr/backend/tasks/main.yml             |  7 -----
 .../backend/templates/lighttpd/lighttpd.conf  |  6 +---
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 roles/copr/backend/files/lighttpd/access_log.conf

diff --git a/roles/copr/backend/files/lighttpd/access_log.conf b/roles/copr/backend/files/lighttpd/access_log.conf
deleted file mode 100644
index 2c86f18f9d..0000000000
--- a/roles/copr/backend/files/lighttpd/access_log.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-#######################################################################
-##
-## Corresponding documentation:
-##
-## https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModAccesslog
-##
-server.modules += ( "mod_accesslog" )
-
-##
-## Default access log.
-##
-#accesslog.filename          = log_root + "/access.log"
-#accesslog.filename = "|/usr/sbin/cronolog /var/log/lighttpd/access.log"
-
-##
-## The default format produces CLF compatible output.
-## For available parameters see access.txt 
-##
-#accesslog.format = "%h %l %u %t \"%r\" %b %>s \"%{User-Agent}i\" \"%{Referer}i\""
-
-##
-## If you want to log to syslog you have to unset the 
-## accesslog.use-syslog setting and uncomment the next line.
-##
-#accesslog.use-syslog       = "enable"
-
-#
-#######################################################################
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index d08ac1fc18..27f96c8314 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -96,13 +96,6 @@
   copy: src="boto" dest=/home/copr/.boto owner=copr group=copr
 
 # setup webserver
-- name: add access_log.conf for lighttpd
-  copy: src="lighttpd/access_log.conf" dest=/etc/lighttpd/conf.d/access_log.conf owner=root group=root mode=0644
-  notify:
-  - restart lighttpd
-  tags:
-  - config
-
 - name: add config for copr-repo path
   template: src="lighttpd/lighttpd.conf" dest=/etc/lighttpd/lighttpd.conf owner=root group=root mode=0644
   notify:
diff --git a/roles/copr/backend/templates/lighttpd/lighttpd.conf b/roles/copr/backend/templates/lighttpd/lighttpd.conf
index 89210fe51a..f325daacd7 100644
--- a/roles/copr/backend/templates/lighttpd/lighttpd.conf
+++ b/roles/copr/backend/templates/lighttpd/lighttpd.conf
@@ -78,6 +78,7 @@ var.socket_dir  = home_dir + "/sockets"
 #include "modules.conf"
 server.modules = (
   "mod_access",
+  "mod_accesslog",
   "mod_magnet",
   "mod_setenv",
   "mod_redirect",
@@ -156,11 +157,6 @@ server.errorlog             = log_root + "/error.log"
 ##
 #server.errorlog-use-syslog = "enable"
 
-##
-## Access log config
-##
-include "conf.d/access_log.conf"
-
 ##
 ## The debug options are moved into their own file.
 ## see conf.d/debug.conf for various options for request debugging.