From 37adfa64ee86dbfa0c8740b4af67b175df2af253 Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Tue, 12 Sep 2023 10:25:20 +0200 Subject: [PATCH] use /usr/share/susemanager/www/ instead of /srv/www/htdocs --- branding/spacewalk-branding.spec | 11 +- java/build.xml | 2 +- .../localization/LocalizationService.java | 3 +- .../rhn/frontend/action/help/EulaAction.java | 2 +- java/manager-build.xml | 6 +- java/spacewalk-java.spec | 103 +++++++++--------- python/spacewalk/spacewalk-backend.spec | 2 +- .../spacewalk-selinux-enable | 6 +- .../etc/httpd/conf.d/zz-spacewalk-www.conf | 2 +- spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +- spacewalk/setup/share/vhost-nossl.conf | 2 +- .../susemanager-branding-oss.spec | 2 +- .../susemanager-sls/susemanager-sls.spec | 2 +- web/html/Makefile | 2 +- web/spacewalk-web.spec | 6 +- 15 files changed, 83 insertions(+), 70 deletions(-) diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 2e82e047a904..d48cd98606bf 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -24,8 +24,10 @@ %global wwwdocroot %{_var}/www/html %else %if 0%{?suse_version} -%global tomcat_path /srv/tomcat -%global wwwdocroot /srv/www/htdocs +%global susemanager_shared_path /usr/share/susemanager +%global wwwroot %{susemanager_shared_path}/www +%global tomcat_path %{wwwroot}/tomcat +%global wwwdocroot %{wwwroot}/htdocs %else %global tomcat_path %{_var}/lib/tomcat6 %global wwwdocroot %{_var}/www/html @@ -93,6 +95,11 @@ ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{tomcat_path}/webapps/r %{tomcat_path}/webapps/rhn/WEB-INF/lib/java-branding.jar %license LICENSE %if 0%{?suse_version} +%attr(775,tomcat,tomcat) %dir %{susemanager_shared_path} +%attr(775,tomcat,tomcat) %dir %{wwwroot} +%attr(775,tomcat,tomcat) %dir %{wwwdocroot} +%attr(775,tomcat,tomcat) %dir %{tomcat_path} +%attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn/WEB-INF %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn/WEB-INF/lib/ diff --git a/java/build.xml b/java/build.xml index 2bd005919bf4..4e7f31279be4 100644 --- a/java/build.xml +++ b/java/build.xml @@ -564,7 +564,7 @@ - + diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java index 6c1e3b44d69a..4e6c1735f0a6 100644 --- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java +++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java @@ -62,6 +62,7 @@ public class LocalizationService { */ public static final String RHN_DB_DATEFORMAT = "yyyy-MM-dd HH:mm:ss"; public static final String RHN_CUSTOM_DATEFORMAT = "yyyy-MM-dd HH:mm:ss z"; + private static final String DOC_FOLDER= "/usr/share/susemanager/www/htdocs/docs"; private static Logger log = LogManager.getLogger(LocalizationService.class); private static Logger msgLogger = LogManager.getLogger("com.redhat.rhn.common.localization.messages"); @@ -624,7 +625,7 @@ public List getInstalledDocsLocales() { List tmp = new LinkedList<>(); // Get locales of installed documentations - File f = new File("/srv/www/htdocs/docs"); + File f = new File(DOC_FOLDER); String[] locales = f.list(); if (locales != null) { tmp.addAll(Arrays.asList(locales)); diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/EulaAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/EulaAction.java index 020c707955c5..0035ce8c4435 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/help/EulaAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/help/EulaAction.java @@ -36,7 +36,7 @@ * EULA action page. */ public class EulaAction extends org.apache.struts.action.Action { - private static final File EULA_PATH = new File("/srv/www/htdocs/help/eula.html"); + private static final File EULA_PATH = new File("/usr/share/susemanager/www/htdocs/help/eula.html"); /** {@inheritDoc} */ @Override diff --git a/java/manager-build.xml b/java/manager-build.xml index 682a23e98077..1732d11a2916 100644 --- a/java/manager-build.xml +++ b/java/manager-build.xml @@ -21,7 +21,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -334,7 +334,7 @@ diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index ccb1050fd519..0ce3d082cb96 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,9 +28,9 @@ %define run_checkstyle 0 %define omit_tests 1 -%define servewwwdir /usr/share/susemanager/www +%define susemanagershareddir /usr/share/susemanager +%define serverdir %{susemanagershareddir}/www %if 0%{?suse_version} -%define serverdir /srv %define apache_group www %define salt_user_group salt %define apache2 apache2 @@ -56,9 +56,6 @@ %define supported_locales en_US,ko,ja,zh_CN %endif -%define serverxmltool %{_libexecdir}/tomcat/serverxml-tool.sh - - Name: spacewalk-java Summary: Java web application files for Spacewalk License: GPL-2.0-only @@ -316,7 +313,7 @@ This package contains testing files of spacewalk-java. %{_datadir}/rhn/lib/rhn-test.jar %{_datadir}/rhn/unit-tests/* %{_datadir}/rhn/unittest.xml -%attr(644, tomcat, tomcat) %{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/commons-lang3.jar +%attr(644, tomcat, tomcat) %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/commons-lang3.jar %endif %package apidoc-sources @@ -502,11 +499,11 @@ export JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ export NO_BRP_STALE_LINK_ERROR=yes -mkdir -p $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/ +mkdir -p $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib %if 0%{?suse_version} ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=$RPM_BUILD_ROOT -Dtomcat="tomcat9" install-tomcat9-suse -install -d -m 755 $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/META-INF/ -install -m 755 conf/rhn-tomcat9.xml $RPM_BUILD_ROOT%{serverwwwrdir}/tomcat/webapps/rhn/META-INF/context.xml +install -d -m 755 $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/META-INF/ +install -m 755 conf/rhn-tomcat9.xml $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/META-INF/context.xml %else ant -Dproduct.name="'$PRODUCT_NAME'" -Dprefix=$RPM_BUILD_ROOT install-tomcat install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/localhost/ @@ -590,7 +587,7 @@ install -m 644 conf/cobbler/snippets/sles_register_script $RPM_BUILD_ROOT%{space install -m 644 conf/cobbler/snippets/sles_no_signature_checks $RPM_BUILD_ROOT%{spacewalksnippetsdir}/sles_no_signature_checks install -m 644 conf/cobbler/snippets/wait_for_networkmanager_script $RPM_BUILD_ROOT%{spacewalksnippetsdir}/wait_for_networkmanager_script -ln -s -f %{_javadir}/dwr.jar $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/dwr.jar +ln -s -f %{_javadir}/dwr.jar $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/dwr.jar # special links for rhn-search RHN_SEARCH_BUILD_DIR=%{_prefix}/share/rhn/search/lib @@ -603,10 +600,10 @@ if [ -e %{_javadir}/ongres-stringprep/stringprep.jar ]; then ln -s -f %{_javadir}/ongres-stringprep/stringprep.jar $RPM_BUILD_ROOT$RHN_SEARCH_BUILD_DIR/ongres-stringprep_stringprep.jar ln -s -f %{_javadir}/ongres-stringprep/saslprep.jar $RPM_BUILD_ROOT$RHN_SEARCH_BUILD_DIR/ongres-stringprep_saslprep.jar echo " -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_client.jar -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_common.jar -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-stringprep_stringprep.jar -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-stringprep_saslprep.jar +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_client.jar +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_common.jar +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-stringprep_stringprep.jar +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-stringprep_saslprep.jar %{_prefix}/share/rhn/search/lib/ongres-scram_client.jar %{_prefix}/share/rhn/search/lib/ongres-scram_common.jar %{_prefix}/share/rhn/search/lib/ongres-stringprep_stringprep.jar @@ -614,8 +611,8 @@ if [ -e %{_javadir}/ongres-stringprep/stringprep.jar ]; then " > .mfiles-postgresql else echo " -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_client.jar -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_common.jar +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_client.jar +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-scram_common.jar %{_prefix}/share/rhn/search/lib/ongres-scram_client.jar %{_prefix}/share/rhn/search/lib/ongres-scram_common.jar " > .mfiles-postgresql @@ -626,10 +623,10 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/xml install -m 644 build/reports/apidocs/docbook/susemanager_api_doc.xml $RPM_BUILD_ROOT%{_docdir}/%{name}/xml/susemanager_api_doc.xml cp -R build/reports/apidocs/asciidoc/ $RPM_BUILD_ROOT%{_docdir}/%{name}/asciidoc/ # delete JARs which must not be deployed -rm -rf $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/jspapi.jar -rm -rf $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-compiler.jar -rm -rf $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-runtime.jar -rm -rf $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/tomcat*.jar +rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jspapi.jar +rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-compiler.jar +rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jasper5-runtime.jar +rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/tomcat*.jar %if 0%{?omit_tests} > 0 rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/lib/rhn-test.jar rm -rf $RPM_BUILD_ROOT/classes/com/redhat/rhn/common/conf/test/conf @@ -640,16 +637,16 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/unittest.xml mkdir -p $RPM_BUILD_ROOT%{_var}/log/rhn # Prettifying symlinks -mv $RPM_BUILD_ROOT%{servewwwrdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-loggingjboss-logging.jar $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-logging.jar +mv $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-loggingjboss-logging.jar $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/jboss-logging.jar # Removing unused symlinks. %if 0%{?rhel} -rm -rf $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/javamailmail.jar +rm -rf $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/javamailmail.jar %endif # show all JAR symlinks echo "#### SYMLINKS START ####" -find $RPM_BUILD_ROOT%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib -name *.jar +find $RPM_BUILD_ROOT%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib -name *.jar echo "#### SYMLINKS END ####" %pre -n spacewalk-taskomatic @@ -697,41 +694,42 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log %files %defattr(-,root,root) +%dir %{susemanagershareddir} +%dir %{serverdir} %dir %{_localstatedir}/lib/spacewalk %defattr(644,tomcat,tomcat,775) %attr(775, %{salt_user_group}, %{salt_user_group}) %dir %{serverdir}/susemanager/salt/salt_ssh %attr(700, %{salt_user_group}, %{salt_user_group}) %dir %{serverdir}/susemanager/salt/salt_ssh/temp_bootstrap_keys -%dir %{serverwwwdir}/tomcat -%dir %{serverwwwdir}/tomcat/webapps -%attr(775, root, tomcat) %dir %{serverwwwdir}/tomcat/webapps %dir %{serverdir}/susemanager %dir %{serverdir}/susemanager/salt %attr(775,tomcat,susemanager) %dir %{serverdir}/susemanager/pillar_data %attr(775,tomcat,susemanager) %dir %{serverdir}/susemanager/pillar_data/images %dir %{serverdir}/susemanager/formula_data -%attr(770, tomcat, %{salt_user_group}) %dir %{serverwwwdir}/susemanager/tmp -%dir %{serverwwwdir}/tomcat/webapps/rhn/ -%{serverwwwdir}/tomcat/webapps/rhn/apidoc/ -%{serverwwwdir}/tomcat/webapps/rhn/css/ -%{serverwwwdir}/tomcat/webapps/rhn/errata/ -%{serverwwwdir}/tomcat/webapps/rhn/img/ -%{serverwwwdir}/tomcat/webapps/rhn/META-INF/ -%{serverwwwdir}/tomcat/webapps/rhn/schedule/ -%{serverwwwdir}/tomcat/webapps/rhn/systems/ -%{serverwwwdir}/tomcat/webapps/rhn/users/ -%{serverwwwdir}/tomcat/webapps/rhn/errors/ -%{serverwwwdir}/tomcat/webapps/rhn/*.jsp -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/classes -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/decorators -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/includes -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/nav -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/pages -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/*.xml +%attr(770, tomcat, %{salt_user_group}) %dir %{serverdir}/susemanager/tmp +%dir %{serverdir}/tomcat/webapps/rhn/ +%{serverdir}/tomcat/webapps/rhn/apidoc/ +%{serverdir}/tomcat/webapps/rhn/css/ +%{serverdir}/tomcat/webapps/rhn/errata/ +%{serverdir}/tomcat/webapps/rhn/img/ +%{serverdir}/tomcat/webapps/rhn/META-INF/ +%{serverdir}/tomcat/webapps/rhn/schedule/ +%{serverdir}/tomcat/webapps/rhn/systems/ +%{serverdir}/tomcat/webapps/rhn/users/ +%{serverdir}/tomcat/webapps/rhn/errors/ +%{serverdir}/tomcat/webapps/rhn/*.jsp +%{serverdir}/tomcat/webapps/rhn/WEB-INF/classes +%{serverdir}/tomcat/webapps/rhn/WEB-INF/decorators +%{serverdir}/tomcat/webapps/rhn/WEB-INF/includes +%{serverdir}/tomcat/webapps/rhn/WEB-INF/nav +%{serverdir}/tomcat/webapps/rhn/WEB-INF/pages +%{serverdir}/tomcat/webapps/rhn/WEB-INF/*.xml # all jars in WEB-INF/lib/ -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib -%exclude %{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar -%exclude %{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-*.jar +%dir %{serverdir}/tomcat +%dir %{serverdir}/tomcat/webapps +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib +%exclude %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar +%exclude %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-*.jar # owned by cobbler needs cobbler permissions %attr(755,root,root) %dir %{cobprofdir} @@ -752,7 +750,7 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log %config %{spacewalksnippetsdir}/sles_no_signature_checks %config %{spacewalksnippetsdir}/wait_for_networkmanager_script %if 0%{?suse_version} -%config(noreplace) %{serverwwwdir}/tomcat/webapps/rhn/META-INF/context.xml +%config(noreplace) %{serverdir}/tomcat/webapps/rhn/META-INF/context.xml %else %config(noreplace) %{_sysconfdir}/tomcat/Catalina/localhost/rhn.xml %endif @@ -760,7 +758,7 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log %attr(755, tomcat, root) %dir %{_localstatedir}/lib/spacewalk/scc %attr(755, tomcat, root) %dir %{_localstatedir}/lib/spacewalk/subscription-matcher -%dir %{serverwwwdir}/tomcat/webapps/rhn/WEB-INF +%dir %{serverdir}/tomcat/webapps/rhn/WEB-INF %files -n spacewalk-taskomatic %defattr(644,root,root,775) @@ -801,7 +799,12 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log %defattr(644,root,root,755) %dir %{_prefix}/share/rhn/search %dir %{_prefix}/share/rhn/search/lib -%{serverwwwdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar +%dir %{susemanagershareddir} +%dir %{serverdir} +%{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar %{_prefix}/share/rhn/search/lib/postgresql-jdbc.jar +%defattr(644,tomcat,tomcat,775) +%dir %{serverdir}/tomcat +%dir %{serverdir}/tomcat/webapps %changelog diff --git a/python/spacewalk/spacewalk-backend.spec b/python/spacewalk/spacewalk-backend.spec index e77f8235272b..0f36dfa4d71a 100644 --- a/python/spacewalk/spacewalk-backend.spec +++ b/python/spacewalk/spacewalk-backend.spec @@ -41,7 +41,7 @@ %global apache_user wwwrun %global apache_group www %global apache_pkg apache2 -%global documentroot /srv/www/htdocs +%global documentroot /usr/share/susemanager/www/htdocs %global m2crypto python3-M2Crypto %global sslrootcert %{_sysconfdir}/pki/trust/anchors/ %endif diff --git a/selinux/spacewalk-selinux/spacewalk-selinux-enable b/selinux/spacewalk-selinux/spacewalk-selinux-enable index 0360511e8e86..ced0f7b93a35 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux-enable +++ b/selinux/spacewalk-selinux/spacewalk-selinux-enable @@ -7,9 +7,9 @@ RUN_PURE= if [ -d /srv/www/htdocs ]; then - WWWDOCROOT=/srv/www/htdocs + PUBROOT=/srv/www/htdocs else - WWWDOCROOT=/var/www/html + PUBROOT=/var/www/html fi while [ -n "$1" ] ; do @@ -51,7 +51,7 @@ for selinuxvariant in mls strict targeted done /sbin/restorecon -rvvi /usr/share/rhn/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \ - /usr/bin/rhn-sudo-ssl-tool ${WWWDOCROOT}/pub /usr/sbin/tanukiwrapper \ + /usr/bin/rhn-sudo-ssl-tool ${PUBROOT}/pub /usr/sbin/tanukiwrapper \ /var/lib/rhn/kickstarts for sebool in \ diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index beabb28d1c95..40744d379c75 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -1,7 +1,7 @@ Logformat "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \ \"%r\" %b \"%{Referer}i\" \"%{User-Agent}i\" %>s T%{ms}T" ssl_combined - + Options Indexes FollowSymLinks AllowOverride All diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index ee42ec90b278..57a0cddc86f1 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -107,7 +107,7 @@ use constant DB_MIGRATION_LOG_FILE => use constant EMBEDDED_DB_ANSWERS => '/usr/share/spacewalk/setup/defaults.d/embedded-postgresql.conf'; our $DEFAULT_DOC_ROOT = "/var/www/html"; -our $SUSE_DOC_ROOT = "/srv/www/htdocs"; +our $SUSE_DOC_ROOT = "/usr/share/susemanager/www/htdocs"; our $CA_TRUST_DIR = '/etc/pki/ca-trust/source/anchors'; our $SUSE_CA_TRUST_DIR = '/etc/pki/trust/anchors'; diff --git a/spacewalk/setup/share/vhost-nossl.conf b/spacewalk/setup/share/vhost-nossl.conf index cc29f270f3b2..5d3fd58d45ba 100644 --- a/spacewalk/setup/share/vhost-nossl.conf +++ b/spacewalk/setup/share/vhost-nossl.conf @@ -1,7 +1,7 @@ # General setup for the virtual host - DocumentRoot "/srv/www/htdocs" + DocumentRoot "/usr/share/susemanager/www/htdocs" ErrorLog /var/log/apache2/error_log TransferLog /var/log/apache2/access_log diff --git a/susemanager-branding-oss/susemanager-branding-oss.spec b/susemanager-branding-oss/susemanager-branding-oss.spec index 407047406f98..86100e7c74a6 100644 --- a/susemanager-branding-oss/susemanager-branding-oss.spec +++ b/susemanager-branding-oss/susemanager-branding-oss.spec @@ -17,7 +17,7 @@ %if 0%{?suse_version} -%global wwwdocroot /srv/www/htdocs +%global wwwdocroot /usr/share/susemanager/www/htdocs %else %global wwwdocroot %{_localstatedir}/www/html %endif diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.spec b/susemanager-utils/susemanager-sls/susemanager-sls.spec index 54081a0497bd..c13777b48cc2 100644 --- a/susemanager-utils/susemanager-sls/susemanager-sls.spec +++ b/susemanager-utils/susemanager-sls/susemanager-sls.spec @@ -22,7 +22,7 @@ %endif %if 0%{?suse_version} -%global serverdir /srv +%global serverdir /usr/share/susemanager %global wwwdocroot %{serverdir}/www/htdocs %else %global serverdir %{_localstatedir} diff --git a/web/html/Makefile b/web/html/Makefile index d06b61120457..d11948d58150 100644 --- a/web/html/Makefile +++ b/web/html/Makefile @@ -4,7 +4,7 @@ TOP = .. # Project defines -INSTALL_DEST = /srv/www/htdocs +INSTALL_DEST = /usr/share/susemanager/www/htdocs # common stuff include $(TOP)/Makefile.defs diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index f1c8a52e8248..682ad3ebfebd 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -16,9 +16,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%define shared_path /usr/share/susemanager %if 0%{?suse_version} -%define www_path /srv/www/htdocs +%define www_path %{shared_path}/www/htdocs %define apache_user wwwrun %define apache_group www %else @@ -251,6 +251,8 @@ sed -i -e 's/^web.theme_default =.*$/web.theme_default = susemanager-light/' $RP %files -n spacewalk-html -f spacewalk-web.lang %defattr(644,root,root,755) +%dir %{shared_path} +%dir %{www_path} %dir %{www_path}/css %{www_path}/css/*.{css,js} %dir %{www_path}/css/legacy