From 87591f9f4697f7c4501ed4c1c05bccc80bab03bc Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 12 Sep 2016 10:08:08 -0400 Subject: [PATCH 01/13] Retest with better tag passing through errors --- Jenkinsfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 84dbff0..42fae38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,6 +30,7 @@ node('docker') { if(!imagename){ echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' + exit 1 } if(maintainer){ echo "Building ${imagename}:${tag} for ${maintainer}" @@ -52,7 +53,7 @@ node('docker') { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem composing COmanage appliance (${tag}). \n\n ${error_details}" sh "rm -f ./debug" - handleError(message) + handleError(message, tag) } stage 'Tests' @@ -63,12 +64,12 @@ node('docker') { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem testing COmanage appliance :${tag}. \n\n ${error_details}" sh "rm -f ./debug" - handleError(message) + handleError(message, tag) } stage 'Clean Up' - cleanup() + cleanup(tag) stage 'Notify' @@ -86,7 +87,7 @@ def imagename() { matcher ? matcher[0][1] : null } -def handleError(String message){ +def handleError(String message, String tag){ echo "${message}" currentBuild.setResult("FAILED") slackSend color: 'danger', message: "${message}" @@ -95,7 +96,7 @@ def handleError(String message){ sh 'exit 1' } -def cleanup() { +def cleanup(String tag) { try{ sh 'bin/decompose.sh &> debug' sh 'bin/prune.sh &> debug' From b9e27293256976c8dc2abad88f4bb13f0fa6f20a Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 12 Sep 2016 10:11:43 -0400 Subject: [PATCH 02/13] Missed one --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 42fae38..6a17b7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ node('docker') { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem building COmanage appliance (${tag}). \n\n ${error_details}" sh "rm -f ./debug" - handleError(message) + handleError(message, tag) } stage 'Compose' From 2afd97c002ec9c006be905b1bb51487367c1e3a5 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 12 Sep 2016 10:15:10 -0400 Subject: [PATCH 03/13] One more gotcha --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a17b7b..0356040 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ node('docker') { if(!imagename){ echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' - exit 1 + sh 'exit 1' } if(maintainer){ echo "Building ${imagename}:${tag} for ${maintainer}" @@ -92,7 +92,7 @@ def handleError(String message, String tag){ currentBuild.setResult("FAILED") slackSend color: 'danger', message: "${message}" //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true]) - cleanup() + cleanup(tag) sh 'exit 1' } From 099fb34448c885c4c0ee5b2b75f5b045cea7daa3 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 12 Sep 2016 10:19:12 -0400 Subject: [PATCH 04/13] Final go --- Jenkinsfile | 2 +- container_files/tmp/comanage-appliance | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 container_files/tmp/comanage-appliance diff --git a/Jenkinsfile b/Jenkinsfile index 0356040..1db187e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,6 +104,6 @@ def cleanup(String tag) { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem cleaning up COmanage appliance :${tag}. \n\n ${error_details}" sh "rm -f ./debug" - handleError(message) + handleError(message, tag) } } \ No newline at end of file diff --git a/container_files/tmp/comanage-appliance b/container_files/tmp/comanage-appliance new file mode 100644 index 0000000..e69de29 From fe214c2a50894a3c3f8ca0e313690544d229f755 Mon Sep 17 00:00:00 2001 From: Chris Bynum Date: Mon, 12 Sep 2016 14:01:24 -0400 Subject: [PATCH 05/13] Added flag to trigger cleanup process --- Jenkinsfile | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1db187e..fdc78fc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ node('docker') { checkout scm stage 'Acquire util' - + sh 'mkdir -p tmp && mkdir -p bin' dir('tmp'){ git([ url: "https://github.internet2.edu/docker/util.git", @@ -15,18 +15,18 @@ node('docker') { sh 'rm -rf tmp' stage 'Setting build context' - + def maintainer = maintainer() def imagename = imagename() def tag - + // Tag images created on master branch with 'latest' if(env.BRANCH_NAME == "master"){ tag = "latest" }else{ tag = env.BRANCH_NAME } - + if(!imagename){ echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' @@ -35,7 +35,7 @@ node('docker') { if(maintainer){ echo "Building ${imagename}:${tag} for ${maintainer}" } - + stage 'Build' try{ sh 'bin/rebuild.sh &> debug' @@ -45,7 +45,7 @@ node('docker') { sh "rm -f ./debug" handleError(message, tag) } - + stage 'Compose' try{ sh 'bin/compose.sh &> debug' @@ -54,10 +54,10 @@ node('docker') { def message = "BUILD ERROR: There was a problem composing COmanage appliance (${tag}). \n\n ${error_details}" sh "rm -f ./debug" handleError(message, tag) - } - + } + stage 'Tests' - + try{ sh 'bin/test.sh &> debug' } catch(error) { @@ -66,13 +66,13 @@ node('docker') { sh "rm -f ./debug" handleError(message, tag) } - + stage 'Clean Up' - + cleanup(tag) - + stage 'Notify' - + slackSend color: 'good', message: "COmanage-appliance (${tag}) passes test battery" } @@ -87,12 +87,14 @@ def imagename() { matcher ? matcher[0][1] : null } -def handleError(String message, String tag){ +def handleError(String message, String tag, Boolean doCleanup = true){ echo "${message}" currentBuild.setResult("FAILED") slackSend color: 'danger', message: "${message}" //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true]) - cleanup(tag) + if (doCleanup) { + cleanup(tag) + } sh 'exit 1' } @@ -104,6 +106,6 @@ def cleanup(String tag) { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem cleaning up COmanage appliance :${tag}. \n\n ${error_details}" sh "rm -f ./debug" - handleError(message, tag) - } -} \ No newline at end of file + handleError(message, tag, false) + } +} From 1a2636ff09bd08c1b9d9441a946a4588b82f6b79 Mon Sep 17 00:00:00 2001 From: Chris Bynum Date: Mon, 12 Sep 2016 14:01:46 -0400 Subject: [PATCH 06/13] Renamed mariadb container for this repo --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 630e4a7..9ccbfad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: mariadb: image: bigfleet/mariadb - container_name: mariadb + container_name: comanage_mysql hostname: mariadb ports: - "3306:3306" @@ -11,7 +11,7 @@ services: - ALL - NET_ADMIN - SYS_ADMIN - networks: + networks: - i2network volumes: - comanage_mysql:/var/lib/mysqlmounted @@ -24,7 +24,7 @@ services: image: my/comanage container_name: comanage hostname: comanage - networks: + networks: - i2network ports: - "80:80" From b41a70481d8a9d861d2ce8ae436037193907cd05 Mon Sep 17 00:00:00 2001 From: Chris Bynum Date: Mon, 12 Sep 2016 14:01:55 -0400 Subject: [PATCH 07/13] Initial commit --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 811f8fa..443db17 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,12 @@ bin/run.sh bin/start.sh bin/stop.sh bin/test.sh +bin/build.sh +bin/destroy.sh +bin/install.sh +bin/rebuild.sh +bin/rerun.sh +bin/run.sh +bin/start.sh +bin/stop.sh +bin/test.sh From a50a917c8370d7dceac5b6771ffb4bc9ae76c03b Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 12 Sep 2016 16:58:16 -0300 Subject: [PATCH 08/13] Added certs --- container_files/httpd/ssl/server.crt | 22 +++++++++++++++++ container_files/httpd/ssl/server.csr | 35 ++++++++++++++++++++++++++++ container_files/httpd/ssl/server.key | 27 +++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 container_files/httpd/ssl/server.crt create mode 100644 container_files/httpd/ssl/server.csr create mode 100644 container_files/httpd/ssl/server.key diff --git a/container_files/httpd/ssl/server.crt b/container_files/httpd/ssl/server.crt new file mode 100644 index 0000000..5a54800 --- /dev/null +++ b/container_files/httpd/ssl/server.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDrDCCApQCCQCqx2/xzYm5ejANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMC +VVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRIwEAYDVQQHEwlDaGFybG90dGUx +DzANBgNVBAoTBkxldnZlbDEPMA0GA1UECxMGRG9ja2VyMREwDwYDVQQDEwhiaWdm +bGVldDEmMCQGCSqGSIb3DQEJARYXamltLnZhbi5mbGVldEBsZXZ2ZWwuaW8wHhcN +MTYwODEyMTY0MTMyWhcNMTcwODEyMTY0MTMyWjCBlzELMAkGA1UEBhMCVVMxFzAV +BgNVBAgTDk5vcnRoIENhcm9saW5hMRIwEAYDVQQHEwlDaGFybG90dGUxDzANBgNV +BAoTBkxldnZlbDEPMA0GA1UECxMGRG9ja2VyMREwDwYDVQQDEwhiaWdmbGVldDEm +MCQGCSqGSIb3DQEJARYXamltLnZhbi5mbGVldEBsZXZ2ZWwuaW8wggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDe3SNdeVXz0QEvwI8WSKp3XjF1Z6baCbhK +tlxwCexvt1CbtUmvBM6ztDmYwqdMwKvQB/UfVdilgUR8Ywo6VQTQ4pv+xYVAaVTo +AWNR/UD2/F+MriV+kVDLRfeql4os0C96c6yNthe1bQbrT4BZR0eOT7vBi3ozN38G +acUH2+owv2TnzVp27dGW2WIrWxL8G49w+Jy8K/nVdrEr48F/6349NHXizBdycpVG +MIdD62qmBb3SdWezKXmczOlHTLtXhKSZO+bQaYA81sGPkDB7NsUkHV1t8kMBt8sC +MPP4K5BAqIJdigg6nBINIuoa0mdMI37W7phUcLnjg5FsZUn95DMvAgMBAAEwDQYJ +KoZIhvcNAQELBQADggEBAGhWie1wkXg8V3rG4nGvDLVCFi8V4fPLF5dL5HCULGde +i9Xz+v412qt1kxgDDwlSZ3oRP1z/tKIywRgLD0NcBJYHqzJN+5gg+ZJMHLEn/bOf +CS6H91dWD93vlcdBMhyh/rz1PafBWc+TyaNuvihSz4V7kpUdUQ7ovXwv3yeSJelT +OFzQbjx+roSfFOK7CuIEOee42MAcaqD5LpnGCIujPQgAje3OdyDeofoFA0XehY/Y +QzooAqSqYhomN6G4RFRAiYwXVkhKbeLBdOOs3rjdymcrFSvwWUJKx7EtpUegucEw +krFR4hpkGmKABuhVZp/g1zxzeodkwRyJFrQEecFQIN4= +-----END CERTIFICATE----- diff --git a/container_files/httpd/ssl/server.csr b/container_files/httpd/ssl/server.csr new file mode 100644 index 0000000..27bfeef --- /dev/null +++ b/container_files/httpd/ssl/server.csr @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIC3TCCAcUCAQAwgZcxCzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJv +bGluYTESMBAGA1UEBxMJQ2hhcmxvdHRlMQ8wDQYDVQQKEwZMZXZ2ZWwxDzANBgNV +BAsTBkRvY2tlcjERMA8GA1UEAxMIYmlnZmxlZXQxJjAkBgkqhkiG9w0BCQEWF2pp +bS52YW4uZmxlZXRAbGV2dmVsLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA3t0jXXlV89EBL8CPFkiqd14xdWem2gm4SrZccAnsb7dQm7VJrwTOs7Q5 +mMKnTMCr0Af1H1XYpYFEfGMKOlUE0OKb/sWFQGlU6AFjUf1A9vxfjK4lfpFQy0X3 +qpeKLNAvenOsjbYXtW0G60+AWUdHjk+7wYt6Mzd/BmnFB9vqML9k581adu3Rltli +K1sS/BuPcPicvCv51XaxK+PBf+t+PTR14swXcnKVRjCHQ+tqpgW90nVnsyl5nMzp +R0y7V4SkmTvm0GmAPNbBj5AwezbFJB1dbfJDAbfLAjDz+CuQQKiCXYoIOpwSDSLq +GtJnTCN+1u6YVHC544ORbGVJ/eQzLwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEB +AJ6hDOof0VueZkGT9wIz/5pKJgoTe9kTNnnHfnXitROwxEEF5gyFPICXkALbJkC7 +HqNl+wd/cG010CoeAI5rcoYDvfY5WAmIOXQF2Zo4EV6XgfBwnk/Jz1T6TvryB14o +Pp/jwJzurEi90bCHmxELIJwHQPGxbLdF5ScNTg26xXkt6FI4w9utTzh85Pgmxir6 +7niVc3MvR9eyWVXF3NiakQw9oM8FsfRY2i3c87ugcuH0LDrVUFkz4GqS8vC6N1Ao +L/KAmBvfz25bq+GaXSKb2OQyvNHcM8lquP0vQKsvrs1ecUY4YILBy1yCEGUSxDGM +kH3F2FuaT22hbNM1JxrLo2Q= +-----END CERTIFICATE REQUEST---------BEGIN CERTIFICATE REQUEST----- +MIIC3TCCAcUCAQAwgZcxCzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJv +bGluYTESMBAGA1UEBxMJQ2hhcmxvdHRlMQ8wDQYDVQQKEwZMZXZ2ZWwxDzANBgNV +BAsTBkRvY2tlcjERMA8GA1UEAxMIYmlnZmxlZXQxJjAkBgkqhkiG9w0BCQEWF2pp +bS52YW4uZmxlZXRAbGV2dmVsLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA3t0jXXlV89EBL8CPFkiqd14xdWem2gm4SrZccAnsb7dQm7VJrwTOs7Q5 +mMKnTMCr0Af1H1XYpYFEfGMKOlUE0OKb/sWFQGlU6AFjUf1A9vxfjK4lfpFQy0X3 +qpeKLNAvenOsjbYXtW0G60+AWUdHjk+7wYt6Mzd/BmnFB9vqML9k581adu3Rltli +K1sS/BuPcPicvCv51XaxK+PBf+t+PTR14swXcnKVRjCHQ+tqpgW90nVnsyl5nMzp +R0y7V4SkmTvm0GmAPNbBj5AwezbFJB1dbfJDAbfLAjDz+CuQQKiCXYoIOpwSDSLq +GtJnTCN+1u6YVHC544ORbGVJ/eQzLwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEB +AJ6hDOof0VueZkGT9wIz/5pKJgoTe9kTNnnHfnXitROwxEEF5gyFPICXkALbJkC7 +HqNl+wd/cG010CoeAI5rcoYDvfY5WAmIOXQF2Zo4EV6XgfBwnk/Jz1T6TvryB14o +Pp/jwJzurEi90bCHmxELIJwHQPGxbLdF5ScNTg26xXkt6FI4w9utTzh85Pgmxir6 +7niVc3MvR9eyWVXF3NiakQw9oM8FsfRY2i3c87ugcuH0LDrVUFkz4GqS8vC6N1Ao +L/KAmBvfz25bq+GaXSKb2OQyvNHcM8lquP0vQKsvrs1ecUY4YILBy1yCEGUSxDGM +kH3F2FuaT22hbNM1JxrLo2Q= +-----END CERTIFICATE REQUEST----- diff --git a/container_files/httpd/ssl/server.key b/container_files/httpd/ssl/server.key new file mode 100644 index 0000000..e1de9a0 --- /dev/null +++ b/container_files/httpd/ssl/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA3t0jXXlV89EBL8CPFkiqd14xdWem2gm4SrZccAnsb7dQm7VJ +rwTOs7Q5mMKnTMCr0Af1H1XYpYFEfGMKOlUE0OKb/sWFQGlU6AFjUf1A9vxfjK4l +fpFQy0X3qpeKLNAvenOsjbYXtW0G60+AWUdHjk+7wYt6Mzd/BmnFB9vqML9k581a +du3RltliK1sS/BuPcPicvCv51XaxK+PBf+t+PTR14swXcnKVRjCHQ+tqpgW90nVn +syl5nMzpR0y7V4SkmTvm0GmAPNbBj5AwezbFJB1dbfJDAbfLAjDz+CuQQKiCXYoI +OpwSDSLqGtJnTCN+1u6YVHC544ORbGVJ/eQzLwIDAQABAoIBAEDDmLRgP1ckRKkA +11QNd+RKbisFHRq9ul2T0xcH+zqX1gf5zdjbl8nnNNmsr3uBfixtM5GQm+20vBc9 +nMpIzKZ7RAPsmIWYVoE5bgh0hT2BJ681KFY4mncH9SoQ8amGMlXuaZWg9hDWBy24 +o77OFQBJMXHUO4XIudQ+RnC7OrpBSZDIRq9pF4CIAOZ5muWTeK8IHF7CYfMlcz9z +F2y+MbUHYwVstQZlnhHA8zB2jAdy58PhCf44niGSI/ny9ww/ntSpqM/qM6pqv0H6 +GMV/ZA4UhJ7rbDzfUrTVfuJJDZr0X00RjKQBwLYqGA+vegwgyQU0RX0uL+vKHNYz +z5Uba1ECgYEA9BK4Y/ofxZTiXVEc1JM3NsCTPJgySzsgcmvtLh9Md4tXHd9kliW2 +4I2e/Alt6dwXwEOxUV1drc6B+A4Y09KMaAWQRxAsVY5khotChPAIhYXXDir9srEW +nR1Y5pBdMw89PQgIDKBHK9gp+Fo3InxsHN+QdfJmyXDzOvFBRLOgkdkCgYEA6cEY +konEDB7Kd4S7lYKuk1euvFp1XUk5MSXmz2JR6uvB5RaJJNvXBuZB0i60jeUHgA3V +mouwjuX1zsVSRQEtQ37eiQ2p7ivd1j86SlMBRzFxFempGV00IZevXiBxtfnx38Lw +mYYOWMXdX0CsV/HHvUpTrkC1F8rIP1tXj0IhwEcCgYEAq1q1P+OsCLBlWDSJNCkC ++5qqBEGqFa02M37YLqhkrA0UpXFgEhX6VZ63/qS0GRqfRimAROpyyYKRNtDW12gb +kTBOwcV2Cr8Ejn0Yv3Ix2WREvrqqEJlJkha3gm/aLu3FBaMs24hvTzXdCXJ1AO4v +jPncVyJOzaBR85DLTOt7kMkCgYAHoRjHN53hc2PSUM+6ioBeKL94QE+SUuB9/Smy +XRglXbp/WqPxQweanwtI6+NSukXrZQgyuhpyH4lNTV1pCSfMCykCOiLwthfQdVHW +uSzSgQea2nx9anBYJFZB8Tck5FqDnh4yNJDlTtfx0u+NE0Qcpn9isZP3idPNVZLf +Bx6I4wKBgQDagUD7YJ3oX/4mbBmWJ/z7fAWcUqdRC2kwVfOn2qdeRgVNXQD97u0f +ZUw7fH6MSKHkuQsM0UWxex2dxxfJaFH5aF5EqXzlT/9by4Ela9p6GtecyuNPDnm+ +jReIeDTO73BnM0LJNPPyd/CSHvaVEgvVmjjNTkuBYpyk8HVXf/Cd/A== +-----END RSA PRIVATE KEY----- From 51c7d15f74582be7ef4d5ad8f83e2d59b2f713a3 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 12 Sep 2016 17:07:29 -0300 Subject: [PATCH 09/13] Added httpd --- Dockerfile | 2 +- conf/comanage.env | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ba0ffb..5d4f0eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ LABEL Version=$version ENV VERSION=$version ADD ./container_files /opt/ - +RUN ln -s /opt/etc/httpd/conf.d/virtual_host_443.conf /etc/httpd/conf.d/00-comanage-443.conf VOLUME /etc/httpd/logs diff --git a/conf/comanage.env b/conf/comanage.env index 6cdb98f..596e2b4 100644 --- a/conf/comanage.env +++ b/conf/comanage.env @@ -1,2 +1,4 @@ VERSION=1.0.5 MYSQL_HOST=mariadb +CHANGE_TO_SSL_HTTPD_KEY=/opt/httpd/ssl/server.key +CHANGE_TO_SSL_HTTPD_CERT=/opt/httpd/ssl/server.crt From 40e8549be82b04eaaadec3757227d2b106889625 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 12 Sep 2016 17:07:56 -0300 Subject: [PATCH 10/13] Added comanage --- conf/comanage.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/comanage.env b/conf/comanage.env index 596e2b4..95d5b81 100644 --- a/conf/comanage.env +++ b/conf/comanage.env @@ -1,4 +1,4 @@ VERSION=1.0.5 MYSQL_HOST=mariadb -CHANGE_TO_SSL_HTTPD_KEY=/opt/httpd/ssl/server.key -CHANGE_TO_SSL_HTTPD_CERT=/opt/httpd/ssl/server.crt +CHANGE_TO_SSL_HTTPD_KEY=server.key +CHANGE_TO_SSL_HTTPD_CERT=server.crt From 8f105303f172daa260c68d229f4323ad7b00be94 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Wed, 14 Sep 2016 16:05:27 -0300 Subject: [PATCH 11/13] Added variables in order to configure database and mail --- conf/comanage.env | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/comanage.env b/conf/comanage.env index 95d5b81..4ab3337 100644 --- a/conf/comanage.env +++ b/conf/comanage.env @@ -2,3 +2,9 @@ VERSION=1.0.5 MYSQL_HOST=mariadb CHANGE_TO_SSL_HTTPD_KEY=server.key CHANGE_TO_SSL_HTTPD_CERT=server.crt +COMANAGE_SERVER_FQDN=localhost +COMANAGE_MAIL_FROM=localhost +COMANAGE_MAIL_HOST=localhsot +COMANAGE_MAIL_PORT=25 +COMANAGE_MAIL_USER=test +COMANAGE_MAIL_PASS=123 From d962ee2c3c86626e91a11fbebcb7fcf6cf207f65 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Wed, 14 Sep 2016 17:05:48 -0300 Subject: [PATCH 12/13] Added admin variables for cake config --- conf/comanage.env | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/comanage.env b/conf/comanage.env index 4ab3337..7102255 100644 --- a/conf/comanage.env +++ b/conf/comanage.env @@ -8,3 +8,7 @@ COMANAGE_MAIL_HOST=localhsot COMANAGE_MAIL_PORT=25 COMANAGE_MAIL_USER=test COMANAGE_MAIL_PASS=123 +ADMIN_NAME=admin +ADMIN_FAMILY=admin +ADMIN_USERNAME=admin + From 22e13aa02481183c07561e96a739b31b2609f06d Mon Sep 17 00:00:00 2001 From: villadalmine Date: Wed, 14 Sep 2016 18:03:50 -0300 Subject: [PATCH 13/13] Added variables --- conf/comanage.env | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/comanage.env b/conf/comanage.env index 7102255..4d7eeae 100644 --- a/conf/comanage.env +++ b/conf/comanage.env @@ -11,4 +11,3 @@ COMANAGE_MAIL_PASS=123 ADMIN_NAME=admin ADMIN_FAMILY=admin ADMIN_USERNAME=admin -