Skip to content

Commit

Permalink
use /usr/share/susemanager/www/ instead of /srv/www/htdocs
Browse files Browse the repository at this point in the history
  • Loading branch information
mbussolotto committed Sep 19, 2023
1 parent 3cba31e commit e90530f
Show file tree
Hide file tree
Showing 15 changed files with 83 additions and 70 deletions.
11 changes: 9 additions & 2 deletions branding/spacewalk-branding.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion java/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
</target>

<target name="install-tomcat9-suse">
<property name="webapp-dir" value="/srv/tomcat/webapps/" />
<property name="webapp-dir" value="/usr/share/susemanager/www/tomcat/webapps/" />
<echo message="${prefix}" />
<echo message="${webapp-dir}" />
<antcall target="install" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -624,7 +625,7 @@ public List<String> getInstalledDocsLocales() {
List<String> 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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions java/manager-build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<property name="deploy.host" value="deployhost" />
<property name="deploy.port" value="22" />
<property name="deploy.dir" value="/srv/tomcat/webapps/rhn" />
<property name="deploy.dir" value="/usr/share/susemanager/www/tomcat/webapps/rhn" />
<property name="deploy.user" value="root" />
<property name="deploy.namespace" value="default"/>

Expand Down Expand Up @@ -242,7 +242,7 @@
<available file="${basedir}/../susemanager" type="dir"/>
</not>
</condition>
<condition property="static.files.dir" value="/var/www/html" else="/srv/www/htdocs">
<condition property="static.files.dir" value="/var/www/html" else="/usr/share/susemanager/www/htdocs">
<isset property="spacewalk.upstream"/>
</condition>

Expand Down Expand Up @@ -334,7 +334,7 @@
<echo message="Copying frontend files to container... " />
<copy-to-container
source="${frontend.dist.dir}"
target="/srv/www/htdocs"
target="/usr/share/susemanager/www/htdocs"
failonerror="true"
backend="${container.backend}" />
</target>
Expand Down
103 changes: 53 additions & 50 deletions java/spacewalk-java.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand All @@ -603,19 +600,19 @@ 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
%{_prefix}/share/rhn/search/lib/ongres-stringprep_saslprep.jar
" > .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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -752,15 +750,15 @@ 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
%attr(755,root,root) %dir %{cobblerdir}

%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)
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion python/spacewalk/spacewalk-backend.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions selinux/spacewalk-selinux/spacewalk-selinux-enable
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
Original file line number Diff line number Diff line change
@@ -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

<Directory "/srv/www/htdocs/*">
<Directory "/usr/share/susemanager/www/htdocs/*">
Options Indexes FollowSymLinks
AllowOverride All
<IfVersion <= 2.2>
Expand Down
2 changes: 1 addition & 1 deletion spacewalk/setup/lib/Spacewalk/Setup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion spacewalk/setup/share/vhost-nossl.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VirtualHost _default_:80>

# 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

Expand Down
2 changes: 1 addition & 1 deletion susemanager-branding-oss/susemanager-branding-oss.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion susemanager-utils/susemanager-sls/susemanager-sls.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion web/html/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit e90530f

Please sign in to comment.