Merge branch 'staging' into QA

Author: chiragob

README.md

@@ -1,5 +1,3 @@
 # Flowz
 Flowz working on flow base programming
 
-
-

client/Dockerfile

@@ -42,6 +42,7 @@ RUN cp /opt/app/.htaccess /var/www/html/
 RUN cp /opt/app/vhost_ssl_master.conf /etc/apache2/sites-enabled/
 RUN cp /opt/app/vhost_ssl_develop.conf /etc/apache2/sites-enabled/
 RUN cp /opt/app/vhost_ssl_qa.conf /etc/apache2/sites-enabled/
+RUN cp /opt/app/vhost_ssl_staging.conf /etc/apache2/sites-enabled/
 RUN rm -rf /opt/app/*
 RUN a2enmod rewrite
 RUN a2enmod ssl

client/cert/cert_staging.pem

@@ -0,0 +1,42 @@
+-----BEGIN CERTIFICATE-----
+MIIHazCCBlOgAwIBAgISBAEhajKiWtL4TSFpXyHp8jQCMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAzMDcxNzA0MTdaFw0x
+ODA2MDUxNzA0MTdaMB8xHTAbBgNVBAMTFGFwaS5mbG93emRpZ2l0YWwuY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvZTC3289jxPguEBkDMZfBm5r
+jpycXvjzy4fkmt9ihPlXulCKlMXBQmgkJHFR7w79eGL5luPmFfaCJfFpgLRLYwak
+KrqOiZ7U/W8wwGd/MVWZFnCgCAkd2M27Zzg3/qhWAxwWWotxsqygBwPvd0pQ5yC5
+xN2LuUwE6wYLxrgt2FgGbnbyjG27rdcwHrQRCqKG19LaHxkGhAqsAgu3vAZYdUml
+aZ4Brem/5tI82Coli1KVqOYBjF6FOs5ALxnUh2Va2ZFIWCii0u7QUKMoUzgDKalG
+svofcajO4y8PD0jZ6amGacE8E5MAUOHSdnnFH0ROUn9ABcl7PguanDMt9tCGCQID
+AQABo4IEdDCCBHAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTlsygyjGvjIFpMsJ59
+e4ZNe9TqQzAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEF
+BQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5j
+cnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5j
+cnlwdC5vcmcvMIICfQYDVR0RBIICdDCCAnCCFGFwaS5mbG93emRpZ2l0YWwuY29t
+ghVhdXRoLmZsb3d6ZGlnaXRhbC5jb22CFGNybS5mbG93emRpZ2l0YWwuY29tghpk
+YXNoYm9hcmQuZmxvd3pkaWdpdGFsLmNvbYIWZGJldGwuZmxvd3pkaWdpdGFsLmNv
+bYIcZGlzdHJpYnV0b3IuZmxvd3pkaWdpdGFsLmNvbYIXZW5naW5lLmZsb3d6ZGln
+aXRhbC5jb22CFG1vbS5mbG93emRpZ2l0YWwuY29tghl1cGxvYWRlci5mbG93emRp
+Z2l0YWwuY29tghZ2bWFpbC5mbG93emRpZ2l0YWwuY29tghp2c2hvcGRhdGEuZmxv
+d3pkaWdpdGFsLmNvbYIbd2ViYnVpbGRlci5mbG93emRpZ2l0YWwuY29tghN3cy5m
+bG93emRpZ2l0YWwuY29tghh3d3cuY3JtLmZsb3d6ZGlnaXRhbC5jb22CHnd3dy5k
+YXNoYm9hcmQuZmxvd3pkaWdpdGFsLmNvbYIad3d3LmRiZXRsLmZsb3d6ZGlnaXRh
+bC5jb22CIHd3dy5kaXN0cmlidXRvci5mbG93emRpZ2l0YWwuY29tght3d3cuZW5n
+aW5lLmZsb3d6ZGlnaXRhbC5jb22CGHd3dy5tb20uZmxvd3pkaWdpdGFsLmNvbYId
+d3d3LnVwbG9hZGVyLmZsb3d6ZGlnaXRhbC5jb22CGnd3dy52bWFpbC5mbG93emRp
+Z2l0YWwuY29tgh53d3cudnNob3BkYXRhLmZsb3d6ZGlnaXRhbC5jb22CH3d3dy53
+ZWJidWlsZGVyLmZsb3d6ZGlnaXRhbC5jb20wgf4GA1UdIASB9jCB8zAIBgZngQwB
+AgEwgeYGCysGAQQBgt8TAQEBMIHWMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxl
+dHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENlcnRpZmljYXRl
+IG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFydGllcyBhbmQg
+b25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmljYXRlIFBvbGljeSBm
+b3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkq
+hkiG9w0BAQsFAAOCAQEAaguDAcVjGwhzjnA+ch3ROhwBEbHv0PEFpYs/uv9eGBGd
+0Kkn0LHuzheGvEA54W4XhN/Ee9241YMuWAQye7y7O2JHUee+9H1JNHWMp0RJn4uy
+cTz+4d3jlPEvPdAufNWbAaFsE3QsBxp/IJOmJGIfmBlebepeC2kdP6sBR9dBSWkV
+MlbYmJM7lGjdyALIxTBR8zra7mFoaXi6rn+C76apIkRyRRRBx4ZDXOrKTs22ShE1
+FDhf9MjPsGo3RXRseGGVU0ner8A2pf2QP/QkBcjlYgDJnWeU85w3hSvi7ZCNqzHg
+pW2WSrYNios7TgoGr5FfpnJRgKKSnExnsrbSIc7fUA==
+-----END CERTIFICATE-----

client/privkey/privkey_staging.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAvZTC3289jxPguEBkDMZfBm5rjpycXvjzy4fkmt9ihPlXulCK
+lMXBQmgkJHFR7w79eGL5luPmFfaCJfFpgLRLYwakKrqOiZ7U/W8wwGd/MVWZFnCg
+CAkd2M27Zzg3/qhWAxwWWotxsqygBwPvd0pQ5yC5xN2LuUwE6wYLxrgt2FgGbnby
+jG27rdcwHrQRCqKG19LaHxkGhAqsAgu3vAZYdUmlaZ4Brem/5tI82Coli1KVqOYB
+jF6FOs5ALxnUh2Va2ZFIWCii0u7QUKMoUzgDKalGsvofcajO4y8PD0jZ6amGacE8
+E5MAUOHSdnnFH0ROUn9ABcl7PguanDMt9tCGCQIDAQABAoIBAB5Q25i/QSjQFO9h
+3J3uWuO8ZJa5lIfbZ6D0aioZ7rc06EJy/rYrqWvlG2J4fJGt4/qMWT031GNOuCE5
+KZXbPvLm7PmoO4LmU0jzrugVpNFOztw3xl+ClbNFsuIeq1WdtaNpqmlwQw4/bJey
+mWiKCcXsBcjlZKKM9XxfyyJL8YjWxDWe4ueUkZLyUM2Eo4jdL0otoF05CHNbcqAP
+aFyqAqGVKQaKFJNhfZBXUgSK/XF5DUeAvqTc196C/bXW4kBwgrPuqJNY36y0a2En
+rgjtb17pnQ/TYruNOw60WDb7sTeFQVUqhLHu+4nWgK7QuaVVp9SFdglmXTCp2kvX
+zm3+DwECgYEA4ero6cyOZzPoq0kfLg+Be8o3GsJoEIz+YNXQ2sRtiOlpTpT9rjnU
+KfXUXw/n5I2CoIyVbim/erNwtHhKUXFvrJ9KSJmQX+/v/crNjgjYMv0YltN95t8D
+4OscnOMplm2upzmn/GWD1UizGn5DEASIb552ZMOVRjF+VYwZADrZcz0CgYEA1tM1
+4xIoMYILWXSFOjMAZ4CXMNTXH9+AniP4/xDxjG37cFcXQrWY4oBPfoS3dQ890Fut
+1hT0UvKUvxbYTcCwbNlQ2vTi1nzi4BDmCao9m3/8RClXz3aBM6NGQjaUULHB+9r/
+NmLtnh087DZSpCZ54yUNrfLzjsU/OZbj/ej/Wr0CgYBIX5v8AkcActWvwb4WYGtH
+v/FFRlBWNQTs+rJs0w6QFM5imUJnhSkdxB4j0hGk21ykmETqxL8NzNxnRD3yt1di
+QqlmdqOUyGXmtQiC3vx74S72aoxj4L/6VveUnwVcpoiUE9ln9xFzy1VtQFO1lu4q
+a+Zbw3hXw1VIjJgZxcCRtQKBgHiVuDLMt1kK6Tn+aOZBSKHQkY1se5C9kWGzSYpL
+RXsRJUlq6XidnMLPSU/4SU5hDs6NF6gKvRZuakZVGXeTiLSgy30MZuQE2Aj0E1wr
+fkdx8PWFy2990opcxQxXvKsLDJtF02oA3+aX/OGOoJbZriNtYh9ZN5PVbmbyJuoY
+xnV1AoGBAKgbssqI6tIN+y8p/9fuGWJfxmNZbPbXpXEcrz6HcWa9TckAT8Gh94wp
+lxbFmr1slKCqINCjDYy/jr6Z2GSD0kHxGhinLJlsC3bDEz0t7jDnLoei9wBqTNv0
+SLDyzGB0uPeY1e1opyAX6u1ZyTuDFm4t7Ja5Oh0U1xqZvH/SINaj
+-----END RSA PRIVATE KEY-----

client/vhost_ssl_staging.conf

@@ -7,16 +7,16 @@ DocumentRoot "/var/www/html/"
   AllowOverride All
   Require all granted
 </Directory>
-SSLEngine on
-SSLCertificateFile /etc/ssl/cert/cert_master.pem
-SSLCertificateKeyFile /etc/ssl/privkey/privkey_master.pem
+SSLEngine On
+SSLCertificateFile /etc/ssl/cert/cert_staging.pem
+SSLCertificateKeyFile /etc/ssl/privkey/privkey_staging.pem
 </VirtualHost>
 
 
 <VirtualHost *:80>
 ServerName www.engine.flowzstaging.tk
 ServerAlias *.flowzstaging.tk
-#Redirect / https://www.engine.flowzstaging.tk
+#Redirect / https://www.engine.flowzdigital.com
 DocumentRoot "/var/www/html/"
 <Directory "/var/www/html/">
   Options Indexes FollowSymLinks

upgrade.sh

@@ -50,6 +50,7 @@ elif [ "$TRAVIS_BRANCH" = "staging" ]
 then
     {
       echo "call $TRAVIS_BRANCH branch"
+
       ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_STAGING":"$RANCHER_SECRETKEY_STAGING"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_STAGING/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
       echo $ENV_ID
       USERNAME="$DOCKER_USERNAME";