Attachment 6074 Details for Bug 35721 – Move the configuration of UCRV apache2/startsite to an earlier initscript

[patch] Move the configuration of UCRV apache2/startsite to an earlier initscript

move_ucr_apache2_startsite_setting.patch (text/plain), 1.32 KB, created by Erik Damrose on 2014-08-27 12:53:28 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Erik Damrose

Created: 2014-08-27 12:53:28 CEST

Size: 1.32 KB

patch

obsolete

>Index: debian/univention-system-setup-boot.init
>===================================================================
>--- debian/univention-system-setup-boot.init	(Revision 53068)
>+++ debian/univention-system-setup-boot.init	(Arbeitskopie)
>@@ -61,12 +61,6 @@
> 			if ! grep -q "$key" /root/.ssh/authorized_keys; then
> 				echo "$key"  >>/root/.ssh/authorized_keys
> 			fi
>-			
>-			# Show welcome page on unjoined EC2 systems:
>-			if [ ! -e /var/univention-join/joined ]; then
>-				ucr set apache2/startsite="ucs-overview/initialsetup.html"
>-				invoke-rc.d apache2 reload
>-			fi
> 		fi
> 
> 		if is_ucr_true server/amazon && is_ucr_true system/setup/boot/networking; then
>Index: etc/init.d/univention-system-setup-boot-prepare
>===================================================================
>--- etc/init.d/univention-system-setup-boot-prepare	(Revision 53068)
>+++ etc/init.d/univention-system-setup-boot-prepare	(Arbeitskopie)
>@@ -50,6 +50,14 @@
> 		# recreate ssl certificates if they are missing
> 		[ ! -d /etc/univention/ssl ] && dpkg-reconfigure univention-ssl
> 
>+		# Show welcome page on unjoined EC2 systems:
>+		if is_ucr_true server/amazon; then
>+			if [ ! -e /var/univention-join/joined ]; then
>+				ucr set apache2/startsite="ucs-overview/initialsetup.html"
>+				invoke-rc.d apache2 reload
>+			fi
>+		fi
>+
> 		log_action_end_msg 0
> 		;;
> 	stop)

Actions: View | Diff

Attachments on bug 35721: 6074