From 8a3cd5846325975bf2ff30d5ca9aa6c5690fce08 Mon Sep 17 00:00:00 2001
From: Kyle D <kdumontnu@gmail.com>
Date: Fri, 24 Jun 2022 15:04:30 -0400
Subject: [PATCH] Remove depricated queue indexer usage (#20124)

---
 integrations/mssql.ini.tmpl  | 6 ++++--
 integrations/mysql.ini.tmpl  | 6 ++++--
 integrations/mysql8.ini.tmpl | 6 ++++--
 integrations/pgsql.ini.tmpl  | 6 ++++--
 integrations/sqlite.ini.tmpl | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl
index da15e9ef69..a6c34dc4b1 100644
--- a/integrations/mssql.ini.tmpl
+++ b/integrations/mssql.ini.tmpl
@@ -10,11 +10,13 @@ PASSWD   = {{TEST_MSSQL_PASSWORD}}
 SSL_MODE = disable
 
 [indexer]
-ISSUE_INDEXER_PATH = integrations/gitea-integration-mssql/indexers/issues.bleve
-ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mssql/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
 REPO_INDEXER_PATH = integrations/gitea-integration-mssql/indexers/repos.bleve
 
+[queue.issue_indexer]
+ISSUE_INDEXER_PATH = integrations/gitea-integration-mssql/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mssql/indexers/issues.queue
+
 [queue]
 TYPE = immediate
 
diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl
index 4df4933642..2829af62fc 100644
--- a/integrations/mysql.ini.tmpl
+++ b/integrations/mysql.ini.tmpl
@@ -10,11 +10,13 @@ PASSWD   = {{TEST_MYSQL_PASSWORD}}
 SSL_MODE = disable
 
 [indexer]
+REPO_INDEXER_ENABLED = true
+REPO_INDEXER_PATH = integrations/gitea-integration-mysql/indexers/repos.bleve
+
+[queue.issue_indexer]
 ISSUE_INDEXER_TYPE = elasticsearch
 ISSUE_INDEXER_CONN_STR = http://elastic:changeme@elasticsearch:9200
 ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mysql/indexers/issues.queue
-REPO_INDEXER_ENABLED = true
-REPO_INDEXER_PATH = integrations/gitea-integration-mysql/indexers/repos.bleve
 
 [queue]
 TYPE = immediate
diff --git a/integrations/mysql8.ini.tmpl b/integrations/mysql8.ini.tmpl
index 4b63dd51a1..f1157b0887 100644
--- a/integrations/mysql8.ini.tmpl
+++ b/integrations/mysql8.ini.tmpl
@@ -10,11 +10,13 @@ PASSWD   = {{TEST_MYSQL8_PASSWORD}}
 SSL_MODE = disable
 
 [indexer]
-ISSUE_INDEXER_PATH = integrations/gitea-integration-mysql8/indexers/issues.bleve
-ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mysql8/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
 REPO_INDEXER_PATH = integrations/gitea-integration-mysql8/indexers/repos.bleve
 
+[queue.issue_indexer]
+ISSUE_INDEXER_PATH = integrations/gitea-integration-mysql8/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-mysql8/indexers/issues.queue
+
 [queue]
 TYPE = immediate
 
diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl
index 5b54a02c9f..4185467876 100644
--- a/integrations/pgsql.ini.tmpl
+++ b/integrations/pgsql.ini.tmpl
@@ -11,11 +11,13 @@ SCHEMA   = {{TEST_PGSQL_SCHEMA}}
 SSL_MODE = disable
 
 [indexer]
-ISSUE_INDEXER_PATH = integrations/gitea-integration-pgsql/indexers/issues.bleve
-ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-pgsql/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
 REPO_INDEXER_PATH = integrations/gitea-integration-pgsql/indexers/repos.bleve
 
+[queue.issue_indexer]
+ISSUE_INDEXER_PATH = integrations/gitea-integration-pgsql/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-pgsql/indexers/issues.queue
+
 [queue]
 TYPE = immediate
 
diff --git a/integrations/sqlite.ini.tmpl b/integrations/sqlite.ini.tmpl
index 2da7fd65d3..cb1593af6d 100644
--- a/integrations/sqlite.ini.tmpl
+++ b/integrations/sqlite.ini.tmpl
@@ -6,11 +6,13 @@ DB_TYPE = sqlite3
 PATH    = integrations/gitea-integration-sqlite/gitea.db
 
 [indexer]
-ISSUE_INDEXER_PATH   = integrations/gitea-integration-sqlite/indexers/issues.bleve
-ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-sqlite/indexers/issues.queue
 REPO_INDEXER_ENABLED = true
 REPO_INDEXER_PATH    = integrations/gitea-integration-sqlite/indexers/repos.bleve
 
+[queue.issue_indexer]
+ISSUE_INDEXER_PATH   = integrations/gitea-integration-sqlite/indexers/issues.bleve
+ISSUE_INDEXER_QUEUE_DIR = integrations/gitea-integration-sqlite/indexers/issues.queue
+
 [queue]
 TYPE = immediate