Merge pull request #628 from uyuni-project/main-bsc1244027

Update Cobbler settings file to a new dedicated path (bsc#1244027)

Author: meaksh

mgradm/shared/templates/migrateScriptTemplate.go

@@ -163,7 +163,7 @@ sed 's/^report_db_host = .*/report_db_host = {{ .ReportDBHost }}/' -i /etc/rhn/r
 if ! grep -q '^java.hostname *=' /etc/rhn/rhn.conf; then
     sed 's/server\.jabber_server/java\.hostname/' -i /etc/rhn/rhn.conf;
 fi
-sed 's/client_use_localhost: false/client_use_localhost: true/' -i /etc/cobbler/settings.yaml;
+echo 'client_use_localhost: true' >> /etc/cobbler/settings.d/zz-uyuni.settings;
 
 echo "Altering configuration for container environment..."
 sed 's/address=[^:]*:/address=*:/' -i /etc/rhn/taskomatic.conf;

mgradm/shared/templates/postUpgradeScriptTemplate.go

@@ -11,16 +11,14 @@ import (
 
 const postUpgradeScriptTemplate = `
 sed 's/cobbler\.host.*/cobbler\.host = localhost/' -i /etc/rhn/rhn.conf;
-grep uyuni_authentication_endpoint /etc/cobbler/settings.yaml
-if [ $? -eq 1 ]; then
-	echo 'uyuni_authentication_endpoint: "http://localhost"' >> /etc/cobbler/settings.yaml
+if grep -q uyuni_authentication_endpoint /etc/cobbler/settings.d/zz-uyuni.settings; then
+	echo 'uyuni_authentication_endpoint: "http://localhost"' >> /etc/cobbler/settings.d/zz-uyuni.settings
 else
 	sed 's/uyuni_authentication_endpoint.*/uyuni_authentication_endpoint: http:\/\/localhost/' \
-        -i /etc/cobbler/settings.yaml;
+        -i /etc/cobbler/settings.d/zz-uyuni.settings;
 fi
 
-grep pam_auth_service /etc/rhn/rhn.conf
-if [ $? -eq 1 ]; then
+if grep -q pam_auth_service /etc/rhn/rhn.conf; then
 	echo 'pam_auth_service = susemanager' >> /etc/rhn/rhn.conf
 else
 	sed 's/pam_auth_service.*/pam_auth_service = susemanager/' -i /etc/rhn/rhn.conf;

uyuni-tools.changes.meaksh.Manager-5.0-bsc1244027

@@ -0,0 +1 @@
+- Use new dedicated path for Cobbler settings (bsc#1244027)