From c6656665846db4f383a6d5a639a368ed870723d3 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Mon, 23 Oct 2017 19:35:12 +0800 Subject: [PATCH] provide tomcat conf files Change-Id: Ic162365419ebf483033f05d37e366b5ca89c1692 Issue-ID: VFC-544 Signed-off-by: yufei_zhou --- .../src/main/release/conf/catalina.policy | 54 +++-------------- .../src/main/release/conf/catalina.properties | 64 ++++++++------------- .../deployment/src/main/release/conf/context.xml | 8 +-- .../src/main/release/conf/jaspic-providers.xml | 23 -------- .../src/main/release/conf/jaspic-providers.xsd | 53 ----------------- .../src/main/release/conf/logging.properties | 6 ++ .../deployment/src/main/release/conf/server.p12 | Bin 0 -> 2661 bytes .../deployment/src/main/release/conf/trust.jks | Bin 0 -> 1321 bytes .../deployment/src/main/release/conf/web.xml | 5 +- .../vfcadaptorservice/docker/docker-entrypoint.sh | 3 +- 10 files changed, 41 insertions(+), 175 deletions(-) delete mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xml delete mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xsd create mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 create mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.policy b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.policy index a48a027f..9f991047 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.policy +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.policy @@ -14,7 +14,7 @@ // limitations under the License. // ============================================================================ -// catalina.policy - Security Policy Permissions for Tomcat +// catalina.policy - Security Policy Permissions for Tomcat 7 // // This file contains a default set of security policies to be enforced (by the // JVM) when Catalina is executed with the "-security" option. In addition @@ -59,10 +59,7 @@ grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { permission java.security.AllPermission; }; -// These permissions apply to the logging API -// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home}, -// update this section accordingly. -// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..} + grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { permission java.io.FilePermission "${java.home}${file.separator}lib${file.separator}logging.properties", "read"; @@ -78,26 +75,14 @@ grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { permission java.lang.RuntimePermission "getClassLoader"; permission java.lang.RuntimePermission "setContextClassLoader"; - permission java.lang.management.ManagementPermission "monitor"; - permission java.util.logging.LoggingPermission "control"; permission java.util.PropertyPermission "java.util.logging.config.class", "read"; permission java.util.PropertyPermission "java.util.logging.config.file", "read"; - permission java.util.PropertyPermission "org.apache.juli.AsyncLoggerPollInterval", "read"; - permission java.util.PropertyPermission "org.apache.juli.AsyncMaxRecordCount", "read"; - permission java.util.PropertyPermission "org.apache.juli.AsyncOverflowDropType", "read"; permission java.util.PropertyPermission "org.apache.juli.ClassLoaderLogManager.debug", "read"; permission java.util.PropertyPermission "catalina.base", "read"; - // Note: To enable per context logging configuration, permit read access to - // the appropriate file. Be sure that the logging configuration is - // secure before enabling such access. - // E.g. for the examples web application (uncomment and unwrap - // the following to be on a single line): - // permission java.io.FilePermission "${catalina.base}${file.separator} - // webapps${file.separator}examples${file.separator}WEB-INF - // ${file.separator}classes${file.separator}logging.properties", "read"; + }; // These permissions apply to the server startup code @@ -113,19 +98,13 @@ grant codeBase "file:${catalina.home}/lib/-" { }; -// If using a per instance lib directory, i.e. ${catalina.base}/lib, -// then the following permission will need to be uncommented -// grant codeBase "file:${catalina.base}/lib/-" { -// permission java.security.AllPermission; -// }; - // ========== WEB APPLICATION PERMISSIONS ===================================== // These permissions are granted by default to all web applications // In addition, a web application will be given a read FilePermission -// for all files and directories in its document root. +// and JndiPermission for all files and directories in its document root. grant { // Required for JNDI lookup of named JDBC DataSource's and // javamail named MimePart DataSource used to send mail @@ -189,7 +168,10 @@ grant { // Applications using Comet need to be able to access this package permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.comet"; - // Applications using WebSocket need to be able to access these packages + // Applications using the legacy WebSocket implementation need to be able to access this package + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.websocket"; + + // Applications using the JSR-356 WebSocket implementation need to be able to access these packages permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server"; }; @@ -228,23 +210,3 @@ grant codeBase "file:${catalina.home}/webapps/manager/-" { // included a JDBC driver that needed to establish a network connection to the // corresponding database and used the scrape taglib to get the weather from // the NOAA web server. You might create a "grant" entries like this: -// -// The permissions granted to the context root directory apply to JSP pages. -// grant codeBase "file:${catalina.base}/webapps/examples/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; -// -// The permissions granted to the context WEB-INF/classes directory -// grant codeBase "file:${catalina.base}/webapps/examples/WEB-INF/classes/-" { -// }; -// -// The permission granted to your JDBC driver -// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar!/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// }; -// The permission granted to the scrape taglib -// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; - diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.properties b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.properties index 830b29a3..a2393bb4 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.properties +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/catalina.properties @@ -19,7 +19,8 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. -package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat. +package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\ +org.apache.naming.resources.,org.apache.tomcat. # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when @@ -45,12 +46,7 @@ org.apache.jasper.,org.apache.naming.,org.apache.tomcat. # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository -# -# Note: Values are enclosed in double quotes ("...") in case either the -# ${catalina.base} path or the ${catalina.home} path contains a comma. -# Because double quotes are used for quoting, the double quote character -# may not appear in a path. -common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar" +common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar # # List of comma-separated paths defining the contents of the "server" @@ -63,11 +59,6 @@ common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.ho # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository -# -# Note: Values may be enclosed in double quotes ("...") in case either the -# ${catalina.base} path or the ${catalina.home} path contains a comma. -# Because double quotes are used for quoting, the double quote character -# may not appear in a path. server.loader= # @@ -82,21 +73,15 @@ server.loader= # "foo/bar.jar": Add bar.jar as a class repository # Please note that for single jars, e.g. bar.jar, you need the URL form # starting with file:. -# -# Note: Values may be enclosed in double quotes ("...") in case either the -# ${catalina.base} path or the ${catalina.home} path contains a comma. -# Because double quotes are used for quoting, the double quote character -# may not appear in a path. shared.loader= -# Default list of JAR files that should not be scanned using the JarScanner +# List of JAR files that should not be scanned using the JarScanner # functionality. This is typically used to scan JARs for configuration # information. JARs that do not contain such information may be excluded from # the scan to speed up the scanning process. This is the default list. JARs on -# this list are excluded from all scans. The list must be a comma separated list -# of JAR file names. -# The list of JARs to skip may be over-ridden at a Context level for individual -# scan types by configuring a JarScanner with a nested JarScanFilter. +# this list are excluded from all scans. Scan specific lists (to exclude JARs +# from individual scans) follow this. The list must be a comma separated list of +# JAR file names. # The JARs listed below include: # - Tomcat Bootstrap JARs # - Tomcat API JARs @@ -105,14 +90,13 @@ shared.loader= # - Tomcat JARs # - Common non-Tomcat JARs # - Test JARs (JUnit, Cobertura and dependencies) -tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\ +tomcat.util.scan.DefaultJarScanner.jarsToSkip=\ bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\ annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\ -catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-storeconfig.jar,\ -catalina-tribes.jar,\ +catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\ jasper.jar,jasper-el.jar,ecj-*.jar,\ -tomcat-api.jar,tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,\ -tomcat-dbcp.jar,tomcat-jni.jar,tomcat-websocket.jar,\ +tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\ +tomcat-jni.jar,tomcat-spdy.jar,\ tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\ tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\ tomcat-jdbc.jar,\ @@ -121,26 +105,26 @@ commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\ commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\ commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\ commons-math*.jar,commons-pool*.jar,\ -jstl.jar,taglibs-standard-spec-*.jar,\ +jstl.jar,\ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\ ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\ -jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\ +jmx-tools.jar,jta*.jar,log4j.jar,log4j-1*.jar,mail*.jar,slf4j*.jar,\ xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\ -junit.jar,junit-*.jar,ant-launcher.jar,\ +junit.jar,junit-*.jar,hamcrest*.jar,org.hamcrest*.jar,ant-launcher.jar,\ cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\ jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\ xom-*.jar -# Default list of JAR files that should be scanned that overrides the default -# jarsToSkip list above. This is typically used to include a specific JAR that -# has been excluded by a broad file name pattern in the jarsToSkip list. -# The list of JARs to scan may be over-ridden at a Context level for individual -# scan types by configuring a JarScanner with a nested JarScanFilter. -tomcat.util.scan.StandardJarScanFilter.jarsToScan=\ -log4j-core*.jar,log4j-taglib*.jar,log4javascript*.jar,slf4j-taglib*.jar +# Additional JARs (over and above the default JARs listed above) to skip when +# scanning for Servlet 3.0 pluggability features. These features include web +# fragments, annotations, SCIs and classes that match @HandlesTypes. The list +# must be a comma separated list of JAR file names. +org.apache.catalina.startup.ContextConfig.jarsToSkip= +# Additional JARs (over and above the default JARs listed above) to skip when +# scanning for TLDs. The list must be a comma separated list of JAR file names. +org.apache.catalina.startup.TldConfig.jarsToSkip=tomcat7-websocket.jar + +# # String cache configuration. tomcat.util.buf.StringCache.byte.enabled=true -#tomcat.util.buf.StringCache.char.enabled=true -#tomcat.util.buf.StringCache.trainThreshold=500000 -#tomcat.util.buf.StringCache.cacheSize=5000 diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/context.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/context.xml index 98727cb7..64de61ff 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/context.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/context.xml @@ -1,4 +1,4 @@ - + - - - diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xml deleted file mode 100644 index cdebf872..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xsd b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xsd deleted file mode 100644 index 73a87aa2..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/jaspic-providers.xsd +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/logging.properties b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/logging.properties index cb5ed661..a2ad9c27 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/logging.properties +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/logging.properties @@ -62,3 +62,9 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha # To see debug messages in TldLocationsCache, uncomment the following line: #org.apache.jasper.compiler.TldLocationsCache.level = FINE + +# To see debug messages for HTTP/2 handling, uncomment the following line: +#org.apache.coyote.http2.level = FINE + +# To see debug messages for WebSocket handling, uncomment the following line: +#org.apache.tomcat.websocket.level = FINE diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 new file mode 100644 index 0000000000000000000000000000000000000000..5bc1b7a970c62bd70dabed468b84df7ae6625b23 GIT binary patch literal 2661 zcmV-r3YzsWf(l^*0Ru3C3MU2$Duzgg_YDCD0ic2k7zBa}6flAc5HNxS#|8;1hDe6@ z4FLxRpn?RrFoFcM0s#Opf&{Gw2`Yw2hW8Bt2LUh~1_~;MNQUGPVHoOPpcfoK`bZ&v8$d>t*J?N zH)Hb`A>k=c?ZeRPW^$|bKjNCsFWtZ^h8PSv$48(F>E?OFu?cR`;{mN9l0ObOE+jN- z*aw}Xr{6jfXFqKhvAO%v(p7&ch%3}kPdCj%M0>`LDnC#?4+cHIb4J)%YR-peQ-Cl= zFlG@6FNZy8r|$DEr{&1)?sT_Xa~r73Mucvi2!W}+n4g(<0XK+bfR#>Qs2?4+XZeG? zd2ztfK&wv?v~ix4e28#lKe-og+0wnH>zY7eRHo5V9+SzQ>XG{g*cEA0oPjnVyL4d~5a>;%N5ll`gDSUh(T+EQ=rm`;8k>M;j z;f)HLku_VGMbTbR+Z2edld$nQolv_GDhTd;4L7^`gar&GO53}S6qo}T)@+oAlxdTq z(sh0lVfS6&vG5N2_u%jTw0wPzE=!UDhZgVV4SA_H2!I$D`C8XLm0qGW5jatND56^# zFw~It61s%lTgNB5{(1EB8ej)L z{RcUL9_GTz)S)G{bwaxI3;e4`x*S#qzV?Lno;gt?{d#(4n0 z#_fH6jV#jopM$zjgQHXQ3Pn1hTlMO4Cspb-h+>b7CxPeq{~q}BO30O{#o8x!PC<)X#EB~%xJn3=6;v&2UWawnCnZcSt$^VuS`#;7bG8qgIF*p+w1T%yy$G(-4DNW*Aj?zpDj zE>XUhxWuzujs5HtpkQpN-ny;&NR7*zv)V}aM$VB}vj??q6Bfv@((F2jirpnZ-z<<* zpG+0tBx^T8y2vD`k3OVk8L92uHP_I)CuQ$@2qB=^y~ua=PIZ(*<{-`)0P*m{H)n&C z6e+tmA(l_Vi%KdhTchF=;@eN3FoFd^1_>&LNQUT?3EykGp|DIf_(W)cJITu7PaNCvC{3f?+oU>$-O9D zr3D|I)Q)m;n_%2Xb;F_;A3mSuIjhm!+xCZQRljrB9(4J$u(|+rXLd=rBBaH003IKT zVCC&Wq#UeGk5BBnnBaUgUdsn%eML2iSWmILc3=Z;l=^T0HTcGad@ObtZ7bIQFr!1c zu+o8lz5#hsLB1zWUQ>c9$DZs}z~-gBeqh%v#b?$yfE7Bo zz^nL#y2>WHw(G-wWft(!>v$zbdu60A%wKQ&F{M6lD|Aa`t599FNJA*T6~=5ti8H+m zD#)?SvubK0u}abH^fJyipmLkW+&})ZE<&j~!=cXLW~x8lX8h92z&5kQfrIMD0OkZ0 zJ7$?Yajj|m!Hue_{$+&jMc+n%AYl9l zfgs%Bh`jhId=Ejo>%9Z&e0XG&2Jnik{f9wmCjswBPZ&6+9bw4=#_4SO+7G7skMdD+ zN%e95LS3+jhc3iFr*adjW)L`wAFM{%e5p>1N_oDj3~}523G&!Dop&O#A>X^u2Nb_%;xj?uB$51I8Vfk{>kO*Uzr5fYTCqm zwf-8aVc;f#mM@A7BJ(AOH@Qv_Xx+_GW?UDKfyeIR%J8Z1mo*(iD%9W|xXCdM;uTO! zzv38LBPFq2g@-7}ZXYZ05)nk3TV|0zF_3}6afL0H-XRZql;Ib}M{Xq+p=5K!zddgw z_~cbJqdJcP&t$zIzo_DhX`Yr z(Y2V3w8{>aTI##uk_w7(z<3z`6Nlc|K|J3V7_91@yCK%fB3=R z3-v&U5o9rzIb2JbAhCXvl5?Bp`#lk%VpE}6E8cv({Cn;n=k3hV2Dy74=`@cs^2N3Q z4Yaznuq3tM!i@RsufNkzSu@Ot30uh>F40SqmQ5*8x}7x2FL0~Ve5)FjYd1rbfEPxj z(`jQUw@^e-(j4d%Tz{G@O1J&Ot!OCU5l?%hrf=y1wwnab-##^by#Jh&X<&!{RE~&^ zM8QhUb;?u=O!ql8!pGxU9&upoAaL5uyh literal 0 HcmV?d00001 diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks new file mode 100644 index 0000000000000000000000000000000000000000..30b62ce8077a956fbbf4a57568ead6c67d87d57e GIT binary patch literal 1321 zcmezO_TO6u1_mY|W(3o$xs}$7)N1o+`_9YA$j!=NU}MN_z{$oO%EBhh2M%63R6wCSbanfeOfUZeiK*%%aqs)Z$_VztocQ{Gx1yfTH}A(&Q2apUk{e zLu~_1h%1z!uE41r=%^+}C1hVRvNA9?G4eA2#krW87#SH3nt#3AUYP!V;kmnpm+IHK zPFuKgiG;!Xto6II_pGvs@!vXYk6Z4yi+9^?m^OEca^F9;e$$kG?{{m~%_(H>U_T%> zb>+HsFZTRXZOz_%Os-*j!wn7LR~Ne4(r-pH#Zz@IRA;RdDH&wKb{|EYN;KP=hRmb-n*q+=Ic9)8$Xc5|1|H<@%h zu7y?yL|rbmHs6@@R>e8_QqEMTRlDmF@;CP!$}e5`=A1*K*B;L&&$`WCxE%U-ps{ko zRiW@dLK1n$_+{6qST_D(eelnSC!6W}thi&W%UjbFsvH^)Zq`ZM7*oekS^k`fnUR5U zapM|;#+3&0z+jbCW|1%uYY@@;ArPtFU@E`7W|#GRttVcqW>0!$;098lz+!J;YhcaB z0%S567#kR}acHwKva+%>F^Z{Xl#~=$>FXDl78K+cmFQ)F(~VwoelAQ%zaTr)fFERz zFbjtP8zbX?CPoGWK9B%Eki)_POsZ@KvLHSmix`VYT!HwV{3Yxj%;xR?Y_}X&xMsHF z0&;``lPz--&6p}}=Qg_pX3I2P4EwM0>vu`c;sQmzGoOQ29NW3( zN96OzS6OG>XZ!W*+U%!`FUPKa>FdEI7GAb+)*ALi@dEvyS4uKhag~Q1*ElOOWzOV? z^Ltw558ODR-uEuJJg*>Nz1t=0h0WV9euzG`YqtJE`P${XH$C#tU#6NhOO_O)le8+vPo04rzrwbm~^5)`n?Qhj*qW*=tS}1Z} z?NPq;gZ1|n*^tZC8cl+rY zugCw?+a1Jfedh$74PH@l@BY`0()DXk`L^6GIAVSHl)$g~ysixu%S;UPBbmI5&x=cj z#hotBt(jx<;?|l9VX@G)|L*uZZ@Ky0kSVL{g6PWfkKb>}Ph*~*n)66&Nri5FID0_h zcEcy0#f#czn;btn`OWLQyMA2#RMPX*fa|EwmKhn^d1lL;Z*_U^eHzxV=eNhIUt3nh zDm{oeZTm>#HjkQB44>jU_1T;Do#nH=y=+0$$t&yDy5(Qc$eR2A%F_1Qdkcd8?5ty$ z5^?K)x6s!6H9IApqgRWvI?i}@PTQf2>09;_`8r?59pajq@w%&yx`*w&!9C%I&dF!< z^J~Q7{Q7rBKbBc_IEPEQi{+_)&Gl~^D=H4KiWLbtPpAp2y!A`^m0q4o=e)(t>blNL E08f$|_5c6? literal 0 HcmV?d00001 diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml index c98ff28c..793a8a88 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml @@ -1,4 +1,4 @@ - + - - - diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh index 8a2fab86..92a16283 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/docker-entrypoint.sh @@ -43,8 +43,7 @@ echo ./instance-config.sh # Start mysql -# su mysql -c /usr/bin/mysqld_safe & -service mysql start +su mysql -c /usr/bin/mysqld_safe & # Perform one-time config if [ ! -e init.log ]; then -- 2.16.6