Visitar URL original
Cleanup awsapi leftovers · alitheg/cloudstack@1958a8e · GitHub
Skip to content

Commit 1958a8e

Browse files
rsafonsecayadvr
rsafonseca
authored and
yadvr
committed
Cleanup awsapi leftovers
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> This closes apache#328
1 parent ab3b3c7 commit 1958a8e

8 files changed

Lines changed: 1 addition & 125 deletions

File tree

‎client/tomcatconf/server7-ssl.xml.in‎

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -154,110 +154,4 @@
154154
</Host>
155155
</Engine>
156156
</Service>
157-
158-
<Service name="Catalina7080">
159-
160-
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
161-
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
162-
maxThreads="150" minSpareThreads="25"/>
163-
164-
<!-- A "Connector" represents an endpoint by which requests are received
165-
and responses are returned. Documentation at :
166-
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
167-
Java AJP Connector: /docs/config/ajp.html
168-
APR (HTTP/AJP) Connector: /docs/apr.html
169-
Define a non-SSL HTTP/1.1 Connector on port 8080
170-
-->
171-
<!--
172-
<Connector port="8080" protocol="HTTP/1.1"
173-
connectionTimeout="20000"
174-
redirectPort="8443" />
175-
-->
176-
<!-- A "Connector" using the shared thread pool-->
177-
<!--
178-
<Connector executor="tomcatThreadPool"
179-
port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
180-
connectionTimeout="20000" disableUploadTimeout="true"
181-
acceptCount="150" enableLookups="false" maxThreads="150"
182-
maxHttpHeaderSize="8192" redirectPort="8443" />
183-
-->
184-
<!-- Define a SSL HTTP/1.1 Connector on port 8443
185-
This connector uses the JSSE configuration, when using APR, the
186-
connector should be using the OpenSSL style configuration
187-
described in the APR documentation -->
188-
<!--
189-
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
190-
maxThreads="150" scheme="https" secure="true"
191-
clientAuth="false" sslProtocol="TLS"
192-
keystoreType="PKCS12"
193-
keystoreFile="conf/cloud-localhost.pk12"
194-
keystorePass="password"
195-
/>
196-
-->
197-
198-
<!-- Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 -->
199-
<Connector executor="tomcatThreadPool-internal" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
200-
maxThreads="150" scheme="https" secure="true"
201-
clientAuth="false" sslProtocol="TLS"
202-
keystoreType="JKS"
203-
keystoreFile="/etc/cloudstack/management/cloudmanagementserver.keystore"
204-
keystorePass="vmops.com"/>
205-
206-
<!-- Define an AJP 1.3 Connector on port 20400 -->
207-
<Connector port="20400" protocol="AJP/1.3" redirectPort="6443" />
208-
209-
210-
<!-- An Engine represents the entry point (within Catalina) that processes
211-
every request. The Engine implementation for Tomcat stand alone
212-
analyzes the HTTP headers included with the request, and passes them
213-
on to the appropriate Host (virtual host).
214-
Documentation at /docs/config/engine.html -->
215-
216-
<!-- You should set jvmRoute to support load-balancing via AJP ie :
217-
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
218-
-->
219-
<Engine name="Catalina7080" defaultHost="localhost">
220-
221-
<!--For clustering, please take a look at documentation at:
222-
/docs/cluster-howto.html (simple how to)
223-
/docs/config/cluster.html (reference documentation) -->
224-
<!--
225-
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
226-
-->
227-
228-
<!-- The request dumper valve dumps useful debugging information about
229-
the request and response data received and sent by Tomcat.
230-
Documentation at: /docs/config/valve.html -->
231-
<!--
232-
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
233-
-->
234-
235-
<!-- This Realm uses the UserDatabase configured in the global JNDI
236-
resources under the key "UserDatabase". Any edits
237-
that are performed against this UserDatabase are immediately
238-
available for use by the Realm. -->
239-
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
240-
resourceName="UserDatabase"/>
241-
242-
<!-- Define the default virtual host
243-
Note: XML Schema validation will not work with Xerces 2.2.
244-
-->
245-
<Host name="localhost" appBase="webapps7080"
246-
unpackWARs="true" autoDeploy="true"
247-
xmlValidation="false" xmlNamespaceAware="false">
248-
249-
<!-- SingleSignOn valve, share authentication between web applications
250-
Documentation at: /docs/config/valve.html -->
251-
<!--
252-
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
253-
-->
254-
255-
<!-- Access log processes all example.
256-
Documentation at: /docs/config/valve.html -->
257-
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
258-
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
259-
260-
</Host>
261-
</Engine>
262-
</Service>
263157
</Server>

‎debian/rules‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ override_dh_auto_install:
5656
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/
5757
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management
5858
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client
59-
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080
6059
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
6160
mkdir $(DESTDIR)/var/log/$(PACKAGE)/management
6261
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management

‎packaging/centos63/cloud.spec‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,10 +397,6 @@ if [ "$1" == "1" ] ; then
397397
/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
398398
fi
399399

400-
if [ -d "%{_datadir}/%{name}-management" ] ; then
401-
ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
402-
fi
403-
404400
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
405401
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
406402
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/

‎packaging/centos7/cloud.spec‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,6 @@ if [ "$1" == "1" ] ; then
362362
/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
363363
fi
364364

365-
if [ -d "%{_datadir}/%{name}-management" ] ; then
366-
ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
367-
fi
368-
369365
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
370366
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
371367
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/

‎packaging/fedora20/cloud.spec‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,6 @@ if [ "$1" == "1" ] ; then
398398
/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
399399
fi
400400

401-
if [ -d "%{_datadir}/%{name}-management" ] ; then
402-
ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
403-
fi
404-
405401
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
406402
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
407403
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/

‎packaging/fedora21/cloud.spec‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,6 @@ if [ "$1" == "1" ] ; then
398398
/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
399399
fi
400400

401-
if [ -d "%{_datadir}/%{name}-management" ] ; then
402-
ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
403-
fi
404-
405401
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
406402
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
407403
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/

‎python/lib/cloudutils/serviceConfig.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ def __init__(self, syscfg):
746746
if self.syscfg.env.svrMode == "myCloud":
747747
self.ports = "443 8080 8250 8443 9090".split()
748748
else:
749-
self.ports = "8080 7080 8250 9090".split()
749+
self.ports = "8080 8250 9090".split()
750750

751751
class ubuntuFirewallConfigServer(firewallConfigServer):
752752
def allowPort(self, port):

‎tools/devcloud/src/Vagrantfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Vagrant::Config.run do |config|
4040
config.vm.forward_port 8787, 8787
4141
config.vm.forward_port 8250, 8250
4242
config.vm.forward_port 8096, 8096
43-
config.vm.forward_port 7080, 7080
4443
# Ensure the VM has the right virtual resources
4544
#config.vm.
4645
config.vm.customize ["modifyvm", :id, "--memory", 2048]

0 commit comments

Comments
 (0)