]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
projects / thirdparty / bacula.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b43987a)
baculum: Adapt Apache configs to version 2.4
authorMarcin Haba <marcin.haba@bacula.pl>
Sat, 22 Dec 2018 18:23:08 +0000 (19:23 +0100)
committerMarcin Haba <marcin.haba@bacula.pl>
Sat, 22 Dec 2018 18:23:08 +0000 (19:23 +0100)
gui/baculum/examples/deb-template/baculum-api-apache.conf patch | blob | blame | history
gui/baculum/examples/deb-template/baculum-web-apache.conf patch | blob | blame | history
gui/baculum/examples/rpm-template/baculum-api-apache.conf patch | blob | blame | history
gui/baculum/examples/rpm-template/baculum-web-apache.conf patch | blob | blame | history

diff --git a/gui/baculum/examples/deb-template/baculum-api-apache.conf b/gui/baculum/examples/deb-template/baculum-api-apache.conf
index 23a820bdf724f7380853675196a64c91b6162cc6..73277c1aacc2b5c37f83df5aab32c0ce04a7da2d 100644 (file)
--- a/gui/baculum/examples/deb-template/baculum-api-apache.conf
+++ b/gui/baculum/examples/deb-template/baculum-api-apache.conf
@@ -19,26 +19,57 @@ Listen 9096
                RewriteCond %{REQUEST_FILENAME} !-f
                RewriteRule ^(.+)$ index.php/$1 [L]
                RedirectMatch ^/$ /api/?api
-               Require all granted
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Allow,Deny
+                       Allow from all
+               </IfModule>
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all granted
+               </IfModule>
        </Directory>
        #
-       # NOTE: When you use OAuth2 then change this location section
-       # From: <Location />
+       # NOTE: When you use OAuth2 then change this Directory section
+       # From: <Directory %DOCUMENTROOT>
+       #            ...section body...
+       #       </Directory>
        # To:   <Location /api/page>
+       #            ...section body...
+       #       </Location>
        #
-       <Location />
+       <Directory %DOCUMENTROOT>
+       #<Location /api/page>
                AuthType Basic
                AuthName "Baculum Auth"
                AuthUserFile %DOCUMENTROOT/protected/API/Config/baculum.users
                Require valid-user
-       </Location>
+       #</Location>
+       </Directory>
+
        <Directory %DOCUMENTROOT/protected>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
        <Directory %DOCUMENTROOT/framework>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
        <Directory %DOCUMENTROOT/framework/pradosoft/prado/framework/Web/Javascripts/source>
                <ifModule mod_gzip.c>
diff --git a/gui/baculum/examples/deb-template/baculum-web-apache.conf b/gui/baculum/examples/deb-template/baculum-web-apache.conf
index 06aff4d37c7ffde4249e86d491538054b3f83885..adc96285c06c91f111f2f76ab77cb56165956e9f 100644 (file)
--- a/gui/baculum/examples/deb-template/baculum-web-apache.conf
+++ b/gui/baculum/examples/deb-template/baculum-web-apache.conf
@@ -20,41 +20,87 @@ Listen 9095
                RewriteRule ^(.*)$ index.php/$1 [L]
                RedirectMatch ^/$ /web/
        </Directory>
-       <Location />
-               SetEnvIf Request_URI "^/web/redirect$" noauth=1
-
-               AuthType Basic
-               AuthName "Baculum Auth"
-               AuthUserFile %DOCUMENTROOT/protected/Web/Config/baculum.users
-
-               Order Deny,Allow
-               Satisfy Any
-               Deny from all
-               Require valid-user
-               Allow from env=noauth
-               Allow from env=REDIRECT_noauth
-       </Location>
+
+       # Apache 2.2
+       <IfModule !mod_authz_core.c>
+               <Directory %DOCUMENTROOT>
+                       SetEnvIf Request_URI "^/web/redirect$" noauth=1
+
+                       AuthType Basic
+                       AuthName "Baculum Auth"
+                       AuthUserFile %DOCUMENTROOT/protected/Web/Config/baculum.users
+
+                       Order Deny,Allow
+                       Satisfy Any
+                       Deny from all
+                       Require valid-user
+                       Allow from env=noauth
+                       Allow from env=REDIRECT_noauth
+               </Directory>
+       </IfModule>
+
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               <Directory %DOCUMENTROOT>
+                       SetEnvIf Request_URI "^/web/redirect$" noauth=1
+                       <RequireAny>
+                               <RequireAll>
+                                       <RequireAny>
+                                               Require env noauth
+                                               Require env REDIRECT_noauth
+                                       </RequireAny>
+                                       Require all granted
+                               </RequireAll>
+                               <RequireAll>
+                                       AuthType Basic
+                                       AuthName "Baculum Auth"
+                                       AuthUserFile %DOCUMENTROOT/protected/Web/Config/baculum.users
+                                       Require not env noauth
+                                       Require not env REDIRECT_noauth
+                                       Require valid-user
+                               </RequireAll>
+                       </RequireAny>
+               </Directory>
+       </IfModule>
+
        <Directory %DOCUMENTROOT/protected>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
+
        <Directory %DOCUMENTROOT/framework>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
        <Directory %DOCUMENTROOT/framework/pradosoft/prado/framework/Web/Javascripts/source>
-               <ifModule mod_gzip.c>
+               <IfModule mod_gzip.c>
                        mod_gzip_on Yes
                        mod_gzip_dechunk Yes
                        mod_gzip_item_include file \.js$
                        mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.*
-               </ifModule>
-               <ifModule mod_expires.c>
+               </IfModule>
+               <IfModule mod_expires.c>
                        ExpiresActive On
                        ExpiresDefault "access plus 864000 seconds"
-               </ifModule>
-               <ifModule mod_headers.c>
+               </IfModule>
+               <IfModule mod_headers.c>
                        Header set Cache-Control "max-age=864000, private"
-               </ifModule>
+               </IfModule>
        </Directory>
 </VirtualHost>
diff --git a/gui/baculum/examples/rpm-template/baculum-api-apache.conf b/gui/baculum/examples/rpm-template/baculum-api-apache.conf
index 23a820bdf724f7380853675196a64c91b6162cc6..73277c1aacc2b5c37f83df5aab32c0ce04a7da2d 100644 (file)
--- a/gui/baculum/examples/rpm-template/baculum-api-apache.conf
+++ b/gui/baculum/examples/rpm-template/baculum-api-apache.conf
@@ -19,26 +19,57 @@ Listen 9096
                RewriteCond %{REQUEST_FILENAME} !-f
                RewriteRule ^(.+)$ index.php/$1 [L]
                RedirectMatch ^/$ /api/?api
-               Require all granted
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Allow,Deny
+                       Allow from all
+               </IfModule>
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all granted
+               </IfModule>
        </Directory>
        #
-       # NOTE: When you use OAuth2 then change this location section
-       # From: <Location />
+       # NOTE: When you use OAuth2 then change this Directory section
+       # From: <Directory %DOCUMENTROOT>
+       #            ...section body...
+       #       </Directory>
        # To:   <Location /api/page>
+       #            ...section body...
+       #       </Location>
        #
-       <Location />
+       <Directory %DOCUMENTROOT>
+       #<Location /api/page>
                AuthType Basic
                AuthName "Baculum Auth"
                AuthUserFile %DOCUMENTROOT/protected/API/Config/baculum.users
                Require valid-user
-       </Location>
+       #</Location>
+       </Directory>
+
        <Directory %DOCUMENTROOT/protected>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
        <Directory %DOCUMENTROOT/framework>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
        <Directory %DOCUMENTROOT/framework/pradosoft/prado/framework/Web/Javascripts/source>
                <ifModule mod_gzip.c>
diff --git a/gui/baculum/examples/rpm-template/baculum-web-apache.conf b/gui/baculum/examples/rpm-template/baculum-web-apache.conf
index 06aff4d37c7ffde4249e86d491538054b3f83885..adc96285c06c91f111f2f76ab77cb56165956e9f 100644 (file)
--- a/gui/baculum/examples/rpm-template/baculum-web-apache.conf
+++ b/gui/baculum/examples/rpm-template/baculum-web-apache.conf
@@ -20,41 +20,87 @@ Listen 9095
                RewriteRule ^(.*)$ index.php/$1 [L]
                RedirectMatch ^/$ /web/
        </Directory>
-       <Location />
-               SetEnvIf Request_URI "^/web/redirect$" noauth=1
-
-               AuthType Basic
-               AuthName "Baculum Auth"
-               AuthUserFile %DOCUMENTROOT/protected/Web/Config/baculum.users
-
-               Order Deny,Allow
-               Satisfy Any
-               Deny from all
-               Require valid-user
-               Allow from env=noauth
-               Allow from env=REDIRECT_noauth
-       </Location>
+
+       # Apache 2.2
+       <IfModule !mod_authz_core.c>
+               <Directory %DOCUMENTROOT>
+                       SetEnvIf Request_URI "^/web/redirect$" noauth=1
+
+                       AuthType Basic
+                       AuthName "Baculum Auth"
+                       AuthUserFile %DOCUMENTROOT/protected/Web/Config/baculum.users
+
+                       Order Deny,Allow
+                       Satisfy Any
+                       Deny from all
+                       Require valid-user
+                       Allow from env=noauth
+                       Allow from env=REDIRECT_noauth
+               </Directory>
+       </IfModule>
+
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               <Directory %DOCUMENTROOT>
+                       SetEnvIf Request_URI "^/web/redirect$" noauth=1
+                       <RequireAny>
+                               <RequireAll>
+                                       <RequireAny>
+                                               Require env noauth
+                                               Require env REDIRECT_noauth
+                                       </RequireAny>
+                                       Require all granted
+                               </RequireAll>
+                               <RequireAll>
+                                       AuthType Basic
+                                       AuthName "Baculum Auth"
+                                       AuthUserFile %DOCUMENTROOT/protected/Web/Config/baculum.users
+                                       Require not env noauth
+                                       Require not env REDIRECT_noauth
+                                       Require valid-user
+                               </RequireAll>
+                       </RequireAny>
+               </Directory>
+       </IfModule>
+
        <Directory %DOCUMENTROOT/protected>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
+
        <Directory %DOCUMENTROOT/framework>
-               Order Deny,Allow
-               Deny from all
+               # Apache 2.2
+               <IfModule !mod_authz_core.c>
+                       Order Deny,Allow
+                       Deny from all
+               </IfModule>
+
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all denied
+               </IfModule>
        </Directory>
        <Directory %DOCUMENTROOT/framework/pradosoft/prado/framework/Web/Javascripts/source>
-               <ifModule mod_gzip.c>
+               <IfModule mod_gzip.c>
                        mod_gzip_on Yes
                        mod_gzip_dechunk Yes
                        mod_gzip_item_include file \.js$
                        mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.*
-               </ifModule>
-               <ifModule mod_expires.c>
+               </IfModule>
+               <IfModule mod_expires.c>
                        ExpiresActive On
                        ExpiresDefault "access plus 864000 seconds"
-               </ifModule>
-               <ifModule mod_headers.c>
+               </IfModule>
+               <IfModule mod_headers.c>
                        Header set Cache-Control "max-age=864000, private"
-               </ifModule>
+               </IfModule>
        </Directory>
 </VirtualHost>
Mirror of http://git.bacula.org/bacula.git