diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Jenkinsfile b/Jenkinsfile old mode 100644 new mode 100755 index 69f10aff..24d5466c --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,8 +2,8 @@ pipeline { agent any parameters { - string(name: 'tomcat_dev', defaultValue: '35.166.210.154', description: 'Staging Server') - string(name: 'tomcat_prod', defaultValue: '34.209.233.6', description: 'Production Server') + string(name: 'tomcat_dev', defaultValue: '3.80.196.124', description: 'Staging Server') + string(name: 'tomcat_prod', defaultValue: '34.204.99.2', description: 'Production Server') } triggers { @@ -27,16 +27,16 @@ stages{ parallel{ stage ('Deploy to Staging'){ steps { - sh "scp -i /home/jenkins/tomcat-demo.pem **/target/*.war ec2-user@${params.tomcat_dev}:/var/lib/tomcat7/webapps" + sh "scp -o StrictHostKeyChecking=no -i /home/mauricio/aws-cert/newnvirginiakeypair.pem **/target/*.war ec2-user@${params.tomcat_dev}:/var/lib/tomcat/webapps" } } stage ("Deploy to Production"){ steps { - sh "scp -i /home/jenkins/tomcat-demo.pem **/target/*.war ec2-user@${params.tomcat_prod}:/var/lib/tomcat7/webapps" + sh "scp -o StrictHostKeyChecking=no -i /home/mauricio/aws-cert/newnvirginiakeypair.pem **/target/*.war ec2-user@${params.tomcat_prod}:/var/lib/tomcat/webapps" } } } } } -} \ No newline at end of file +} diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 diff --git a/server/pom.xml b/server/pom.xml old mode 100644 new mode 100755 diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java old mode 100644 new mode 100755 diff --git a/server/src/site/apt/index.apt b/server/src/site/apt/index.apt old mode 100644 new mode 100755 diff --git a/server/src/test/java/com/example/TestGreeter.java b/server/src/test/java/com/example/TestGreeter.java old mode 100644 new mode 100755 diff --git a/webapp/pom.xml b/webapp/pom.xml old mode 100644 new mode 100755 diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml old mode 100644 new mode 100755 diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp old mode 100644 new mode 100755 index b144b666..69104c0e --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1 +1 @@ -Hello, World! Version 10 \ No newline at end of file +Hello, World! Version 7 diff --git a/webapp/src/site/apt/index.apt b/webapp/src/site/apt/index.apt old mode 100644 new mode 100755