mirror of
https://github.com/xcat2/confluent.git
synced 2024-12-23 19:52:10 +00:00
Have osdeploy require apache/ssl and provide config
Have osdeploy pull in requirements itself
This commit is contained in:
parent
f8affe99db
commit
ea6155b2a1
16
confluent_osdeploy/confluent-osdeploy.conf
Normal file
16
confluent_osdeploy/confluent-osdeploy.conf
Normal file
@ -0,0 +1,16 @@
|
||||
LoadModule proxy_http_module modules/mod_proxy_http.so
|
||||
SetEnvIf Request_URI "^/confluent-api/nodes/.*/console/session$" dontlog
|
||||
Alias /confluent-public /var/lib/confluent/public
|
||||
<Directory /var/lib/confluent/public>
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
Options +Indexes +FollowSymLinks
|
||||
</Directory>
|
||||
|
||||
<Location /confluent-api>
|
||||
ProxyPass http://127.0.0.1:4005 retry=0
|
||||
RewriteEngine On
|
||||
RewriteCond %{HTTPS} off
|
||||
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
|
||||
</Location>
|
||||
TraceEnable off
|
18
confluent_osdeploy/confluent-osdeploy.conf.sles
Normal file
18
confluent_osdeploy/confluent-osdeploy.conf.sles
Normal file
@ -0,0 +1,18 @@
|
||||
LoadModule proxy_module /usr/lib64/apache2-prefork/mod_proxy.so
|
||||
LoadModule proxy_http_module /usr/lib64/apache2-prefork/mod_proxy_http.so
|
||||
LoadModule allowmethods_module /usr/lib64/apache2-prefork/mod_allowmethods.so
|
||||
LoadModule headers_module /usr/lib64/apache2-prefork/mod_headers.so
|
||||
SetEnvIf Request_URI "^/confluent-api/nodes/.*/console/session$" dontlog
|
||||
Alias /confluent-public /var/lib/confluent/public
|
||||
<Directory /var/lib/confluent/public>
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
Options +Indexes +FollowSymLinks
|
||||
</Directory>
|
||||
<Location /confluent-api>
|
||||
ProxyPass http://127.0.0.1:4005 retry=0
|
||||
RewriteEngine On
|
||||
RewriteCond %{HTTPS} off
|
||||
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
|
||||
</Location>
|
||||
TraceEnable off
|
@ -7,7 +7,13 @@ License: Apache2
|
||||
URL: http://hpc.lenovo.com/
|
||||
Source0: confluent_osdeploy.tar.xz
|
||||
BuildArch: noarch
|
||||
Requires: confluent_ipxe mtools
|
||||
|
||||
%define is_rh 0%{?el6:1}%{?el7:1}%{?el8:1}
|
||||
%if %is_rh
|
||||
Requires: confluent_ipxe mtools httpd mod_ssl
|
||||
%else
|
||||
Requires: confluent_ipxe mtools apache2
|
||||
%endif
|
||||
BuildRoot: /tmp
|
||||
|
||||
%description
|
||||
@ -54,6 +60,20 @@ for os in rhvh4 el8 suse15 ubuntu20.04 esxi6 esxi7; do
|
||||
cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
|
||||
cp -a $os/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
|
||||
done
|
||||
%if %is_rh
|
||||
mkdir -p %{buildroot}/etc/httpd/conf.d
|
||||
mv confluent-osdeploy.conf %{buildroot}/etc/httpd/conf.d/
|
||||
%else
|
||||
mkdir -p %{buildroot}/etc/apache2/conf.d
|
||||
mv confluent-osdeploy.conf.sles %{buildroot}/etc/apache2/conf.d/confluent-osdeploy.conf
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
/opt/confluent/lib/osdeploy
|
||||
%if %is_rh
|
||||
/etc/httpd/conf.d/confluent-osdeploy.conf
|
||||
%else
|
||||
/etc/apache2/conf.d/confluent-osdeploy.conf
|
||||
%endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user