diff --git a/Jenkinsfile b/Jenkinsfile index a5891cf..7e94eb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,8 +21,7 @@ pipeline { echo "Tomcat is not running, skipping shutdown..." ) else ( echo "Tomcat is running, shutting down..." - cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call shutdown.bat + net stop Tomcat10 ping -n 5 127.0.0.1 > nul ) @@ -35,9 +34,8 @@ pipeline { ping -n 5 127.0.0.1 > nul echo "start" - cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call startup.bat - ping -n 5 127.0.0.1 > nul + net start Tomcat10 + ping -n 15 127.0.0.1 > nul ''' } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..57b8c7e --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,4 @@ + ssl: + key-store: classpath:localhost.p12 + key-store-password: pmgk1234 + key-store-type: PKCS12 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7060bfc..911b646 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -82,10 +82,6 @@ server: secure: true same-site: NONE partitioned: true - ssl: - key-store: classpath:localhost.p12 - key-store-password: pmgk1234 - key-store-type: PKCS12 logging: level: