From 84e869333e0ab433d3fcfc91c2f0124991f1e586 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Fri, 13 May 2022 10:31:21 +0200
Subject: Revert "Rename 'qrs' to 'access'"

This reverts commit 22ed2d2102e356396444ed5461c8bbdc77e80c4e.
---
 config-model/src/test/schema-test-files/services.xml | 4 ++--
 dist/vespa.spec                                      | 1 -
 vespabase/src/rhel-prestart.sh                       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index bc2c0bcf065..9ccf50de906 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -121,9 +121,9 @@
     </http>
 
     <accesslog type='json'
-           fileNamePattern='logs/vespa/access/access-json.%Y%m%d%H%M%S' compressOnRotation='true'  compressionType='zstd' queueSize='13' bufferSize='65536'/>
+           fileNamePattern='logs/vespa/qrs/access-json.%Y%m%d%H%M%S' compressOnRotation='true'  compressionType='zstd' queueSize='13' bufferSize='65536'/>
     <accesslog type='vespa'
-           fileNamePattern='logs/vespa/access/access-vespa.%Y%m%d%H%M%S' />
+           fileNamePattern='logs/vespa/qrs/access-vespa.%Y%m%d%H%M%S' />
 
     <document-api>
       <binding>http://*/document-api/</binding>
diff --git a/dist/vespa.spec b/dist/vespa.spec
index a39467b778a..54fe37aad2d 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -780,7 +780,6 @@ fi
 %exclude %{_prefix}/libexec/vespa/vespa-curl-wrapper
 %dir %attr(1777,-,-) %{_prefix}/logs
 %dir %attr(1777,%{_vespa_user},-) %{_prefix}/logs/vespa
-%dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/access
 %dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/configserver
 %dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/node-admin
 %dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/search
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 3bb9ba5bae0..dbc77879efe 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -103,7 +103,7 @@ fixdir ${VESPA_USER} ${VESPA_GROUP}   755  libexec/vespa/plugins/qrs
 fixdir ${VESPA_USER} ${VESPA_GROUP}   755  logs
 fixdir ${VESPA_USER} ${VESPA_GROUP}   755  logs/vespa
 fixdir ${VESPA_USER} ${VESPA_GROUP}   755  logs/vespa/configserver
-fixdir ${VESPA_USER} ${VESPA_GROUP}   755  logs/vespa/access
+fixdir ${VESPA_USER} ${VESPA_GROUP}   755  logs/vespa/qrs
 fixdir ${VESPA_USER} ${VESPA_GROUP}   755  logs/vespa/search
 fixdir ${VESPA_USER} ${VESPA_GROUP}   755  tmp
 fixdir ${VESPA_USER} ${VESPA_GROUP}   755  tmp/vespa
-- 
cgit v1.2.3