diff options
| author | khvalera | 2023-03-04 01:35:38 +0200 |
|---|---|---|
| committer | khvalera | 2023-03-04 01:35:38 +0200 |
| commit | 19206753922a9cdbc7af15f328cd4b6580079999 (patch) | |
| tree | e2da45c657424978a54f947a743a7647abc3cd83 /0005-httpd.patch | |
| parent | 0fc12db76364adbe4765135289876a57ab53a817 (diff) | |
| download | aur-19206753922a9cdbc7af15f328cd4b6580079999.tar.gz | |
22.0.2_2
Diffstat (limited to '0005-httpd.patch')
| -rw-r--r-- | 0005-httpd.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/0005-httpd.patch b/0005-httpd.patch index c8d8e8a56876..247ba934e6ba 100644 --- a/0005-httpd.patch +++ b/0005-httpd.patch @@ -1,11 +1,13 @@ ---- webui/CMakeLists.txt 2022-05-10 23:29:44.000000000 +0300 -+++ webui/CMakeLists.txt 2022-05-11 00:05:05.698335917 +0300 -@@ -76,7 +76,7 @@ - elseif(EXISTS ${sysconfdir}/apache2/conf-available) - set(HTTPD_CONF ${sysconfdir}/apache2/conf-available) - else() -- set(HTTPD_CONF ${sysconfdir}/httpd/conf.d) -+ set(HTTPD_CONF ${sysconfdir}/httpd/conf/extra ) - endif() +--- webui/CMakeLists.txt.orig 2023-03-03 21:55:18.000000000 +0200 ++++ webui/CMakeLists.txt 2023-03-03 22:01:47.835425931 +0200 +@@ -66,7 +66,9 @@ + message(" BAREOS_FULL_VERSION: ${BAREOS_FULL_VERSION} ") + message(" LocalBuildDefinitionsFile: ${BareosLocalBuildDefinitionsFile}") - configure_file( +-if(EXISTS ${sysconfdir}/httpd/conf.d) ++if(EXISTS ${sysconfdir}/httpd/conf/extra ) ++ set(HTTPD_CONF ${sysconfdir}/httpd/conf/extra ) ++elseif(EXISTS ${sysconfdir}/httpd/conf.d) + set(HTTPD_CONF ${sysconfdir}/httpd/conf.d) + elseif(EXISTS ${sysconfdir}/apache2/conf.d) + set(HTTPD_CONF ${sysconfdir}/apache2/conf.d) |