Fixes #10989: Missing configuration file for Apache2 when installing 4.2

Normation · Jun 23, 2017 · 7814716 · 7814716
1 parent f5a498b
commit 7814716
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/rudder-server-relay/SPECS/rudder-server-relay.spec b/rudder-server-relay/SPECS/rudder-server-relay.spec
@@ -83,6 +83,8 @@ Source10: rudder-relay.sudo
 Source11: rudder-relay.fc
 Source12: rudder-relay.te
 Source13: rudder-apache-relay-ssl.conf
+Source14: rudder-share-acl.conf
+Source15: rudder-share-acl-24.conf
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -236,6 +238,8 @@ install -m 644 %{SOURCE10} %{buildroot}/etc/sudoers.d/rudder-relay
 # Copy stub rudder-networks*.conf
 cp %{SOURCE2} %{buildroot}%{rudderdir}/etc/
 cp %{SOURCE3} %{buildroot}%{rudderdir}/etc/
+cp %{SOURCE14} %{buildroot}%{rudderdir}/etc/
+cp %{SOURCE15} %{buildroot}%{rudderdir}/etc/
 cp %{SOURCE7} %{buildroot}%{rudderdir}/etc/
 cp %{SOURCE8} %{buildroot}%{rudderdir}/etc/
 
@@ -374,6 +378,12 @@ if [ ! -f /opt/rudder/etc/ssl/rudder.crt ] || [ ! -f /opt/rudder/etc/ssl/rudder.
   echo " Done"
 fi
 
+# put this certificate in ca.cert if it doesn't exist (we need at least on certificate there)
+if [ ! -f /opt/rudder/etc/ssl/ca.cert ]; then
+  cp /opt/rudder/etc/ssl/rudder.crt /opt/rudder/etc/ssl/ca.cert
+fi
+
+
 # Move old virtual hosts out of the way
 for OLD_VHOST in rudder-default rudder-default-ssl rudder-default.conf rudder-default-ssl.conf rudder-vhost.conf rudder-vhost-ssl.conf rudder-relay-vhost.conf rudder-relay-vhost-ssl.conf; do
 	if [ -f /etc/%{apache_vhost_dir}/${OLD_VHOST} ]; then
@@ -470,6 +480,8 @@ rm -rf %{buildroot}
 %config(noreplace) %{rudderdir}/etc/rudder-apache-relay-ssl.conf
 %config(noreplace) %{rudderdir}/etc/rudder-networks.conf
 %config(noreplace) %{rudderdir}/etc/rudder-networks-24.conf
+%config(noreplace) %{rudderdir}/etc/rudder-share-acl.conf
+%config(noreplace) %{rudderdir}/etc/rudder-share-acl-24.conf
 %config(noreplace) %{rudderdir}/etc/rudder-networks-policy-server.conf
 %config(noreplace) %{rudderdir}/etc/rudder-networks-policy-server-24.conf
 %config(noreplace) /etc/sysconfig/rudder-relay-apache

diff --git a/rudder-server-relay/debian/postinst b/rudder-server-relay/debian/postinst
@@ -113,6 +113,11 @@ case "$1" in
         echo " Done"
       fi
 
+      # put this certificate in ca.cert if it doesn't exist (we need at least on certificate there)
+      if [ ! -f /opt/rudder/etc/ssl/ca.cert ]; then
+        cp /opt/rudder/etc/ssl/rudder.crt /opt/rudder/etc/ssl/ca.cert
+      fi
+
       # Move old virtual hosts out of the way
       for OLD_VHOST in rudder-default rudder-default-ssl rudder-vhost.conf rudder-vhost-ssl.conf rudder-relay-vhost.conf rudder-relay-vhost-ssl.conf; do
         if [ -f /etc/apache2/sites-available/${OLD_VHOST} ]; then

diff --git a/rudder-server-relay/debian/rules b/rudder-server-relay/debian/rules
@@ -63,6 +63,8 @@ binary-arch: install
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-networks-24.conf /opt/rudder/etc/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-networks-policy-server.conf /opt/rudder/etc/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-networks-policy-server-24.conf /opt/rudder/etc/
+	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-share-acl.conf /opt/rudder/etc/
+	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-share-acl-24.conf /opt/rudder/etc/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/relay-api relay_api/ /opt/rudder/share/relay-api/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/relay-api flask/ /opt/rudder/share/relay-api/
 	dh_install --SOURCEDIR=$(CURDIR)/SOURCES/relay-api apache/relay-api.wsgi /opt/rudder/share/relay-api/