Repository: rave Updated Branches: refs/heads/angular 1076dedaf -> 7ac9d69d3
Removes Tomcat role from Ansible. Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/7ac9d69d Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/7ac9d69d Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/7ac9d69d Branch: refs/heads/angular Commit: 7ac9d69d3aa74d3fa80d81d1a63f0c082cd54df2 Parents: 1076ded Author: Jmeas <[email protected]> Authored: Tue Jul 15 12:52:45 2014 -0400 Committer: Jmeas <[email protected]> Committed: Tue Jul 15 12:53:33 2014 -0400 ---------------------------------------------------------------------- deploy/ansible/rave-local-playbook.yml | 1 - deploy/ansible/roles/tomcat7/handlers/main.yml | 3 - deploy/ansible/roles/tomcat7/tasks/main.yml | 42 ------ .../ansible/roles/tomcat7/templates/server.xml | 147 ------------------- .../roles/tomcat7/templates/tomcat-users.xml | 25 ---- deploy/ansible/roles/tomcat7/vars/main.yml | 3 - 6 files changed, 221 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/7ac9d69d/deploy/ansible/rave-local-playbook.yml ---------------------------------------------------------------------- diff --git a/deploy/ansible/rave-local-playbook.yml b/deploy/ansible/rave-local-playbook.yml index 5016de3..97b47ed 100644 --- a/deploy/ansible/rave-local-playbook.yml +++ b/deploy/ansible/rave-local-playbook.yml @@ -8,4 +8,3 @@ roles: - oracle-java7 - maven - - tomcat7 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/rave/blob/7ac9d69d/deploy/ansible/roles/tomcat7/handlers/main.yml ---------------------------------------------------------------------- diff --git a/deploy/ansible/roles/tomcat7/handlers/main.yml b/deploy/ansible/roles/tomcat7/handlers/main.yml deleted file mode 100644 index 0553fb1..0000000 --- a/deploy/ansible/roles/tomcat7/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: tomcat7-restart - service: name=tomcat7 state=restarted \ No newline at end of file http://git-wip-us.apache.org/repos/asf/rave/blob/7ac9d69d/deploy/ansible/roles/tomcat7/tasks/main.yml ---------------------------------------------------------------------- diff --git a/deploy/ansible/roles/tomcat7/tasks/main.yml b/deploy/ansible/roles/tomcat7/tasks/main.yml deleted file mode 100644 index 6fd6bf6..0000000 --- a/deploy/ansible/roles/tomcat7/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ -- name: Check whether or not Java 1.7 is installed - shell: "[ -d /usr/lib/jvm/java-7-openjdk-amd64 ] && echo 'Found' || echo ''" - register: jdk_installed - changed_when: jdk_installed.stdout == "" - tags: tomcat7-jdk - -- name: Install Java 1.7 - apt: pkg=openjdk-7-jdk state=present - when: (not jdk_installed.stdout) - tags: tomcat7-jdk - -- name: Check whether or not Tomcat7 is installed - shell: "[ -d /etc/tomcat7 ] && echo 'Found' || echo ''" - register: tomcat_installed - changed_when: tomcat_installed.stdout == "" - tags: tomcat7 - -- name: Update apt cache - apt: update_cache=yes - when: (not tomcat_installed.stdout) - tags: tomcat7 - -- name: Install Tomcat 7 - apt: pkg=tomcat7 state=present - when: (not tomcat_installed.stdout) - tags: tomcat7 - -- name: Install Tomcat 7 Admin Interface - apt: pkg=tomcat7-admin state=present - when: (not tomcat_installed.stdout) - tags: tomcat7 - -- name: Configure Tomcat 7 Users - template: src=tomcat-users.xml dest=/etc/tomcat7/ - when: (not tomcat_installed.stdout) - tags: tomcat7 - -- name: Load custom configuration for tomcat7 - template: src=server.xml dest=/etc/tomcat7/ - notify: tomcat7-restart - when: (not tomcat_installed.stdout) - tags: tomcat7 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/rave/blob/7ac9d69d/deploy/ansible/roles/tomcat7/templates/server.xml ---------------------------------------------------------------------- diff --git a/deploy/ansible/roles/tomcat7/templates/server.xml b/deploy/ansible/roles/tomcat7/templates/server.xml deleted file mode 100644 index 5fef9d4..0000000 --- a/deploy/ansible/roles/tomcat7/templates/server.xml +++ /dev/null @@ -1,147 +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"> - <!-- Security listener. Documentation at /docs/config/listeners.html - <Listener className="org.apache.catalina.security.SecurityListener" /> - --> - <!--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" /> - <!-- Prevent memory leaks due to use of particular java/javax APIs--> - <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> - <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> - <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> - - <!-- 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="4"/> - --> - - - <!-- 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="{{ tomcat_default_port }}" protocol="HTTP/1.1" - connectionTimeout="20000" - URIEncoding="UTF-8" - redirectPort="8443" /> - <!-- A "Connector" using the shared thread pool--> - <!-- - <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" - 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" /> - --> - - <!-- Define an AJP 1.3 Connector on port 8009 --> - <!-- - <Connector port="8009" 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"/> - --> - - <!-- Use the LockOutRealm to prevent attempts to guess user passwords - via a brute-force attack --> - <Realm className="org.apache.catalina.realm.LockOutRealm"> - <!-- 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"/> - </Realm> - - <Host name="localhost" appBase="webapps" - unpackWARs="true" autoDeploy="true"> - - <!-- 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 - Note: The pattern used is equivalent to using pattern="common" --> - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" - prefix="localhost_access_log." suffix=".txt" - pattern="%h %l %u %t "%r" %s %b" /> - - </Host> - </Engine> - </Service> -</Server> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/rave/blob/7ac9d69d/deploy/ansible/roles/tomcat7/templates/tomcat-users.xml ---------------------------------------------------------------------- diff --git a/deploy/ansible/roles/tomcat7/templates/tomcat-users.xml b/deploy/ansible/roles/tomcat7/templates/tomcat-users.xml deleted file mode 100644 index d738baa..0000000 --- a/deploy/ansible/roles/tomcat7/templates/tomcat-users.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> - -<!-- {{ ansible_managed }} --> - -<!-- - 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. ---> -<tomcat-users> - - <user username="{{ tomcat_admin_username }}" password="{{ tomcat_admin_password }}" roles="manager-gui" /> - -</tomcat-users> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/rave/blob/7ac9d69d/deploy/ansible/roles/tomcat7/vars/main.yml ---------------------------------------------------------------------- diff --git a/deploy/ansible/roles/tomcat7/vars/main.yml b/deploy/ansible/roles/tomcat7/vars/main.yml deleted file mode 100644 index 6e564cd..0000000 --- a/deploy/ansible/roles/tomcat7/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -tomcat_admin_username: rave -tomcat_admin_password: rave -tomcat_default_port: 8200 \ No newline at end of file
