Page MenuHomeDevCentral
Files F12271433

D3755.id9714.diff
No OneTemporary
Actions

D3755.id9714.diff
View Options

diff --git a/roles/paas-docker/containers/files/orbeon/server.xml b/roles/paas-docker/containers/files/orbeon/server.xml
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/containers/files/orbeon/server.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Tomcat configuration
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Project: Nasqueron
+ License: Apache License 2.0
+ License note: Apache manages the Tomcat project.
+ Apache Software Foundation (ASF) claims copyright
+ on all their files, including template for config.
+ Source file: roles/paas-docker/containers/files/orbeon/server.xml
+ _____________________________________________________________
+
+ <auto-generated>
+ This file is managed by our rOPS SaltStack repository.
+
+ Changes to this file may cause incorrect behavior
+ and will be lost if the state is redeployed.
+ </auto-generated>
+-->
+
+<Server port="8005" shutdown="SHUTDOWN">
+ <Listener className="org.apache.catalina.startup.VersionLoggerListener"/>
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
+
+ <GlobalNamingResources>
+ <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>
+
+ <Service name="Catalina">
+ <Connector port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443"
+ maxParameterCount="1000"
+ />
+
+ <Engine name="Catalina" defaultHost="localhost">
+ <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"
+ digest="SHA-256"
+ />
+ </Realm>
+
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true" autoDeploy="true">
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="localhost_access_log" suffix=".txt"
+ pattern="%h %l %u %t &quot;%r&quot; %s %b"/>
+ </Host>
+ </Engine>
+ </Service>
+</Server>
diff --git a/roles/paas-docker/containers/orbeon.sls b/roles/paas-docker/containers/orbeon.sls
--- a/roles/paas-docker/containers/orbeon.sls
+++ b/roles/paas-docker/containers/orbeon.sls
@@ -72,7 +72,7 @@
user: {{ salt["credentials.get_username"](container["db"]["credential"]) }}
pass: {{ salt["credentials.get_password"](container["db"]["credential"]) | yaml_dquote }}
-{% for config_file in ["web.xml", "form-builder-permissions.xml"] %}
+{% for config_file in ["server.xml", "web.xml", "form-builder-permissions.xml"] %}
/srv/orbeon/{{ instance }}/conf/{{ config_file }}:
file.managed:
- source: salt://roles/paas-docker/containers/files/orbeon/{{ instance }}/{{ config_file }}
@@ -89,6 +89,7 @@
- image: nasqueron/orbeon
- binds:
- /srv/orbeon/{{ instance }}/conf/tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml
+ - /srv/orbeon/{{ instance }}/conf/server.xml:/usr/local/tomcat/conf/server.xml
- /srv/orbeon/{{ instance }}/conf/orbeon.xml:/usr/local/tomcat/conf/Catalina/localhost/orbeon.xml
- /srv/orbeon/{{ instance }}/conf/web.xml:/usr/local/tomcat/webapps/orbeon/WEB-INF/web.xml
- /srv/orbeon/{{ instance }}/conf/form-builder-permissions.xml:/usr/local/tomcat/webapps/orbeon/WEB-INF/resources/config/form-builder-permissions.xml

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 16, 18:41 (21 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3079786
Default Alt Text
D3755.id9714.diff (4 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator