mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
debian: Management server packaging fixes
We should be carefull what we package since all configuration should be in /etc/cloudstack/management Signed-off-by: Wido den Hollander <wido@widodh.nl>
This commit is contained in:
Wido den Hollander
parent
89d3808a18
commit
a773ed88b7
@ -1,231 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<!--
|
|
||||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
contributor license agreements. See the NOTICE file distributed with
|
|
||||||
this work for additional information regarding copyright ownership.
|
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
(the "License"); you may not use this file except in compliance with
|
|
||||||
the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
<!-- Note: A "Server" is not itself a "Container", so you may not
|
|
||||||
define subcomponents such as "Valves" at this level.
|
|
||||||
Documentation at /docs/config/server.html
|
|
||||||
-->
|
|
||||||
<Server port="8005" shutdown="SHUTDOWN">
|
|
||||||
|
|
||||||
<!--APR library loader. Documentation at /docs/apr.html -->
|
|
||||||
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
|
|
||||||
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
|
|
||||||
<Listener className="org.apache.catalina.core.JasperListener" />
|
|
||||||
<!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
|
|
||||||
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
|
|
||||||
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
|
|
||||||
|
|
||||||
<!-- Global JNDI resources
|
|
||||||
Documentation at /docs/jndi-resources-howto.html
|
|
||||||
-->
|
|
||||||
<GlobalNamingResources>
|
|
||||||
<!-- Editable user database that can also be used by
|
|
||||||
UserDatabaseRealm to authenticate users
|
|
||||||
-->
|
|
||||||
<Resource name="UserDatabase" auth="Container"
|
|
||||||
type="org.apache.catalina.UserDatabase"
|
|
||||||
description="User database that can be updated and saved"
|
|
||||||
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
|
|
||||||
pathname="conf/tomcat-users.xml" />
|
|
||||||
</GlobalNamingResources>
|
|
||||||
|
|
||||||
<!-- A "Service" is a collection of one or more "Connectors" that share
|
|
||||||
a single "Container" Note: A "Service" is not itself a "Container",
|
|
||||||
so you may not define subcomponents such as "Valves" at this level.
|
|
||||||
Documentation at /docs/config/service.html
|
|
||||||
-->
|
|
||||||
<Service name="Catalina">
|
|
||||||
|
|
||||||
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
|
|
||||||
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
|
|
||||||
maxThreads="150" minSpareThreads="25"/>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- A "Connector" represents an endpoint by which requests are received
|
|
||||||
and responses are returned. Documentation at :
|
|
||||||
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
|
|
||||||
Java AJP Connector: /docs/config/ajp.html
|
|
||||||
APR (HTTP/AJP) Connector: /docs/apr.html
|
|
||||||
Define a non-SSL HTTP/1.1 Connector on port 8080
|
|
||||||
-->
|
|
||||||
<!--
|
|
||||||
<Connector port="8080" protocol="HTTP/1.1"
|
|
||||||
connectionTimeout="20000"
|
|
||||||
redirectPort="8443" />
|
|
||||||
-->
|
|
||||||
<!-- A "Connector" using the shared thread pool-->
|
|
||||||
<Connector executor="tomcatThreadPool" URIEncoding="UTF-8"
|
|
||||||
port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
|
|
||||||
connectionTimeout="20000" disableUploadTimeout="true"
|
|
||||||
acceptCount="150" enableLookups="false" maxThreads="150"
|
|
||||||
maxHttpHeaderSize="8192" redirectPort="8443" />
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Define a SSL HTTP/1.1 Connector on port 8443
|
|
||||||
This connector uses the JSSE configuration, when using APR, the
|
|
||||||
connector should be using the OpenSSL style configuration
|
|
||||||
described in the APR documentation -->
|
|
||||||
<!--
|
|
||||||
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
|
|
||||||
maxThreads="150" scheme="https" secure="true"
|
|
||||||
clientAuth="false" sslProtocol="TLS"
|
|
||||||
keystoreType="PKCS12"
|
|
||||||
keystoreFile="conf\cloud-localhost.pk12"
|
|
||||||
keystorePass="password"
|
|
||||||
/>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Define an AJP 1.3 Connector on port 20400 -->
|
|
||||||
<Connector port="20400" protocol="AJP/1.3" redirectPort="8443" />
|
|
||||||
|
|
||||||
|
|
||||||
<!-- An Engine represents the entry point (within Catalina) that processes
|
|
||||||
every request. The Engine implementation for Tomcat stand alone
|
|
||||||
analyzes the HTTP headers included with the request, and passes them
|
|
||||||
on to the appropriate Host (virtual host).
|
|
||||||
Documentation at /docs/config/engine.html -->
|
|
||||||
|
|
||||||
<!-- You should set jvmRoute to support load-balancing via AJP ie :
|
|
||||||
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
|
|
||||||
-->
|
|
||||||
<Engine name="Catalina" defaultHost="localhost">
|
|
||||||
|
|
||||||
<!--For clustering, please take a look at documentation at:
|
|
||||||
/docs/cluster-howto.html (simple how to)
|
|
||||||
/docs/config/cluster.html (reference documentation) -->
|
|
||||||
<!--
|
|
||||||
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- The request dumper valve dumps useful debugging information about
|
|
||||||
the request and response data received and sent by Tomcat.
|
|
||||||
Documentation at: /docs/config/valve.html -->
|
|
||||||
<!--
|
|
||||||
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- This Realm uses the UserDatabase configured in the global JNDI
|
|
||||||
resources under the key "UserDatabase". Any edits
|
|
||||||
that are performed against this UserDatabase are immediately
|
|
||||||
available for use by the Realm. -->
|
|
||||||
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
|
|
||||||
resourceName="UserDatabase"/>
|
|
||||||
|
|
||||||
<!-- Define the default virtual host
|
|
||||||
Note: XML Schema validation will not work with Xerces 2.2.
|
|
||||||
-->
|
|
||||||
<Host name="localhost" appBase="webapps"
|
|
||||||
unpackWARs="true" autoDeploy="true"
|
|
||||||
xmlValidation="false" xmlNamespaceAware="false">
|
|
||||||
|
|
||||||
<!-- SingleSignOn valve, share authentication between web applications
|
|
||||||
Documentation at: /docs/config/valve.html -->
|
|
||||||
<!--
|
|
||||||
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Access log processes all example.
|
|
||||||
Documentation at: /docs/config/valve.html -->
|
|
||||||
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"
|
|
||||||
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
|
|
||||||
|
|
||||||
</Host>
|
|
||||||
</Engine>
|
|
||||||
</Service>
|
|
||||||
|
|
||||||
|
|
||||||
<Service name="Catalina7080">
|
|
||||||
|
|
||||||
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
|
|
||||||
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
|
|
||||||
maxThreads="150" minSpareThreads="25"/>
|
|
||||||
|
|
||||||
<Connector executor="tomcatThreadPool-internal" URIEncoding="UTF-8"
|
|
||||||
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
|
|
||||||
connectionTimeout="20000" disableUploadTimeout="true"
|
|
||||||
acceptCount="150" enableLookups="false" maxThreads="150"
|
|
||||||
maxHttpHeaderSize="8192" redirectPort="8443" />
|
|
||||||
|
|
||||||
<!-- Define a SSL HTTP/1.1 Connector on port 8443
|
|
||||||
This connector uses the JSSE configuration, when using APR, the
|
|
||||||
connector should be using the OpenSSL style configuration
|
|
||||||
described in the APR documentation -->
|
|
||||||
<!--
|
|
||||||
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
|
|
||||||
maxThreads="150" scheme="https" secure="true"
|
|
||||||
clientAuth="false" sslProtocol="TLS"
|
|
||||||
keystoreType="PKCS12"
|
|
||||||
keystoreFile="conf\cloud-localhost.pk12"
|
|
||||||
keystorePass="password"
|
|
||||||
/>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Define an AJP 1.3 Connector on port 20400 -->
|
|
||||||
|
|
||||||
|
|
||||||
<!-- An Engine represents the entry point (within Catalina) that processes
|
|
||||||
every request. The Engine implementation for Tomcat stand alone
|
|
||||||
analyzes the HTTP headers included with the request, and passes them
|
|
||||||
on to the appropriate Host (virtual host).
|
|
||||||
Documentation at /docs/config/engine.html -->
|
|
||||||
|
|
||||||
<Engine name="Catalina7080" defaultHost="localhost">
|
|
||||||
|
|
||||||
<!--For clustering, please take a look at documentation at:
|
|
||||||
/docs/cluster-howto.html (simple how to)
|
|
||||||
/docs/config/cluster.html (reference documentation) -->
|
|
||||||
<!--
|
|
||||||
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- The request dumper valve dumps useful debugging information about
|
|
||||||
the request and response data received and sent by Tomcat.
|
|
||||||
Documentation at: /docs/config/valve.html -->
|
|
||||||
<!--
|
|
||||||
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- This Realm uses the UserDatabase configured in the global JNDI
|
|
||||||
resources under the key "UserDatabase". Any edits
|
|
||||||
that are performed against this UserDatabase are immediately
|
|
||||||
available for use by the Realm. -->
|
|
||||||
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
|
|
||||||
resourceName="UserDatabase"/>
|
|
||||||
|
|
||||||
<!-- Define the default virtual host
|
|
||||||
Note: XML Schema validation will not work with Xerces 2.2.
|
|
||||||
-->
|
|
||||||
<Host name="localhost" appBase="webapps7080"
|
|
||||||
unpackWARs="true" autoDeploy="true"
|
|
||||||
xmlValidation="false" xmlNamespaceAware="false">
|
|
||||||
|
|
||||||
<!-- SingleSignOn valve, share authentication between web applications
|
|
||||||
Documentation at: /docs/config/valve.html -->
|
|
||||||
<!--
|
|
||||||
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Access log processes all example.
|
|
||||||
Documentation at: /docs/config/valve.html -->
|
|
||||||
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"
|
|
||||||
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
|
|
||||||
|
|
||||||
</Host>
|
|
||||||
</Engine>
|
|
||||||
</Service>
|
|
||||||
|
|
||||||
</Server>
|
|
||||||
2
debian/cloudstack-management.install
vendored
2
debian/cloudstack-management.install
vendored
@ -15,7 +15,6 @@
|
|||||||
# specific language governing permissions and limitations
|
# specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
/etc/cloudstack/server/*
|
|
||||||
/etc/cloudstack/management/*
|
/etc/cloudstack/management/*
|
||||||
/etc/init.d/cloudstack-management
|
/etc/init.d/cloudstack-management
|
||||||
/etc/security/limits.d/cloudstack-limits.conf
|
/etc/security/limits.d/cloudstack-limits.conf
|
||||||
@ -31,4 +30,3 @@
|
|||||||
/usr/bin/cloud-setup-databases
|
/usr/bin/cloud-setup-databases
|
||||||
/usr/bin/cloud-migrate-databases
|
/usr/bin/cloud-migrate-databases
|
||||||
/usr/share/cloudstack-management/*
|
/usr/share/cloudstack-management/*
|
||||||
/usr/share/tomcat6/lib/*
|
|
||||||
|
|||||||
5
debian/cloudstack-management.postinst
vendored
5
debian/cloudstack-management.postinst
vendored
@ -27,10 +27,7 @@ if [ "$1" = configure ]; then
|
|||||||
/var/cache/cloudstack/management/work \
|
/var/cache/cloudstack/management/work \
|
||||||
/var/cache/cloudstack/management/temp \
|
/var/cache/cloudstack/management/temp \
|
||||||
/var/log/cloudstack/management \
|
/var/log/cloudstack/management \
|
||||||
/etc/cloudstack/management/Catalina \
|
/var/lib/cloudstack/management
|
||||||
/etc/cloudstack/management/Catalina/localhost \
|
|
||||||
/var/lib/cloudstack/management \
|
|
||||||
/etc/cloudstack/management/Catalina/localhost/client
|
|
||||||
do
|
do
|
||||||
chmod 0770 $i
|
chmod 0770 $i
|
||||||
chgrp cloud $i
|
chgrp cloud $i
|
||||||
|
|||||||
7
debian/rules
vendored
7
debian/rules
vendored
@ -98,14 +98,15 @@ install:
|
|||||||
chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/cloudstack
|
chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/cloudstack
|
||||||
|
|
||||||
ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
|
ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
|
||||||
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client
|
ln -s server-nonssl.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/server.xml
|
||||||
mkdir -p ${DESTDIR}/usr/share/tomcat6/lib
|
|
||||||
install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
|
install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
|
||||||
install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
|
install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
|
||||||
ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
|
ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
|
||||||
|
# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
|
||||||
|
# This should all be in /etc/cloudstack/management
|
||||||
|
rm $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/WEB-INF/classes/*.*
|
||||||
ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf
|
ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf
|
||||||
ln -s ../../../usr/share/tomcat6/lib $(DESTDIR)/usr/share/$(PACKAGE)-management/lib
|
ln -s ../../../usr/share/tomcat6/lib $(DESTDIR)/usr/share/$(PACKAGE)-management/lib
|
||||||
ln -s ../../java/$(PACKAGE)-server.jar $(DESTDIR)/usr/share/tomcat6/lib/$(PACKAGE)-server.jar
|
|
||||||
ln -s ../../../var/log/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/logs
|
ln -s ../../../var/log/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/logs
|
||||||
ln -s ../../../var/cache/$(PACKAGE)/management/temp $(DESTDIR)/usr/share/$(PACKAGE)-management/temp
|
ln -s ../../../var/cache/$(PACKAGE)/management/temp $(DESTDIR)/usr/share/$(PACKAGE)-management/temp
|
||||||
ln -s ../../../var/cache/$(PACKAGE)/management/work $(DESTDIR)/usr/share/$(PACKAGE)-management/work
|
ln -s ../../../var/cache/$(PACKAGE)/management/work $(DESTDIR)/usr/share/$(PACKAGE)-management/work
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user