From 433c87d8aa2566dc65b33fdae0324513439f7144 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 17 Nov 2017 17:26:30 -0800 Subject: [PATCH 001/334] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a915254..87e6cfc 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Deploy -[![release](https://img.shields.io/badge/release-v3.6.4-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) +[![release](https://img.shields.io/badge/release-v3.6.5-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy) `deploy` is a shell script designed to speed up and automate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. From 749b5bedaa27d9af0ba64edbaf07deada829673f Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 21 Nov 2017 17:31:38 -0800 Subject: [PATCH 002/334] Resolve #109 --- deploy.sh | 5 +++-- etc/.deployrc | 0 etc/deploy.sh | 5 +++++ etc/html/civil/approval.php | 0 etc/html/civil/approve.html | 0 etc/html/civil/client.html | 0 etc/html/civil/digest/commit.html | 0 etc/html/civil/digest/footer.html | 0 etc/html/civil/digest/reference.html | 0 etc/html/civil/digest/wrap.html | 0 etc/html/civil/error.html | 0 etc/html/civil/footer.html | 0 etc/html/civil/header.html | 0 etc/html/civil/remote/index.html | 0 etc/html/civil/remote/nolog.html | 0 etc/html/civil/stats/index.html | 0 etc/html/civil/theme.conf | 0 etc/html/default/approval.php | 0 etc/html/default/approve.html | 0 etc/html/default/client.html | 0 etc/html/default/digest/commit.html | 0 etc/html/default/digest/footer.html | 0 etc/html/default/digest/wrap.html | 0 etc/html/default/error.html | 0 etc/html/default/footer.html | 2 +- etc/html/default/header.html | 0 etc/html/default/remote/index.html | 0 etc/html/default/remote/nolog.html | 0 etc/html/default/stats/_analytics.html | 0 etc/html/default/stats/index.html | 0 etc/html/default/theme.conf | 0 lib/approval.sh | 0 lib/digest.sh | 0 lib/display-styles.sh | 0 lib/package-manager.sh | 0 lib/permissions-fix.sh | 0 lib/report.sh | 9 ++++++++- lib/smart-commits.sh | 0 lib/user-feedback.sh | 0 lib/wp-acf.sh | 0 lib/wp-plugins.sh | 0 lib/wp-wordfence.sh | 0 lib/wp.sh | 0 lib/yes-no.sh | 0 44 files changed, 17 insertions(+), 4 deletions(-) mode change 100644 => 100755 etc/.deployrc mode change 100644 => 100755 etc/html/civil/approval.php mode change 100644 => 100755 etc/html/civil/approve.html mode change 100644 => 100755 etc/html/civil/client.html mode change 100644 => 100755 etc/html/civil/digest/commit.html mode change 100644 => 100755 etc/html/civil/digest/footer.html mode change 100644 => 100755 etc/html/civil/digest/reference.html mode change 100644 => 100755 etc/html/civil/digest/wrap.html mode change 100644 => 100755 etc/html/civil/error.html mode change 100644 => 100755 etc/html/civil/footer.html mode change 100644 => 100755 etc/html/civil/header.html mode change 100644 => 100755 etc/html/civil/remote/index.html mode change 100644 => 100755 etc/html/civil/remote/nolog.html mode change 100644 => 100755 etc/html/civil/stats/index.html mode change 100644 => 100755 etc/html/civil/theme.conf mode change 100644 => 100755 etc/html/default/approval.php mode change 100644 => 100755 etc/html/default/approve.html mode change 100644 => 100755 etc/html/default/client.html mode change 100644 => 100755 etc/html/default/digest/commit.html mode change 100644 => 100755 etc/html/default/digest/footer.html mode change 100644 => 100755 etc/html/default/digest/wrap.html mode change 100644 => 100755 etc/html/default/error.html mode change 100644 => 100755 etc/html/default/footer.html mode change 100644 => 100755 etc/html/default/header.html mode change 100644 => 100755 etc/html/default/remote/index.html mode change 100644 => 100755 etc/html/default/remote/nolog.html mode change 100644 => 100755 etc/html/default/stats/_analytics.html mode change 100644 => 100755 etc/html/default/stats/index.html mode change 100644 => 100755 etc/html/default/theme.conf mode change 100644 => 100755 lib/approval.sh mode change 100644 => 100755 lib/digest.sh mode change 100644 => 100755 lib/display-styles.sh mode change 100644 => 100755 lib/package-manager.sh mode change 100644 => 100755 lib/permissions-fix.sh mode change 100644 => 100755 lib/smart-commits.sh mode change 100644 => 100755 lib/user-feedback.sh mode change 100644 => 100755 lib/wp-acf.sh mode change 100644 => 100755 lib/wp-plugins.sh mode change 100644 => 100755 lib/wp-wordfence.sh mode change 100644 => 100755 lib/wp.sh mode change 100644 => 100755 lib/yes-no.sh diff --git a/deploy.sh b/deploy.sh index 2b8786f..ccec14c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -62,7 +62,7 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME TASKUSER CLIENTID \ CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN PROFILEID \ METRIC RESULT ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO REPORTURL \ - CLIENTCONTACT <<< "" + CLIENTCONTACT INCLUDEHOSTING <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} @@ -77,7 +77,8 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${METRIC} ${RESULT}" "${ALLOWROOT} - ${SHORTEMAIL} ${DIGESTCOVER} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT}" > /dev/null + ${SHORTEMAIL} ${DIGESTCOVER} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} + ${INCLUDEHOSTING}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \ diff --git a/etc/.deployrc b/etc/.deployrc old mode 100644 new mode 100755 diff --git a/etc/deploy.sh b/etc/deploy.sh index 23bc4b7..0e8a43a 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -33,6 +33,11 @@ # First and last name of the primary contact for this client # CLIENTCONTACT="First Last" +# Include hosting as a line item on monthly reports? If set to TRUE, the report +# line item will read "Monthly web hosting"; customize the text included in +# report by setting it to any other value. +# INCLUDEHOSTING="TRUE" + # If you need to send logfiles and email alerts to address(es) other # than those configured globally, enter them below. # TO="notify@client.com" diff --git a/etc/html/civil/approval.php b/etc/html/civil/approval.php old mode 100644 new mode 100755 diff --git a/etc/html/civil/approve.html b/etc/html/civil/approve.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/client.html b/etc/html/civil/client.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/digest/commit.html b/etc/html/civil/digest/commit.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/digest/footer.html b/etc/html/civil/digest/footer.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/digest/reference.html b/etc/html/civil/digest/reference.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/digest/wrap.html b/etc/html/civil/digest/wrap.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/error.html b/etc/html/civil/error.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/footer.html b/etc/html/civil/footer.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/header.html b/etc/html/civil/header.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/remote/index.html b/etc/html/civil/remote/index.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/remote/nolog.html b/etc/html/civil/remote/nolog.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/stats/index.html b/etc/html/civil/stats/index.html old mode 100644 new mode 100755 diff --git a/etc/html/civil/theme.conf b/etc/html/civil/theme.conf old mode 100644 new mode 100755 diff --git a/etc/html/default/approval.php b/etc/html/default/approval.php old mode 100644 new mode 100755 diff --git a/etc/html/default/approve.html b/etc/html/default/approve.html old mode 100644 new mode 100755 diff --git a/etc/html/default/client.html b/etc/html/default/client.html old mode 100644 new mode 100755 diff --git a/etc/html/default/digest/commit.html b/etc/html/default/digest/commit.html old mode 100644 new mode 100755 diff --git a/etc/html/default/digest/footer.html b/etc/html/default/digest/footer.html old mode 100644 new mode 100755 diff --git a/etc/html/default/digest/wrap.html b/etc/html/default/digest/wrap.html old mode 100644 new mode 100755 diff --git a/etc/html/default/error.html b/etc/html/default/error.html old mode 100644 new mode 100755 diff --git a/etc/html/default/footer.html b/etc/html/default/footer.html old mode 100644 new mode 100755 index 0fe4e6f..e2557fb --- a/etc/html/default/footer.html +++ b/etc/html/default/footer.html @@ -10,7 +10,7 @@ diff --git a/etc/html/default/header.html b/etc/html/default/header.html old mode 100644 new mode 100755 diff --git a/etc/html/default/remote/index.html b/etc/html/default/remote/index.html old mode 100644 new mode 100755 diff --git a/etc/html/default/remote/nolog.html b/etc/html/default/remote/nolog.html old mode 100644 new mode 100755 diff --git a/etc/html/default/stats/_analytics.html b/etc/html/default/stats/_analytics.html old mode 100644 new mode 100755 diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html old mode 100644 new mode 100755 diff --git a/etc/html/default/theme.conf b/etc/html/default/theme.conf old mode 100644 new mode 100755 diff --git a/lib/approval.sh b/lib/approval.sh old mode 100644 new mode 100755 diff --git a/lib/digest.sh b/lib/digest.sh old mode 100644 new mode 100755 diff --git a/lib/display-styles.sh b/lib/display-styles.sh old mode 100644 new mode 100755 diff --git a/lib/package-manager.sh b/lib/package-manager.sh old mode 100644 new mode 100755 diff --git a/lib/permissions-fix.sh b/lib/permissions-fix.sh old mode 100644 new mode 100755 diff --git a/lib/report.sh b/lib/report.sh index 740b991..fd2984d 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -29,8 +29,15 @@ function createReport() { # Try to setup the month/day count LASTDY=`cal ${PRVMTH} ${PRVYR} | egrep "28|29|30|31" |tail -1 |awk '{print $NF}'` + if [[ -n "${INCLUDEHOSTING}" ]] && [[ "${INCLUDEHOSTING}" != "FALSE" ]]; then + if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then + INCLUDEHOSTING="Monthly web hosting" + fi + echo "" >> "${statFile}" + fi + #if [[ $(git log --before={'date "+%Y-%m-01"'} --after=${PRVYR}-${PRVMTH}-31) ]]; then - git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" > "${statFile}" + git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" >> "${statFile}" # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know. if [[ ! -s "${statFile}" ]]; then diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh old mode 100644 new mode 100755 diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh old mode 100644 new mode 100755 diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh old mode 100644 new mode 100755 diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh old mode 100644 new mode 100755 diff --git a/lib/wp-wordfence.sh b/lib/wp-wordfence.sh old mode 100644 new mode 100755 diff --git a/lib/wp.sh b/lib/wp.sh old mode 100644 new mode 100755 diff --git a/lib/yes-no.sh b/lib/yes-no.sh old mode 100644 new mode 100755 From a1f2917efc277cafb7ae66aa5605c31e0bf2b086 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 21 Nov 2017 17:34:47 -0800 Subject: [PATCH 003/334] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 216b658..81d972a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Added +- Option to include web hosting as a line item on monthly reports + ## [3.6.5] - 11-17-2017 ### Added - Monthly reports can now be generated using `deploy --report [project name]` From c25acbb1bfca4715a5d5fa08f7b39c0b8d30a009 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 22 Nov 2017 14:27:26 -0800 Subject: [PATCH 004/334] Resolves #106, resolves #111 --- CHANGELOG.md | 2 + etc/html/default/digest/footer.html | 2 +- etc/html/default/remote/index.html | 2 +- etc/html/default/remote/nolog.html | 2 +- etc/html/default/report/css/print.css | 3 ++ etc/html/default/report/css/style.css | 30 +++++++++-- etc/html/default/report/header.html | 76 +++++++++++++++------------ etc/html/default/report/js/edit.js | 4 +- lib/log-handling.sh | 4 +- lib/report.sh | 8 +-- 10 files changed, 85 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81d972a..153400e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Option to include web hosting as a line item on monthly reports +### Changed +- Item descriptions are now editable in reports ## [3.6.5] - 11-17-2017 ### Added diff --git a/etc/html/default/digest/footer.html b/etc/html/default/digest/footer.html index 11cb420..5658922 100755 --- a/etc/html/default/digest/footer.html +++ b/etc/html/default/digest/footer.html @@ -19,7 +19,7 @@ diff --git a/etc/html/default/remote/index.html b/etc/html/default/remote/index.html index 0389094..ce60ec6 100755 --- a/etc/html/default/remote/index.html +++ b/etc/html/default/remote/index.html @@ -92,7 +92,7 @@

Any Quest

diff --git a/etc/html/default/remote/nolog.html b/etc/html/default/remote/nolog.html index bfb9843..52969a2 100755 --- a/etc/html/default/remote/nolog.html +++ b/etc/html/default/remote/nolog.html @@ -81,7 +81,7 @@ diff --git a/etc/html/default/report/css/print.css b/etc/html/default/report/css/print.css index 6781c2f..65433c5 100755 --- a/etc/html/default/report/css/print.css +++ b/etc/html/default/report/css/print.css @@ -1,3 +1,6 @@ +table tr { + border-bottom: solid 1px black; +} #hiderow, .delete { display: none; diff --git a/etc/html/default/report/css/style.css b/etc/html/default/report/css/style.css index d44f792..37999dc 100755 --- a/etc/html/default/report/css/style.css +++ b/etc/html/default/report/css/style.css @@ -23,6 +23,13 @@ table th { border: 1px solid black; padding: 5px; } +table thead { + display: table-header-group; +} +table tr { + page-break-inside: avoid; + page-break-after: auto; +} #header { height: 15px; width: 100%; @@ -124,6 +131,8 @@ table th { width: 100%; margin: 30px 0 0 0; border: 1px solid black; + -webkit-box-decoration-break: clone; + box-decoration-break: clone; } #items th { text-align: left; @@ -182,11 +191,21 @@ table th { text-align: center; } textarea:hover, -textarea:focus, #items td.total-value textarea:hover, -#items td.total-value textarea:focus, +#items td.total-value textarea:focus, +div.editable:hover { + background-color: none; + outline: none !important; + border-bottom: none; + box-shadow: inset 0 -1px 0px 0px #E6E6E6; +} +textarea:focus, +div.editable:focus { + outline: none !important; + box-shadow: inset 0 -1px 0px 0px #bbb; +} .delete:hover { - background-color: #EEFF88; + color: #ffffff; } .delete-wpr { position: relative; @@ -203,4 +222,7 @@ textarea:focus, top: 0px; left: -22px; font-size: 12px; -} \ No newline at end of file +} +.editable { + outline: none; +} diff --git a/etc/html/default/report/header.html b/etc/html/default/report/header.html index 0cdcc63..ec6e499 100755 --- a/etc/html/default/report/header.html +++ b/etc/html/default/report/header.html @@ -3,43 +3,51 @@ - - Monthly Maintenance Report for {{PROJCLIENT}} - - - - - + + Monthly Maintenance Report for {{PROJCLIENT}} + + + + + + -
-
- {{LASTMONTH}} maintenance report for -
-

{{PROJCLIENT}}
- -

+
+
+ {{LASTMONTH}} maintenance report for +
+

{{PROJCLIENT}}
+ +

-
-

This report for the month of {{LASTMONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}}

-
+
+

+ This report for the month of {{LASTMONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}} +

+
-
- - - - - - - - -
Invoice #
Date
- + + + + + -
Invoice #
- - - - - + + + + +
ItemDescription
Date
+ + + + + + + + + + diff --git a/etc/html/default/report/js/edit.js b/etc/html/default/report/js/edit.js index 2f20ac7..cf95d27 100755 --- a/etc/html/default/report/js/edit.js +++ b/etc/html/default/report/js/edit.js @@ -105,7 +105,7 @@ $(document).ready(function() { $("#paid").blur(update_balance); $("#addrow").click(function(){ - $(".item-row:last").after(''); + $(".item-row:last").after(''); if ($(".delete").length > 0) $(".delete").show(); bind(); }); @@ -136,4 +136,4 @@ $(document).ready(function() { $("#date").val(print_today()); -}); \ No newline at end of file +}); diff --git a/lib/log-handling.sh b/lib/log-handling.sh index 1ec33d3..da22732 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -173,7 +173,7 @@ function htmlBuild() { fi } -# Remote log function; this really neexds to be rewritten +# Remote log function; this really needs to be rewritten function postLog() { if [[ "${REMOTELOG}" == "TRUE" ]]; then # Post to localhost by simply copying files @@ -416,8 +416,8 @@ function htmlDir() { mkdir "${LOCALHOSTPATH}/${APP}/report"; errorChk mkdir "${LOCALHOSTPATH}/${APP}/report/css"; errorChk mkdir "${LOCALHOSTPATH}/${APP}/report/js"; errorChk + fi cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; errorChk cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; errorChk - fi fi } diff --git a/lib/report.sh b/lib/report.sh index fd2984d..2b8c004 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -30,14 +30,16 @@ function createReport() { LASTDY=`cal ${PRVMTH} ${PRVYR} | egrep "28|29|30|31" |tail -1 |awk '{print $NF}'` if [[ -n "${INCLUDEHOSTING}" ]] && [[ "${INCLUDEHOSTING}" != "FALSE" ]]; then + # If INCLUDEHOSTING is equal to something other than TRUE, its value + # will be used as the text string in the report if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then - INCLUDEHOSTING="Monthly web hosting" + INCLUDEHOSTING="Web hosting for the month of ${LASTMONTH}" fi - echo "" >> "${statFile}" + echo "" >> "${statFile}" fi #if [[ $(git log --before={'date "+%Y-%m-01"'} --after=${PRVYR}-${PRVMTH}-31) ]]; then - git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" >> "${statFile}" + git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" >> "${statFile}" # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know. if [[ ! -s "${statFile}" ]]; then From 98aacb836f3049f8ba3a3d5812daa0e7ab58b947 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 28 Nov 2017 13:43:14 -0800 Subject: [PATCH 005/334] Resolve #108 --- CHANGELOG.md | 2 ++ deploy.sh | 2 +- lib/ssh-check.sh | 6 +++--- lib/utilities.sh | 7 ++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 153400e..65faba2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Option to include web hosting as a line item on monthly reports ### Changed - Item descriptions are now editable in reports +### Fixed +- Fixed a bug that kept SSH keys from being properly checked ## [3.6.5] - 11-17-2017 ### Added diff --git a/deploy.sh b/deploy.sh index ccec14c..9b4c6d4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -538,7 +538,7 @@ if [[ ! -f "${WORKPATH}/${APP}/.queued" ]]; then fi # Disable SSH check for those that will never need it -if [[ "${NOKEY}"="TRUE" ]]; then +if [[ "${NOKEY}" == "TRUE" ]]; then DISABLESSHCHECK="TRUE" fi diff --git a/lib/ssh-check.sh b/lib/ssh-check.sh index 51628e3..c59ed81 100755 --- a/lib/ssh-check.sh +++ b/lib/ssh-check.sh @@ -6,6 +6,8 @@ # SSH checks for both Bitbucket and Github ############################################################################### +# TODO: Rewrite this to store git@domain stuff in a variable, allow for other +# repohosts to work (Gitlab etc.) and shorten the entire function function sshChk() { if [[ "${NOKEY}" != "TRUE" ]]; then trace "Checking SSH configuration" @@ -18,9 +20,7 @@ function sshChk() { trace "git@bitbucket.org: OK" fi elif [[ "${REPOHOST}" == *"github"* ]]; then - ssh -oStrictHostKeyChecking=no git@github.org &> /dev/null; errorStatus - #ssh -T git@github.com &> /dev/null; errorStatus - + ssh -oStrictHostKeyChecking=no git@github.org &> /dev/null; errorStatus if [[ "${EXITCODE}" != "0" ]]; then error "git@github.org: SSH check failed (Error code ${EXITCODE})" else diff --git a/lib/utilities.sh b/lib/utilities.sh index c7a19a5..f7b2aa5 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -37,9 +37,9 @@ function go() { analyticsTest; quickExit fi - # Test SSH key authentication + # Test SSH key authentication using the --ssh-check flag if [[ "${SSHTEST}" == "1" ]]; then - if [[ "${NOKEY}" != "TRUE" ]]; then + if [[ "${NOKEY}" != "TRUE" ]] && [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then notice "Checking SSH Configuration..." sshChk else @@ -140,7 +140,8 @@ function depCheck() { if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then nano "${APPRC}" clear; sleep 1 - quickExit + $(basename ${APP}) && exit + # exec "/usr/local/bin/deploy ${STARTUP} ${APP}" fi info "You can change configuration later by editing ${APPRC}" fi From 637a5482b5b40223aad73dd30da63f1f357b4ce9 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 28 Nov 2017 17:49:38 -0800 Subject: [PATCH 006/334] Remote log hosting enabled --- CHANGELOG.md | 1 + deploy.sh | 20 ++-- etc/deploy.sh | 31 ++++++ lib/digest.sh | 12 ++- lib/log-handling.sh | 249 -------------------------------------------- lib/mail-log.sh | 190 +++++++++++++++++++++++++++++++++ lib/post-log.sh | 124 ++++++++++++++++++++++ lib/statistics.sh | 62 ++++++----- lib/wp.sh | 2 +- 9 files changed, 401 insertions(+), 290 deletions(-) create mode 100755 lib/mail-log.sh create mode 100755 lib/post-log.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 65faba2..cb331bd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Option to include web hosting as a line item on monthly reports +- Remote servers can now host project logs, digests, statistics, and reports ### Changed - Item descriptions are now editable in reports ### Fixed diff --git a/deploy.sh b/deploy.sh index 9b4c6d4..0896d15 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.5" +VERSION="3.6.6rc" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LASTMONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -58,10 +58,10 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ PROJNAME PROJCLIENT DEVURL PRODURL REPO MASTER PRODUCTION COMMITMSG DEPLOY \ DONOTDEPLOY TASK CHECKBRANCH ACTIVECHECK CHECKTIME GARBAGE WFCHECK ACFKEY \ WFOFF REMOTELOG POSTTOLOCALHOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK DIGESTURL \ - CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS LOGMSG \ - EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME TASKUSER CLIENTID \ - CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN PROFILEID \ - METRIC RESULT ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO REPORTURL \ + CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD SSHCMD \ + LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME TASKUSER \ + CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \ + PROFILEID METRIC RESULT ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO REPORTURL \ CLIENTCONTACT INCLUDEHOSTING <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} @@ -73,9 +73,9 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} ${POSTTOLOCALHOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} ${DIGESTSLACK} ${DIGESTURL} ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER} ${SCPHOST} - ${SCPHOSTPATH} ${SCPPASS} ${LOGMSG} ${EXPIRELOGS} ${SERVERCHECK} - ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} ${CLIENTID} - ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} + ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} + ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} + ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${METRIC} ${RESULT}" "${ALLOWROOT} ${SHORTEMAIL} ${DIGESTCOVER} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING}" > /dev/null @@ -91,7 +91,7 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile AUTHORNAME GRAVATAR IMGFILE SIZE RND ANALYTICSMSG digestSendmail MINAUSER \ MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX QUEUED \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile CURMTH \ - CURYR PRVMTH PRVYR LASTDY <<< "" + CURYR PRVMTH PRVYR LASTDY TMP <<< "" echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} ${urlFile} ${htmlFile} ${htmlSendmail} ${htmlEmail} ${clientEmail} ${textSendmail} ${deployPath} ${etcLocation} ${libLocation} @@ -106,7 +106,7 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${digestSendmail} ${MINAUSER} ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${QUEUED} ${DISABLESSHCHECK} ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${CURMTH} ${CURYR} - ${PRVMTH} ${PRVYR} ${LASTDY}" > /dev/null + ${PRVMTH} ${PRVYR} ${LASTDY} ${TMP}" > /dev/null # Options function flags() { diff --git a/etc/deploy.sh b/etc/deploy.sh index 0e8a43a..45db2e1 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -166,8 +166,39 @@ # Enable the settings below to post on WARNiNG and/or ERROR. # SLACKERROR="FALSE" +# Logging +# +# Post HTML logs to remote server. This needs to be set to "TRUE" even you +# are only posting to LOCALHOST. +# REMOTELOG="TRUE" +# +# Define the root url where the deploy log will be accessible with no +# trailing slash +# REMOTEURL="http://deploy.domain.com" +# +# If using HTML logs, define which template you'd like to use. HTML templates +# are stored in separate folders in /etc/deploy/html. The value used below +# should be the folder name of your template. +# REMOTETEMPLATE="default" +# +# Post logs via SCP +# SCPPOST="TRUE" +# SCPUSER="user" +# SCPHOST="hostname.com" +# SCPHOSTPATH="/full/path/to/file" +# +# DANGER DANGER: If for some reason you absolutely can't use an SSH key you +# can configure your password here +# SCPPASS="password" +# # Post commit logs to this URL. # POSTURL="" +# +# If you're posting logs to a place on the same machine you're deploying from, +# set POSTTOLOCALHOST to "TRUE" and define the path where you want to store +# the HTML logs. +# LOCALHOSTPOST="TRUE" +# LOCALHOSTPATH="/var/www/production/deploy" # Google Analytics # diff --git a/lib/digest.sh b/lib/digest.sh index 5ec2458..744d96c 100755 --- a/lib/digest.sh +++ b/lib/digest.sh @@ -16,10 +16,15 @@ function createDigest() { AUTHOREMAIL=$(echo $AUTHOR | cut -d\| -f1 | tr -d '[[:space:]]' | tr '[:upper:]' '[:lower:]') AUTHORNAME=$(echo $AUTHOR | cut -d\| -f2) GRAVATAR="http://www.gravatar.com/avatar/$(echo -n $AUTHOREMAIL | md5sum)?d=404&s=200" - IMGFILE="${LOCALHOSTPATH}/${APP}/avatar/$AUTHORNAME.png" - # if [[ ! -f $IMGFILE ]]; then # If you wanna cache? + if [[ "${SCPPOST}" != "TRUE" ]]; then + IMGFILE="${LOCALHOSTPATH}/${APP}/avatar/$AUTHORNAME.png" + else + if [[ ! -d "/tmp/avatar" ]]; then + umask 077 && mkdir /tmp/avatar &> /dev/null + fi + IMGFILE="/tmp/avatar/${AUTHORNAME}.png" + fi curl -fso "${IMGFILE}" "${GRAVATAR}" - # fi done # Attempt to get analytics @@ -59,7 +64,6 @@ function createDigest() { # Git some stats # git log --no-merges --since="7 days ago" --reverse --stat | grep -Eo "[0-9]{1,} files? changed" | grep -Eo "[0-9]{1,}" | awk "{ sum += \$1 } END { print sum }" - processHTML if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then diff --git a/lib/log-handling.sh b/lib/log-handling.sh index da22732..6657f88 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -172,252 +172,3 @@ function htmlBuild() { processHTML fi } - -# Remote log function; this really needs to be rewritten -function postLog() { - if [[ "${REMOTELOG}" == "TRUE" ]]; then - # Post to localhost by simply copying files - if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then - # Check that directory exists - htmlDir - - # Post the file - if [[ -n "${REMOTEFILE}" ]] && [[ "${REPORT}" != "1" ]]; then #&& [[ -n "${COMMITHASH}" ]]; then - cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" - chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null - fi - - # Post the digest - if [[ "${DIGEST}" == "1" ]]; then - REMOTEFILE="digest-${EPOCH}.html" - cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" - chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null - DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}" - fi - - # Post the report - if [[ "${REPORT}" == "1" ]]; then - REMOTEFILE="${EPOCH}.php" - cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" - chmod a+rw "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" &> /dev/null - REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" - fi - - # Remove logs older then X days - if [[ -n "${EXPIRELOGS}" ]]; then - find "${LOCALHOSTPATH}/${APP}"* -mtime +"${EXPIRELOGS}" -exec rm {} \; &> /dev/null - fi - fi - - # Send the files through SCP (not yet enabled) - if [[ "${SCPPOST}" == "TRUE" ]]; then - if [[ -n "${SCPPASS}" ]]; then - sshpass -p "${SCPPASS}" scp -o StrictHostKeyChecking=no "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}${COMMITHASH}.html" &> /dev/null - else - scp "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/{COMMITHASH}.html" &> /dev/null - fi - fi - fi -} - -function mailLog() { - # Only send email if a commit has been made, an approval is required, or there has been an error - if [[ -n "${COMMITHASH}" ]] || [[ "${message_state}" == "ERROR" ]] || [[ "${message_state}" == "APPROVAL NEEDED" ]] || [[ "${AUTOMATE}" == "1" ]]; then - - # If using --current, use the REPO value instead of the APP (current directory) - if [[ "${CURRENT}" == "1" ]]; then - APP="${REPO}" - fi - - if [[ "${EMAILHTML}" == "TRUE" ]]; then - # Send the email - ( - echo "Sender: ${FROM}" - echo "From: ${FROM} <${FROM}>" - echo "Reply-To: ${FROM} <${FROM}>" - echo "To: ${TO}" - echo "Subject: [${message_state}] ${SUBJECT} - ${APP}" - echo "Content-Type: text/html" - echo - echo "${htmlSendmail}"; - ) | "${MAILPATH}"/sendmail -t - else - # Compile and send text format email - textSendmail=$(<"${logFile}") - ( - echo "Sender: ${FROM}" - echo "From: ${FROM} <${FROM}>" - echo "Reply-To: ${FROM} <${FROM}>" - echo "To: ${TO}" - echo "Subject: [${message_state}] ${SUBJECT} - ${APP}" - echo "Content-Type: text/plain" - echo - echo "${textSendmail}"; - ) | "${MAILPATH}"/sendmail -t - fi - fi - - # Is this a digest email? - if [[ -n "${DIGESTEMAIL}" ]] && [[ "${DIGEST}" == "1" ]] && [[ -n "${digestSendmail}" ]]; then - # Send the email - ( - echo "Sender: ${FROM}" - echo "From: EMRL <${FROM}>" - echo "Reply-To: ${FROM} <${FROM}>" - echo "To: ${DIGESTEMAIL}" - echo "Subject: ${PROJNAME} updates for the week of ${WEEKOF}" - echo "Content-Type: text/html" - echo - echo "${digestSendmail}"; - ) | "${MAILPATH}"/sendmail -t - fi -} - -function emailTest() { - console "Testing email..." - if [[ -z "${TO}" ]]; then - warning "No recipient address found."; emptyLine - cleanUp; exit 1 - else - # Send HTML mail - ( - echo "Sender: ${FROM}" - echo "From: ${FROM} <${FROM}>" - echo "Reply-To: ${FROM} <${FROM}>" - echo "To: ${TO}" - echo "Subject: [TESTING] ${SUBJECT} - ${APP}" - echo "Content-Type: text/html" - echo - echo "This is a test HTML email from deploy ${VERSION}.
" - echo "Current user is ${DEV}

"; - echo - echo "Project Information
" - echo "Name: ${PROJNAME}
" - echo "Client: ${PROJCLIENT}
" - echo "Logo: ${CLIENTLOGO}
" - echo "Digest email(s): ${DIGESTEMAIL}
" - echo "Staging URL: ${DEVURL}
" - echo "Production URL: ${PRODURL}

" - echo - echo "Git Configuration
" - echo "Repo: ${REPOHOST}/${REPO}
" - echo "Master branch: ${MASTER}
" - echo "Production branch: ${PRODUCTION}
" - echo "Auto merge: ${AUTOMERGE}
" - echo "File Stashing: ${STASH}
" - echo "Force branch checking: ${CHECKBRANCH}

" - echo - echo "Wordpress Setup
" - echo "Wordpress root: ${WPROOT}
" - echo "Wordpress application: ${WPAPP}
" - echo "Wordpress system: ${WPSYSTEM}

" - echo - echo "Deployment Configuration
" - echo "Deploy command: ${DEPLOY}
" - echo "Disallow deployment: ${DONOTDEPLOY}

" - echo - echo "Integration
" - echo "Task #: ${TASK}
" - echo "Task user: ${TASKUSER}
" - echo "Task time: ${ADDTIME}
" - echo "Post to Slack: ${POSTTOSLACK}
" - echo "Post errors to Slack: ${SLACKERROR}
" - echo "Google Analytics ID: ${PROFILEID}"; - ) | "${MAILPATH}"/sendmail -t - # Send Text mail - ( - echo "Sender: ${FROM}" - echo "From: ${FROM} <${FROM}>" - echo "Reply-To: ${FROM} <${FROM}>" - echo "To: ${TO}" - echo "Subject: [TESTING] ${SUBJECT} - ${APP}" - echo "Content-Type: text/plain" - echo - echo "This is a test TEXT email from deploy ${VERSION} (https://github.com/EMRL/deploy/)" - echo "Current user is ${DEV}"; - echo - echo "Project Information" - echo "-------------------" - echo "Name: ${PROJNAME}" - echo "Client: ${PROJCLIENT}" - echo "Logo: ${CLIENTLOGO}" - echo "Digest email(s): ${DIGESTEMAIL}" - echo "Staging URL: ${DEVURL}" - echo "Production URL: ${PRODURL}" - echo - echo "Git Configuration" - echo "-----------------" - echo "Repo: ${REPOHOST}/${REPO}" - echo "Master branch: ${MASTER}" - echo "Production branch: ${PRODUCTION}" - echo "Auto merge: ${AUTOMERGE}" - echo "File Stashing: ${STASH}" - echo "Force branch checking: ${CHECKBRANCH}" - echo - echo "Wordpress Setup" - echo "-----------------------" - echo "Wordpress root: ${WPROOT}" - echo "Wordpress application: ${WPAPP}" - echo "Wordpress system: ${WPSYSTEM}" - echo - echo "Deployment Configuration" - echo "------------------------" - echo "Deploy command: ${DEPLOY}" - echo "Disallow deployment: ${DONOTDEPLOY}" - echo - echo "Integration" - echo "-----------" - echo "Task #: ${TASK}" - echo "Task user: ${TASKUSER}" - echo "Task time: ${ADDTIME}" - echo "Post to Slack: ${POSTTOSLACK}" - echo "Post errors to Slack: ${SLACKERROR}" - echo "Google Analytics ID: ${PROFILEID}"; - ) | "${MAILPATH}"/sendmail -t - fi - - # If an integration is setup, let's test it - if [[ ! -z "${TASK}" ]]; then - sleep 2 - if [[ "${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL}" == ?*@?*.?* ]]; then - console "Testing integration to ${POSTEMAIL}" - ( - if [[ -z "${TASKUSER}" ]] || [[ -z "${ADDTIME}" ]]; then - echo "From: ${FROM}" - else - echo "From: ${TASKUSER}" - fi - echo "Reply-To: ${FROM} <${FROM}>" - echo "To: ${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL}" - echo "Subject: [TESTING] ${SUBJECT} - ${APP}" - echo "Content-Type: text/plain" - echo - echo "This is a test email integration from deploy ${VERSION}" - echo "(https://github.com/EMRL/deploy/)" - ) | "${MAILPATH}"/sendmail -t - quietExit - else - console "Integration email address ${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL} does not look valid"; quietExit - fi - fi -} - -function htmlDir() { - if [[ ! -d "${LOCALHOSTPATH}/${APP}" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}" - fi - - if [[ ! -d "${LOCALHOSTPATH}/${APP}/avatar" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}/avatar" - fi - - if [[ "${message_state}" == "REPORT" ]]; then - if [[ ! -d "${LOCALHOSTPATH}/${APP}/report" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}/report"; errorChk - mkdir "${LOCALHOSTPATH}/${APP}/report/css"; errorChk - mkdir "${LOCALHOSTPATH}/${APP}/report/js"; errorChk - fi - cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; errorChk - cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; errorChk - fi -} diff --git a/lib/mail-log.sh b/lib/mail-log.sh new file mode 100755 index 0000000..42be1df --- /dev/null +++ b/lib/mail-log.sh @@ -0,0 +1,190 @@ +#!/bin/bash +# +# mail-log.sh +# +############################################################################### +# Mail handling +############################################################################### +trace "Loading mail handler" + +function mailLog() { + # Only send email if a commit has been made, an approval is required, or there has been an error + if [[ -n "${COMMITHASH}" ]] || [[ "${message_state}" == "ERROR" ]] || [[ "${message_state}" == "APPROVAL NEEDED" ]] || [[ "${AUTOMATE}" == "1" ]]; then + + # If using --current, use the REPO value instead of the APP (current directory) + if [[ "${CURRENT}" == "1" ]]; then + APP="${REPO}" + fi + + if [[ "${EMAILHTML}" == "TRUE" ]]; then + # Send the email + ( + echo "Sender: ${FROM}" + echo "From: ${FROM} <${FROM}>" + echo "Reply-To: ${FROM} <${FROM}>" + echo "To: ${TO}" + echo "Subject: [${message_state}] ${SUBJECT} - ${APP}" + echo "Content-Type: text/html" + echo + echo "${htmlSendmail}"; + ) | "${MAILPATH}"/sendmail -t + else + # Compile and send text format email + textSendmail=$(<"${logFile}") + ( + echo "Sender: ${FROM}" + echo "From: ${FROM} <${FROM}>" + echo "Reply-To: ${FROM} <${FROM}>" + echo "To: ${TO}" + echo "Subject: [${message_state}] ${SUBJECT} - ${APP}" + echo "Content-Type: text/plain" + echo + echo "${textSendmail}"; + ) | "${MAILPATH}"/sendmail -t + fi + fi + + # Is this a digest email? + if [[ -n "${DIGESTEMAIL}" ]] && [[ "${DIGEST}" == "1" ]] && [[ -n "${digestSendmail}" ]]; then + # Send the email + ( + echo "Sender: ${FROM}" + echo "From: EMRL <${FROM}>" + echo "Reply-To: ${FROM} <${FROM}>" + echo "To: ${DIGESTEMAIL}" + echo "Subject: ${PROJNAME} updates for the week of ${WEEKOF}" + echo "Content-Type: text/html" + echo + echo "${digestSendmail}"; + ) | "${MAILPATH}"/sendmail -t + fi +} + +function emailTest() { + console "Testing email..." + if [[ -z "${TO}" ]]; then + warning "No recipient address found."; emptyLine + cleanUp; exit 1 + else + # Send HTML mail + ( + echo "Sender: ${FROM}" + echo "From: ${FROM} <${FROM}>" + echo "Reply-To: ${FROM} <${FROM}>" + echo "To: ${TO}" + echo "Subject: [TESTING] ${SUBJECT} - ${APP}" + echo "Content-Type: text/html" + echo + echo "This is a test HTML email from deploy ${VERSION}.
" + echo "Current user is ${DEV}

"; + echo + echo "Project Information
" + echo "Name: ${PROJNAME}
" + echo "Client: ${PROJCLIENT}
" + echo "Logo: ${CLIENTLOGO}
" + echo "Digest email(s): ${DIGESTEMAIL}
" + echo "Staging URL: ${DEVURL}
" + echo "Production URL: ${PRODURL}

" + echo + echo "Git Configuration
" + echo "Repo: ${REPOHOST}/${REPO}
" + echo "Master branch: ${MASTER}
" + echo "Production branch: ${PRODUCTION}
" + echo "Auto merge: ${AUTOMERGE}
" + echo "File Stashing: ${STASH}
" + echo "Force branch checking: ${CHECKBRANCH}

" + echo + echo "Wordpress Setup
" + echo "Wordpress root: ${WPROOT}
" + echo "Wordpress application: ${WPAPP}
" + echo "Wordpress system: ${WPSYSTEM}

" + echo + echo "Deployment Configuration
" + echo "Deploy command: ${DEPLOY}
" + echo "Disallow deployment: ${DONOTDEPLOY}

" + echo + echo "Integration
" + echo "Task #: ${TASK}
" + echo "Task user: ${TASKUSER}
" + echo "Task time: ${ADDTIME}
" + echo "Post to Slack: ${POSTTOSLACK}
" + echo "Post errors to Slack: ${SLACKERROR}
" + echo "Google Analytics ID: ${PROFILEID}"; + ) | "${MAILPATH}"/sendmail -t + # Send Text mail + ( + echo "Sender: ${FROM}" + echo "From: ${FROM} <${FROM}>" + echo "Reply-To: ${FROM} <${FROM}>" + echo "To: ${TO}" + echo "Subject: [TESTING] ${SUBJECT} - ${APP}" + echo "Content-Type: text/plain" + echo + echo "This is a test TEXT email from deploy ${VERSION} (https://github.com/EMRL/deploy/)" + echo "Current user is ${DEV}"; + echo + echo "Project Information" + echo "-------------------" + echo "Name: ${PROJNAME}" + echo "Client: ${PROJCLIENT}" + echo "Logo: ${CLIENTLOGO}" + echo "Digest email(s): ${DIGESTEMAIL}" + echo "Staging URL: ${DEVURL}" + echo "Production URL: ${PRODURL}" + echo + echo "Git Configuration" + echo "-----------------" + echo "Repo: ${REPOHOST}/${REPO}" + echo "Master branch: ${MASTER}" + echo "Production branch: ${PRODUCTION}" + echo "Auto merge: ${AUTOMERGE}" + echo "File Stashing: ${STASH}" + echo "Force branch checking: ${CHECKBRANCH}" + echo + echo "Wordpress Setup" + echo "-----------------------" + echo "Wordpress root: ${WPROOT}" + echo "Wordpress application: ${WPAPP}" + echo "Wordpress system: ${WPSYSTEM}" + echo + echo "Deployment Configuration" + echo "------------------------" + echo "Deploy command: ${DEPLOY}" + echo "Disallow deployment: ${DONOTDEPLOY}" + echo + echo "Integration" + echo "-----------" + echo "Task #: ${TASK}" + echo "Task user: ${TASKUSER}" + echo "Task time: ${ADDTIME}" + echo "Post to Slack: ${POSTTOSLACK}" + echo "Post errors to Slack: ${SLACKERROR}" + echo "Google Analytics ID: ${PROFILEID}"; + ) | "${MAILPATH}"/sendmail -t + fi + + # If an integration is setup, let's test it + if [[ ! -z "${TASK}" ]]; then + sleep 2 + if [[ "${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL}" == ?*@?*.?* ]]; then + console "Testing integration to ${POSTEMAIL}" + ( + if [[ -z "${TASKUSER}" ]] || [[ -z "${ADDTIME}" ]]; then + echo "From: ${FROM}" + else + echo "From: ${TASKUSER}" + fi + echo "Reply-To: ${FROM} <${FROM}>" + echo "To: ${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL}" + echo "Subject: [TESTING] ${SUBJECT} - ${APP}" + echo "Content-Type: text/plain" + echo + echo "This is a test email integration from deploy ${VERSION}" + echo "(https://github.com/EMRL/deploy/)" + ) | "${MAILPATH}"/sendmail -t + quietExit + else + console "Integration email address ${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL} does not look valid"; quietExit + fi + fi +} diff --git a/lib/post-log.sh b/lib/post-log.sh new file mode 100755 index 0000000..1154cc5 --- /dev/null +++ b/lib/post-log.sh @@ -0,0 +1,124 @@ +#!/bin/bash +# +# post-log.sh +# +############################################################################### +# Handles posting logs to localhost as well as remote hosts +############################################################################### +trace "Loading post functions" + +# Remote log function; this really needs to be rewritten +function postLog() { + if [[ "${REMOTELOG}" == "TRUE" ]]; then + + # Post to localhost by simply copying files + if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then + + # Check that directory exists + htmlDir + + # Post the file + if [[ -n "${REMOTEFILE}" ]] && [[ "${REPORT}" != "1" ]]; then #&& [[ -n "${COMMITHASH}" ]]; then + cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" + chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null + fi + + # Post the digest + if [[ "${DIGEST}" == "1" ]]; then + REMOTEFILE="digest-${EPOCH}.html" + cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" + chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null + DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}" + fi + + # Post the report + if [[ "${REPORT}" == "1" ]]; then + REMOTEFILE="${EPOCH}.php" + cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" + chmod a+rw "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" &> /dev/null + REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" + fi + + # Statistics + if [[ "${PROJSTATS}" == "1" ]]; then + [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" + [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" + cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}" + chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null + fi + + # Remove logs older then X days + if [[ -n "${EXPIRELOGS}" ]]; then + find "${LOCALHOSTPATH}/${APP}"* -mtime +"${EXPIRELOGS}" -exec rm {} \; &> /dev/null + fi + fi + + # Send the files through SCP (not yet enabled) + if [[ "${SCPPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then + + # Setup up the proper command, depending on whether we're using key or password + if [[ -n "${SCPPASS}" ]]; then + TMP=$(<$SCPPASS) + SCPPASS="${TMP}" + SCPCMD="sshpass -p \"${SCPPASS}\" scp -o StrictHostKeyChecking=no" + SSHCMD="sshpass -p \"${SCPPASS}\" ssh" + else + SCPCMD="scp" + SSHCMD="ssh" + fi + + # Loop through the various scenarios, make directories if needed + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}" + + if [[ "${DIGEST}" == "1" ]]; then + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar" + eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}" + # Clean up your mess + if [[ -d "/tmp/avatar" ]]; then + rm -R "/tmp/avatar" + fi + fi + + if [[ "${PROJSTATS}" == "1" ]]; then + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/stats" + eval "${SCPCMD} -r" "/tmp/stats/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}" + # Clean up your mess + if [[ -d "/tmp/stats" ]]; then + rm -R "/tmp/stats" + fi + fi + + if [[ "${REPORT}" == "1" ]]; then + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report" + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css" + eval "${SCPCMD} -r" "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/js" + eval "${SCPCMD} -r" "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" + fi + + # Send over the logs and set permissions + eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "chmod -R 755 ${SCPHOSTPATH}/${APP}/" + fi + fi +} + +function htmlDir() { + if [[ ! -d "${LOCALHOSTPATH}/${APP}" ]]; then + mkdir "${LOCALHOSTPATH}/${APP}" + fi + + if [[ ! -d "${LOCALHOSTPATH}/${APP}/avatar" ]]; then + mkdir "${LOCALHOSTPATH}/${APP}/avatar" + fi + + if [[ "${message_state}" == "REPORT" ]]; then + if [[ ! -d "${LOCALHOSTPATH}/${APP}/report" ]]; then + mkdir "${LOCALHOSTPATH}/${APP}/report"; errorChk + mkdir "${LOCALHOSTPATH}/${APP}/report/css"; errorChk + mkdir "${LOCALHOSTPATH}/${APP}/report/js"; errorChk + fi + cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; errorChk + cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; errorChk + fi +} diff --git a/lib/statistics.sh b/lib/statistics.sh index e117c19..01b4522 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -8,33 +8,43 @@ trace "Loading statistics functions" function projStats() { - hash gitchart 2>/dev/null || { - error "gitchart not installed." - } - if [[ "${REMOTELOG}" == "TRUE" ]] && [[ "${LOCALHOSTPOST}" == "TRUE" ]]; then - [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" - [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" - notice "Generating files..." + hash gitchart 2>/dev/null || { + error "gitchart not installed." + } + if [[ "${REMOTELOG}" == "TRUE" ]]; then + # Setup up tmp work folder + if [[ ! -d "/tmp/stats" ]]; then + umask 077 && mkdir /tmp/stats &> /dev/null + fi - # Process the HTML - cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" - processHTML - cat "${htmlFile}" > "${LOCALHOSTPATH}/${APP}/stats/index.html" + notice "Generating files..." - # Create the charts - /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "${LOCALHOSTPATH}/${APP}/stats/authors.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "${LOCALHOSTPATH}/${APP}/stats/commits_day_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "${LOCALHOSTPATH}/${APP}/stats/commits_hour_day.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "${LOCALHOSTPATH}/${APP}/stats/commits_hour_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "${LOCALHOSTPATH}/${APP}/stats/commits_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "${LOCALHOSTPATH}/${APP}/stats/commits_year.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "${LOCALHOSTPATH}/${APP}/stats/commits_year_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "${LOCALHOSTPATH}/${APP}/stats/files_type.svg" &>> /dev/null & - # /usr/bin/gitchart -r "${WORKPATH}/${APP}" commits_day "${LOCALHOSTPATH}/${APP}/stats/commits_day.svg" &>> /dev/null & - spinner $! + # Process the HTML + cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" + processHTML + cat "${htmlFile}" > "/tmp/stats/index.html" - # Process primary chart color and set permissions if needed - sleep 1; find "${LOCALHOSTPATH}/${APP}/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; - chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null - fi + # Create the charts + /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & + # /usr/bin/gitchart -r "${WORKPATH}/${APP}" commits_day "${LOCALHOSTPATH}/${APP}/stats/commits_day.svg" &>> /dev/null & + spinner $! + + # Process primary chart color and set permissions if needed + sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; + + postLog +# if [[ "${LOCALHOSTPOST}" == "TRUE" ]]; then +# [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" +# [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" +# cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}" +# chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null +# fi + fi } diff --git a/lib/wp.sh b/lib/wp.sh index 97ea60f..9b65b2c 100755 --- a/lib/wp.sh +++ b/lib/wp.sh @@ -75,7 +75,7 @@ function wpPkg() { fi # If running in Wordpress update-only mode, bail out - if [[ "$UPGRADE" == "1" ]] && [[ "$UPD1" == "1" ]] && [[ "$UPD2" == "1" ]]; then + if [[ "${UPGRADE}" == "1" ]] && [[ "${UPD1}" == "1" ]] && [[ "${UPD2}" == "1" ]]; then notice "No updates available, halting." safeExit fi From 26377cd8aa08437175aa0bd18d5d6b1d1c6e0d19 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 28 Nov 2017 20:06:29 -0800 Subject: [PATCH 007/334] Resolve #112 --- lib/post-log.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/post-log.sh b/lib/post-log.sh index 1154cc5..f5f0312 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -94,10 +94,13 @@ function postLog() { eval "${SCPCMD} -r" "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/js" eval "${SCPCMD} -r" "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" + eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report/${REMOTEFILE}" fi # Send over the logs and set permissions - eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null + if [[ "${REPORT}" != "1" ]] && [[ "${PROJSTATS}" != "1" ]]; then + eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null + fi eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "chmod -R 755 ${SCPHOSTPATH}/${APP}/" fi fi From cd4dfda042e022a085172f5dfd3159abf70b383b Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 1 Dec 2017 15:15:58 -0800 Subject: [PATCH 008/334] Resolve #113 --- deploy.sh | 4 ++-- etc/html/default/stats/index.html | 2 +- lib/post-log.sh | 36 +++++++++++++++++++------------ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/deploy.sh b/deploy.sh index 0896d15..e69c50a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -57,7 +57,7 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ POSTEMAILHEAD POSTEMAILTAIL POSTTOSLACK SLACKURL SLACKERROR POSTURL NOKEY \ PROJNAME PROJCLIENT DEVURL PRODURL REPO MASTER PRODUCTION COMMITMSG DEPLOY \ DONOTDEPLOY TASK CHECKBRANCH ACTIVECHECK CHECKTIME GARBAGE WFCHECK ACFKEY \ - WFOFF REMOTELOG POSTTOLOCALHOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK DIGESTURL \ + WFOFF REMOTELOG LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK DIGESTURL \ CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD SSHCMD \ LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME TASKUSER \ CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \ @@ -71,7 +71,7 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${PROJNAME} ${PROJCLIENT} ${DEVURL} ${PRODURL} ${REPO} ${MASTER} ${PRODUCTION} ${COMMITMSG} ${DEPLOY} ${DONOTDEPLOY} ${TASK} ${CHECKBRANCH} ${ACTIVECHECK} ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} - ${POSTTOLOCALHOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} ${DIGESTSLACK} ${DIGESTURL} + ${LOCALHOSTPOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} ${DIGESTSLACK} ${DIGESTURL} ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER} ${SCPHOST} ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index c02a1de..c008afa 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -111,7 +111,7 @@

Any Quest

ItemDescription
X
Item ID
X
Description
${TASK}X
Web hosting for the month of ${LASTMONTH}
${TASK}X
${INCLUDEHOSTING}
%hX
%s
%hX
%s
diff --git a/lib/post-log.sh b/lib/post-log.sh index f5f0312..e931831 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -12,7 +12,7 @@ function postLog() { if [[ "${REMOTELOG}" == "TRUE" ]]; then # Post to localhost by simply copying files - if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then + if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -n "${LOCALHOSTPATH}" ]] && [[ -f "${htmlFile}" ]]; then # Check that directory exists htmlDir @@ -71,6 +71,8 @@ function postLog() { eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}" if [[ "${DIGEST}" == "1" ]]; then + REMOTEFILE="digest-${EPOCH}.html" + DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar" eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}" # Clean up your mess @@ -89,6 +91,8 @@ function postLog() { fi if [[ "${REPORT}" == "1" ]]; then + REMOTEFILE="${EPOCH}.php" + REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css" eval "${SCPCMD} -r" "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" @@ -107,21 +111,25 @@ function postLog() { } function htmlDir() { - if [[ ! -d "${LOCALHOSTPATH}/${APP}" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}" - fi + # Yet another if/then to cover my ass. What a mess! + if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -n "${LOCALHOSTPATH}" ]]; then - if [[ ! -d "${LOCALHOSTPATH}/${APP}/avatar" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}/avatar" - fi + if [[ ! -d "${LOCALHOSTPATH}/${APP}" ]]; then + mkdir "${LOCALHOSTPATH}/${APP}" + fi - if [[ "${message_state}" == "REPORT" ]]; then - if [[ ! -d "${LOCALHOSTPATH}/${APP}/report" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}/report"; errorChk - mkdir "${LOCALHOSTPATH}/${APP}/report/css"; errorChk - mkdir "${LOCALHOSTPATH}/${APP}/report/js"; errorChk + if [[ ! -d "${LOCALHOSTPATH}/${APP}/avatar" ]]; then + mkdir "${LOCALHOSTPATH}/${APP}/avatar" + fi + + if [[ "${message_state}" == "REPORT" ]]; then + if [[ ! -d "${LOCALHOSTPATH}/${APP}/report" ]]; then + mkdir "${LOCALHOSTPATH}/${APP}/report"; errorChk + mkdir "${LOCALHOSTPATH}/${APP}/report/css"; errorChk + mkdir "${LOCALHOSTPATH}/${APP}/report/js"; errorChk + fi + cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; errorChk + cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; errorChk fi - cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; errorChk - cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; errorChk fi } From d01cab4fde9d68387e0053c6c856f6639f978cab Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 1 Dec 2017 18:52:19 -0800 Subject: [PATCH 009/334] Resolve #114 --- lib/git.sh | 2 +- lib/log-handling.sh | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/git.sh b/lib/git.sh index 97cc2f3..5ee4c6f 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -324,7 +324,7 @@ function gitPushProd() { # Get the stats for this git author, just for fun function gitStats() { - if [[ "${GITSTATS}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]] && [[ "${PUBLISH}" != "1" ]]; then + if [[ "${GITSTATS}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]] && [[ "${PUBLISH}" != "1" ]] && [[ "${APPROVE}" != "1" ]]; then console "Calculating..." getent passwd "${USER}" | cut -d ':' -f 5 | cut -d ',' -f 1 > "${trshFile}" FULLUSER=$(<"${trshFile}") diff --git a/lib/log-handling.sh b/lib/log-handling.sh index 6657f88..c0d0b9a 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -157,12 +157,17 @@ function htmlBuild() { LOGURL="${REMOTEURL}/${APP}/${EPOCH}.${LOGSUFFIX}" REMOTEFILE="${EPOCH}.${LOGSUFFIX}" else - if [[ "${message_state}" != "SUCCESS" ]] || [[ -z "${COMMITHASH}" ]]; then - LOGURL="${REMOTEURL}/${APP}/${message_state}-${EPOCH}.${LOGSUFFIX}" - REMOTEFILE="${message_state}-${EPOCH}.${LOGSUFFIX}" + if [[ "${message_state}" == "APPROVAL NEEDED" ]]; then + LOGURL="${REMOTEURL}/${APP}/APPROVAL-${EPOCH}.${LOGSUFFIX}" + REMOTEFILE="APPROVAL-${EPOCH}.${LOGSUFFIX}" else - LOGURL="${REMOTEURL}/${APP}/${COMMITHASH}.${LOGSUFFIX}" - REMOTEFILE="${COMMITHASH}.${LOGSUFFIX}" + if [[ "${message_state}" != "SUCCESS" ]] || [[ -z "${COMMITHASH}" ]]; then + LOGURL="${REMOTEURL}/${APP}/${message_state}-${EPOCH}.${LOGSUFFIX}" + REMOTEFILE="${message_state}-${EPOCH}.${LOGSUFFIX}" + else + LOGURL="${REMOTEURL}/${APP}/${COMMITHASH}.${LOGSUFFIX}" + REMOTEFILE="${COMMITHASH}.${LOGSUFFIX}" + fi fi fi From debe19051b6ab9651a27becdfb3ae2f182d20622 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 3 Dec 2017 13:32:39 -0800 Subject: [PATCH 010/334] Improved test emails --- CHANGELOG.md | 1 + deploy.sh | 14 ++-- lib/mail-log.sh | 191 ++++++++++++++++++++++++++++++++---------------- 3 files changed, 134 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb331bd..4d7c7b6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Remote servers can now host project logs, digests, statistics, and reports ### Changed - Item descriptions are now editable in reports +- Cleaned up email output generated using `deploy --email-test` ### Fixed - Fixed a bug that kept SSH keys from being properly checked diff --git a/deploy.sh b/deploy.sh index e69c50a..610a8bc 100755 --- a/deploy.sh +++ b/deploy.sh @@ -57,12 +57,12 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ POSTEMAILHEAD POSTEMAILTAIL POSTTOSLACK SLACKURL SLACKERROR POSTURL NOKEY \ PROJNAME PROJCLIENT DEVURL PRODURL REPO MASTER PRODUCTION COMMITMSG DEPLOY \ DONOTDEPLOY TASK CHECKBRANCH ACTIVECHECK CHECKTIME GARBAGE WFCHECK ACFKEY \ - WFOFF REMOTELOG LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK DIGESTURL \ - CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD SSHCMD \ - LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME TASKUSER \ - CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \ - PROFILEID METRIC RESULT ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO REPORTURL \ - CLIENTCONTACT INCLUDEHOSTING <<< "" + WFOFF REMOTELOG REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK \ + DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD \ + SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME \ + TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ + REFRESHTOKEN PROFILEID METRIC RESULT ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO \ + REPORTURL CLIENTCONTACT INCLUDEHOSTING <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} @@ -70,7 +70,7 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${POSTEMAILTAIL} ${POSTTOSLACK} ${SLACKURL} ${SLACKERROR} ${POSTURL} ${NOKEY} ${PROJNAME} ${PROJCLIENT} ${DEVURL} ${PRODURL} ${REPO} ${MASTER} ${PRODUCTION} ${COMMITMSG} ${DEPLOY} ${DONOTDEPLOY} ${TASK} ${CHECKBRANCH} ${ACTIVECHECK} - ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} + ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} ${REMOTETEMPLATE} ${LOCALHOSTPOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} ${DIGESTSLACK} ${DIGESTURL} ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER} ${SCPHOST} ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} diff --git a/lib/mail-log.sh b/lib/mail-log.sh index 42be1df..e3b64e0 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -79,37 +79,66 @@ function emailTest() { echo "Current user is ${DEV}

"; echo echo "Project Information
" - echo "Name: ${PROJNAME}
" - echo "Client: ${PROJCLIENT}
" - echo "Logo: ${CLIENTLOGO}
" - echo "Digest email(s): ${DIGESTEMAIL}
" - echo "Staging URL: ${DEVURL}
" - echo "Production URL: ${PRODURL}

" - echo - echo "Git Configuration
" - echo "Repo: ${REPOHOST}/${REPO}
" - echo "Master branch: ${MASTER}
" - echo "Production branch: ${PRODUCTION}
" - echo "Auto merge: ${AUTOMERGE}
" - echo "File Stashing: ${STASH}
" - echo "Force branch checking: ${CHECKBRANCH}

" - echo - echo "Wordpress Setup
" - echo "Wordpress root: ${WPROOT}
" - echo "Wordpress application: ${WPAPP}
" - echo "Wordpress system: ${WPSYSTEM}

" - echo - echo "Deployment Configuration
" - echo "Deploy command: ${DEPLOY}
" - echo "Disallow deployment: ${DONOTDEPLOY}

" - echo - echo "Integration
" - echo "Task #: ${TASK}
" - echo "Task user: ${TASKUSER}
" - echo "Task time: ${ADDTIME}
" - echo "Post to Slack: ${POSTTOSLACK}
" - echo "Post errors to Slack: ${SLACKERROR}
" - echo "Google Analytics ID: ${PROFILEID}"; + [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}
" + [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}
" + [[ -n "${CLIENTLOGO}" ]] && echo "Logo: ${CLIENTLOGO}
" + [[ -n "${DIGESTEMAIL}" ]] && echo "Digest email(s): ${DIGESTEMAIL}
" + [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}
" + [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}
" + echo "
" + # Git + if [[ -n "${REPO}" ]] || [[ -n "${MASTER}" ]] || [[ -n "${PRODUCTION}" ]] || [[ -n "${AUTOMERGE}" ]] || [[ -n "${STASH}" ]] || [[ -n "${CHECKBRANCH}" ]]; then + echo "Git Configuration
" + [[ -n "${REPO}" ]] && echo "Repo: ${REPOHOST}/${REPO}
" + [[ -n "${MASTER}" ]] && echo "Master branch: ${MASTER}
" + [[ -n "${PRODUCTION}" ]] && echo "Production branch: ${PRODUCTION}
" + [[ -n "${AUTOMERGE}" ]] && echo "Auto merge: ${AUTOMERGE}
" + [[ -n "${STASH}" ]] && echo "File Stashing: ${STASH}
" + [[ -n "${CHECKBRANCH}" ]] && echo "Force branch checking: ${CHECKBRANCH}
" + echo "
" + fi + # Wordpress + if [[ -n "${WPROOT}" ]] || [[ -n "${WPAPP}" ]] || [[ -n "${WPSYSTEM}" ]]; then + echo "Wordpress Setup
" + [[ -n "${WPROOT}" ]] && echo "Wordpress root: ${WPROOT}
" + [[ -n "${WPAPP}" ]] && echo "Wordpress application: ${WPAPP}
" + [[ -n "${WPSYSTEM}" ]] && echo "Wordpress system: ${WPSYSTEM}
" + echo "
" + fi + # Deployment + if [[ -n "${DEPLOY}" ]] || [[ -n "${DONOTDEPLOY}" ]]; then + echo "Deployment Configuration
" + [[ -n "${DEPLOY}" ]] && echo "Deploy command: ${DEPLOY}
" + [[ -n "${DONOTDEPLOY}" ]] && echo "Disallow deployment: ${DONOTDEPLOY}
" + echo "
" + fi + # Integration + if [[ -n "${TASK}" ]] || [[ -n "${TASKUSER}" ]] || [[ -n "${ADDTIME}" ]] || [[ -n "${POSTTOSLACK}" ]] || [[ -n "${SLACKERROR}" ]] || [[ -n "${PROFILEID}" ]] || [[ -n "${POSTURL}" ]]; then + echo "Integration
" + [[ -n "${TASK}" ]] && echo "Task #: ${TASK}
" + [[ -n "${TASKUSER}" ]] && echo "Task user: ${TASKUSER}
" + [[ -n "${ADDTIME}" ]] && echo "Task time: ${ADDTIME}
" + [[ -n "${POSTTOSLACK}" ]] && echo "Post to Slack: ${POSTTOSLACK}
" + [[ -n "${SLACKERROR}" ]] && echo "Post errors to Slack: ${SLACKERROR}
" + [[ -n "${POSTURL}" ]] && echo "Webhook URL: ${POSTURL}
" + [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}
" + echo "
" + fi + # Logging + if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then + echo "Logging
" + [[ -n "${REMOTELOG}" ]] && echo "Web logs: ${REMOTELOG}
" + [[ -n "${REMOTEURL}" ]] && echo "Address: ${REMOTEURL}
" + [[ -n "${EXPIRELOGS}" ]] && echo "Log expiration: ${EXPIRELOGS} days
" + [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}
" + [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH
" + [[ -n "${SCPPOST}" ]] && echo "Post with SCP/SSH: ${SCPPOST}
" + [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}
" + [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}
" + [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}
" + [[ -n "${REMOTETEMPLATE}" ]] && echo "Log template: ${REMOTETEMPLATE}
" + echo "
" + fi ) | "${MAILPATH}"/sendmail -t # Send Text mail ( @@ -125,41 +154,73 @@ function emailTest() { echo echo "Project Information" echo "-------------------" - echo "Name: ${PROJNAME}" - echo "Client: ${PROJCLIENT}" - echo "Logo: ${CLIENTLOGO}" - echo "Digest email(s): ${DIGESTEMAIL}" - echo "Staging URL: ${DEVURL}" - echo "Production URL: ${PRODURL}" - echo - echo "Git Configuration" - echo "-----------------" - echo "Repo: ${REPOHOST}/${REPO}" - echo "Master branch: ${MASTER}" - echo "Production branch: ${PRODUCTION}" - echo "Auto merge: ${AUTOMERGE}" - echo "File Stashing: ${STASH}" - echo "Force branch checking: ${CHECKBRANCH}" - echo - echo "Wordpress Setup" - echo "-----------------------" - echo "Wordpress root: ${WPROOT}" - echo "Wordpress application: ${WPAPP}" - echo "Wordpress system: ${WPSYSTEM}" - echo - echo "Deployment Configuration" - echo "------------------------" - echo "Deploy command: ${DEPLOY}" - echo "Disallow deployment: ${DONOTDEPLOY}" + [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}" + [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}" + [[ -n "${CLIENTLOGO}" ]] && echo "Logo: ${CLIENTLOGO}" + [[ -n "${DIGESTEMAIL}" ]] && echo "Digest email(s): ${DIGESTEMAIL}" + [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}" + [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}" echo - echo "Integration" - echo "-----------" - echo "Task #: ${TASK}" - echo "Task user: ${TASKUSER}" - echo "Task time: ${ADDTIME}" - echo "Post to Slack: ${POSTTOSLACK}" - echo "Post errors to Slack: ${SLACKERROR}" - echo "Google Analytics ID: ${PROFILEID}"; + # Git + if [[ -n "${REPO}" ]] || [[ -n "${MASTER}" ]] || [[ -n "${PRODUCTION}" ]] || [[ -n "${AUTOMERGE}" ]] || [[ -n "${STASH}" ]] || [[ -n "${CHECKBRANCH}" ]]; then + echo "Git Configuration" + echo "-----------------" + [[ -n "${REPO}" ]] && echo "Repo: ${REPOHOST}/${REPO}" + [[ -n "${MASTER}" ]] && echo "Master branch: ${MASTER}" + [[ -n "${PRODUCTION}" ]] && echo "Production branch: ${PRODUCTION}" + [[ -n "${AUTOMERGE}" ]] && echo "Auto merge: ${AUTOMERGE}" + [[ -n "${STASH}" ]] && echo "File Stashing: ${STASH}" + [[ -n "${CHECKBRANCH}" ]] && echo "Force branch checking: ${CHECKBRANCH}" + echo + fi + # Wordpress + if [[ -n "${WPROOT}" ]] || [[ -n "${WPAPP}" ]] || [[ -n "${WPSYSTEM}" ]]; then + echo "Wordpress Setup" + echo "---------------" + [[ -n "${WPROOT}" ]] && echo "Wordpress root: ${WPROOT}" + [[ -n "${WPAPP}" ]] && echo "Wordpress application: ${WPAPP}" + [[ -n "${WPSYSTEM}" ]] && echo "Wordpress system: ${WPSYSTEM}" + echo + fi + # Deployment + if [[ -n "${DEPLOY}" ]] || [[ -n "${DONOTDEPLOY}" ]]; then + echo "Deployment Configuration" + echo "------------------------" + [[ -n "${DEPLOY}" ]] && echo "Deploy command: ${DEPLOY}" + [[ -n "${DONOTDEPLOY}" ]] && echo "Disallow deployment: ${DONOTDEPLOY}" + echo + fi + # Integration + if [[ -n "${TASK}" ]] || [[ -n "${TASKUSER}" ]] || [[ -n "${ADDTIME}" ]] || [[ -n "${POSTTOSLACK}" ]] || [[ -n "${SLACKERROR}" ]] || [[ -n "${PROFILEID}" ]] || [[ -n "${POSTURL}" ]]; then + echo "Integration" + echo "-----------" + [[ -n "${TASK}" ]] && echo "Task #: ${TASK}" + [[ -n "${TASKUSER}" ]] && echo "Task user: ${TASKUSER}" + [[ -n "${ADDTIME}" ]] && echo "Task time: ${ADDTIME}" + [[ -n "${POSTTOSLACK}" ]] && echo "Post to Slack: ${POSTTOSLACK}" + [[ -n "${SLACKERROR}" ]] && echo "Post errors to Slack: ${SLACKERROR}" + [[ -n "${POSTURL}" ]] && echo "Webhook URL: ${POSTURL}" + [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}" + echo + fi + # Logging + if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then + echo "Logging" + echo "-------" + [[ -n "${REMOTELOG}" ]] && echo "Web logs: ${REMOTELOG}" + [[ -n "${REMOTEURL}" ]] && echo "Address: ${REMOTEURL}" + [[ -n "${EXPIRELOGS}" ]] && echo "Log expiration: ${EXPIRELOGS} days" + [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}" + [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH" + [[ -n "${SCPPOST}" ]] && echo "Post with SCP/SSH: ${SCPPOST}" + [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}" + [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}" + [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}" + [[ -n "${REMOTETEMPLATE}" ]] && echo "Log template: ${REMOTETEMPLATE}s" + echo + fi + + ) | "${MAILPATH}"/sendmail -t fi From 9cfade4cbad6b2725dba001f045f4869902905fb Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 4 Dec 2017 14:02:00 -0800 Subject: [PATCH 011/334] Fix for weird new session results from Google --- CHANGELOG.md | 1 + lib/analytics.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d7c7b6..a9def72 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Cleaned up email output generated using `deploy --email-test` ### Fixed - Fixed a bug that kept SSH keys from being properly checked +- Added a workaround for Google potentially displaying over 100% of user sessions as new ## [3.6.5] - 11-17-2017 ### Added diff --git a/lib/analytics.sh b/lib/analytics.sh index a89033a..222296e 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -39,7 +39,11 @@ function analytics() { fi if [[ "${RND}" == "1" ]]; then - if [[ "${SIZE}" -gt "50" ]]; then + # Sometimes Google reports confusion percentages that exceed + # 100%, let's kill those results + if [[ "${}" -gt "100" ]]; then + analyticsFail + elif [[ "${SIZE}" -gt "50" ]]; then ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That's great!" else RESULT="$((100 - ${SIZE}))" From a501d52899fd3d9b9f7d748af83f4f2b69f1303c Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 4 Dec 2017 17:45:19 -0800 Subject: [PATCH 012/334] Added dependency checks to install script --- install/doinst.sh | 177 +++++++++++++++++++++++++++++++++++----------- lib/git.sh | 2 +- lib/report.sh | 86 +++++++++++----------- lib/statistics.sh | 62 ++++++++-------- 4 files changed, 212 insertions(+), 115 deletions(-) diff --git a/install/doinst.sh b/install/doinst.sh index d96ea31..a2add37 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -1,48 +1,145 @@ -#!/usr/bin/bash +#!/bin/bash # -# doinst.sh +# install.sh # -# Installs deployment files for use system-wide +############################################################################### +# Installs and configures deploy +# +# https://github.com/EMRL/deploy +############################################################################### + +# No root, no fun +if [[ "${EUID}" -ne 0 ]]; then + echo "You must have root access to install - try 'sudo install/doinst.sh'" 2>&1 + exit 1 +fi + +function check_os() { + # Try to discover the OS flavor + if [[ -f /etc/os-release ]]; then + # freedesktop.org and systemd + . /etc/os-release + OS="${NAME}" + VER="${VERSION_ID}" + elif type lsb_release >/dev/null 2>&1; then + # linuxbase.org + OS="$(lsb_release -si)" + VER="$(lsb_release -sr)" + elif [[ -f /etc/lsb-release ]]; then + # For some versions of Debian/Ubuntu without lsb_release command + . /etc/lsb-release + OS="${DISTRIB_ID}" + VER="${DISTRIB_RELEASE}" + elif [[ -f /etc/debian_version ]]; then + # Older Debian/Ubuntu/etc. + OS=Debian + VER="$(cat /etc/debian_version)" + elif [[ -f /etc/SuSe-release ]]; then + # Older SuSE/etc. + ... + elif [[ -f /etc/redhat-release ]]; then + # Older Red Hat, CentOS, etc. + ... + else + # Fall back to uname, e.g. "Linux ", also works for BSD, etc. + OS="$(uname -s)" + VER="$(uname -r)" + fi +} + +function check_program() { + printf "%-40s" "Checking for ${1}..." + whereis $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } +} + +function check_optional() { + printf "%-40s" "Checking for ${1}..." + whereis $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } +} -# Error check function function errorChk() { - EXITCODE=$?; - if [[ "${EXITCODE}" != "0" ]]; then - echo "Error ${EXITCODE}: deploy not installed." - exit "${EXITCODE}" - fi + EXITCODE=$?; + if [[ "${EXITCODE}" != "0" ]]; then + echo "Error ${EXITCODE}: deploy not installed." + exit "${EXITCODE}" + fi } -# Check for root -if [[ "${EUID}" -ne 0 ]]; then - echo "You must have root access to install - try 'sudo install/doinst.sh'" 2>&1 +echo; check_os +if [[ -n "${OS}" ]] && [[ -n "${VER}" ]]; then + echo "=> Checking operating system: "; sleep 1 + echo "${OS} ${VER}"; sleep 1 +else + # No values, crash out for now exit 1 +fi + +# Declare dependencies +dependencies=(awk cat curl echo eval gawk git grep pkill printf read sed sendmail sleep tput wget) + +# Declare optional stuff +options=(gitchart grunt npm scp ssh sshpass wp) + +message='' +fg_red=`tput setaf 1` +fg_green=`tput setaf 2` +reset=`tput sgr0` + +# Common messages +YES="${fg_green}OK${reset}" +NO="${fg_red}NO${reset}" +NOT="${fg_red}NOT FOUND${reset}" + +echo; echo "=> Checking for required dependencies:"; sleep 1 +for i in "${dependencies[@]}" ; do + check_program $i +done + +if [[ -z "${message}" ]] ; then + #echo "${fg_green}SUCCESS: System is ready!${reset}" + sleep 1 else - if [[ ! -d /etc/deploy ]] && [[ ! -d /etc/deploy/lib ]] && [[ ! -d /etc/deploy/crontab ]]; then - echo "Creating directories" - if [[ ! -d /etc/deploy ]]; then - sudo mkdir /etc/deploy; errorChk - fi - - if [[ ! -d /etc/deploy/lib ]]; then - sudo mkdir /etc/deploy/lib; errorChk - fi - - if [[ ! -d /etc/deploy/lib/crontab ]]; then - sudo mkdir /etc/deploy/lib/crontab; errorChk - fi - fi - - echo "Installing configuration files" - sudo cp -R etc/* /etc/deploy; errorChk - sudo cp etc/.deployrc /etc/deploy; errorChk - - if [[ ! -f /etc/deploy/deploy.conf ]]; then - cp /etc/deploy/deploy-example.conf /etc/deploy/deploy.conf; errorChk - fi - - cp -R lib/* /etc/deploy/lib; errorChk - cp deploy.sh /usr/local/bin/deploy; errorChk - sudo chmod 755 /usr/local/bin/deploy; errorChk - echo "Successfully installed, try typing 'deploy' for help." -fi \ No newline at end of file + echo "${fg_red}ERROR: Install missing dependencies and retry installation${reset}" + # echo ${message}; + exit 1 +fi + +echo; echo "=> Checking optional dependencies:"; sleep 1 +for k in "${options[@]}" ; do + check_optional $k +done + +if [[ -n "${message}" ]] ; then + echo "${fg_red}WARNING: Some extended functions will not be available${reset}" + # echo ${message}; +fi + +# Start the install: First check for root +echo; sleep 1 +if [[ ! -d /etc/deploy ]] && [[ ! -d /etc/deploy/lib ]] && [[ ! -d /etc/deploy/crontab ]]; then + echo "Creating directories" + if [[ ! -d /etc/deploy ]]; then + sudo mkdir /etc/deploy; errorChk + fi + + if [[ ! -d /etc/deploy/lib ]]; then + sudo mkdir /etc/deploy/lib; errorChk + fi + + if [[ ! -d /etc/deploy/lib/crontab ]]; then + sudo mkdir /etc/deploy/lib/crontab; errorChk + fi +fi + +echo "Installing configuration files" +sudo cp -R etc/* /etc/deploy; errorChk +sudo cp etc/.deployrc /etc/deploy; errorChk + +if [[ ! -f /etc/deploy/deploy.conf ]]; then + cp /etc/deploy/deploy-example.conf /etc/deploy/deploy.conf; errorChk +fi + +cp -R lib/* /etc/deploy/lib; errorChk +cp deploy.sh /usr/local/bin/deploy; errorChk +sudo chmod 755 /usr/local/bin/deploy; errorChk +echo "Successfully installed, try typing 'deploy' for help." diff --git a/lib/git.sh b/lib/git.sh index 5ee4c6f..fd89d7f 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -46,7 +46,7 @@ function gitStart() { activeChk # Try to clear out old git processes owned by this user, if they exist - killall -9 git &>> /dev/null || true + pkill -f git &>> /dev/null || true } # Checkout master diff --git a/lib/report.sh b/lib/report.sh index 2b8c004..dac791d 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -8,47 +8,47 @@ trace "Loading report handling" function createReport() { - message_state="REPORT" - htmlDir - - # Get the first and last day of last month - CURMTH="$(date +%m)" - CURYR="$(date +%Y)" - - if [[ "${CURMTH}" -eq 1 ]]; then - PRVMTH="12" - PRVYR=`expr "${CURYR}" - 1` - else PRVMTH=`expr "${CURMTH}" - 2` - PRVYR="${CURYR}" - fi - - if [[ "${PRVMTH}" -lt 10 ]]; - then PRVMTH="0${PRVMTH}" - fi - - # Try to setup the month/day count - LASTDY=`cal ${PRVMTH} ${PRVYR} | egrep "28|29|30|31" |tail -1 |awk '{print $NF}'` - - if [[ -n "${INCLUDEHOSTING}" ]] && [[ "${INCLUDEHOSTING}" != "FALSE" ]]; then - # If INCLUDEHOSTING is equal to something other than TRUE, its value - # will be used as the text string in the report - if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then - INCLUDEHOSTING="Web hosting for the month of ${LASTMONTH}" - fi - echo "" >> "${statFile}" - fi - - #if [[ $(git log --before={'date "+%Y-%m-01"'} --after=${PRVYR}-${PRVMTH}-31) ]]; then - git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" >> "${statFile}" - - # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know. - if [[ ! -s "${statFile}" ]]; then - echo "" > "${statFile}" - fi - - # Compile full report - cat "${deployPath}/html/${HTMLTEMPLATE}/report/header.html" "${statFile}" "${deployPath}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}" - - # Filter and replace template variables - processHTML + message_state="REPORT" + htmlDir + + # Get the first and last day of last month + CURMTH="$(date +%m)" + CURYR="$(date +%Y)" + + if [[ "${CURMTH}" -eq 1 ]]; then + PRVMTH="12" + PRVYR=`expr "${CURYR}" - 1` + else PRVMTH=`expr "${CURMTH}" - 2` + PRVYR="${CURYR}" + fi + + if [[ "${PRVMTH}" -lt 10 ]]; + then PRVMTH="0${PRVMTH}" + fi + + # Try to setup the month/day count + LASTDY=`cal ${PRVMTH} ${PRVYR} | egrep "28|29|30|31" |tail -1 |awk '{print $NF}'` + + if [[ -n "${INCLUDEHOSTING}" ]] && [[ "${INCLUDEHOSTING}" != "FALSE" ]]; then + # If INCLUDEHOSTING is equal to something other than TRUE, its value + # will be used as the text string in the report + if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then + INCLUDEHOSTING="Web hosting for the month of ${LASTMONTH}" + fi + echo "" >> "${statFile}" + fi + + #if [[ $(git log --before={'date "+%Y-%m-01"'} --after=${PRVYR}-${PRVMTH}-31) ]]; then + git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" >> "${statFile}" + + # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know. + if [[ ! -s "${statFile}" ]]; then + echo "" > "${statFile}" + fi + + # Compile full report + cat "${deployPath}/html/${HTMLTEMPLATE}/report/header.html" "${statFile}" "${deployPath}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}" + + # Filter and replace template variables + processHTML } diff --git a/lib/statistics.sh b/lib/statistics.sh index 01b4522..8653e0a 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -8,43 +8,43 @@ trace "Loading statistics functions" function projStats() { - hash gitchart 2>/dev/null || { - error "gitchart not installed." - } - if [[ "${REMOTELOG}" == "TRUE" ]]; then - # Setup up tmp work folder + hash gitchart 2>/dev/null || { + error "gitchart not installed." + } + if [[ "${REMOTELOG}" == "TRUE" ]]; then + # Setup up tmp work folder if [[ ! -d "/tmp/stats" ]]; then umask 077 && mkdir /tmp/stats &> /dev/null fi - notice "Generating files..." + notice "Generating files..." - # Process the HTML - cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" - processHTML - cat "${htmlFile}" > "/tmp/stats/index.html" + # Process the HTML + cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" + processHTML + cat "${htmlFile}" > "/tmp/stats/index.html" - # Create the charts - /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & - # /usr/bin/gitchart -r "${WORKPATH}/${APP}" commits_day "${LOCALHOSTPATH}/${APP}/stats/commits_day.svg" &>> /dev/null & - spinner $! + # Create the charts + /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & + # /usr/bin/gitchart -r "${WORKPATH}/${APP}" commits_day "${LOCALHOSTPATH}/${APP}/stats/commits_day.svg" &>> /dev/null & + spinner $! - # Process primary chart color and set permissions if needed - sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; + # Process primary chart color and set permissions if needed + sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; - postLog -# if [[ "${LOCALHOSTPOST}" == "TRUE" ]]; then -# [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" -# [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" -# cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}" -# chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null -# fi - fi + postLog +# if [[ "${LOCALHOSTPOST}" == "TRUE" ]]; then +# [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" +# [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" +# cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}" +# chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null +# fi + fi } From e4e21cc76c1e94e05ed55d1b57f00f5f86e5e862 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 4 Dec 2017 17:48:51 -0800 Subject: [PATCH 013/334] Changed to command -v --- install/doinst.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/doinst.sh b/install/doinst.sh index a2add37..bb787e4 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# install.sh +# doinst.sh # ############################################################################### # Installs and configures deploy @@ -49,12 +49,12 @@ function check_os() { function check_program() { printf "%-40s" "Checking for ${1}..." - whereis $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } + command -v $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } } function check_optional() { printf "%-40s" "Checking for ${1}..." - whereis $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } + command -v $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } } function errorChk() { From f4691eb585e4db86475b2e29df2e4b12d3c272cf Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sat, 9 Dec 2017 22:30:27 -0800 Subject: [PATCH 014/334] PHP Server Monitor integration --- deploy.sh | 9 ++++- etc/deploy.sh | 25 +++++++++++-- etc/html/default/approve.html | 2 +- etc/html/default/error.html | 2 +- etc/html/default/header.html | 6 ++- etc/html/default/success.html | 2 +- lib/log-handling.sh | 1 + lib/mail-log.sh | 17 +++++++++ lib/monitor.sh | 70 +++++++++++++++++++++++++++++++++++ lib/process-html.sh | 7 +++- lib/utilities.sh | 8 ++++ 11 files changed, 137 insertions(+), 12 deletions(-) create mode 100755 lib/monitor.sh diff --git a/deploy.sh b/deploy.sh index 610a8bc..273769b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -91,7 +91,8 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile AUTHORNAME GRAVATAR IMGFILE SIZE RND ANALYTICSMSG digestSendmail MINAUSER \ MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX QUEUED \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile CURMTH \ - CURYR PRVMTH PRVYR LASTDY TMP <<< "" + CURYR PRVMTH PRVYR LASTDY TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ + MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI <<< "" echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} ${urlFile} ${htmlFile} ${htmlSendmail} ${htmlEmail} ${clientEmail} ${textSendmail} ${deployPath} ${etcLocation} ${libLocation} @@ -106,7 +107,9 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${digestSendmail} ${MINAUSER} ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${QUEUED} ${DISABLESSHCHECK} ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${CURMTH} ${CURYR} - ${PRVMTH} ${PRVYR} ${LASTDY} ${TMP}" > /dev/null + ${PRVMTH} ${PRVYR} ${LASTDY} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} + ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} + ${MONITORAPI}" > /dev/null # Options function flags() { @@ -143,6 +146,7 @@ Other Options: --slack-test Test Slack integration --post-test Test webhook integration --analytics-test Test Google Analytics authentication + --monitor-test Test production server uptime and latency monitoring --function-list Output a list of all functions() --variable-list Output a project's declared variables @@ -204,6 +208,7 @@ while [[ ${1:-unset} = -?* ]]; do --email-test) EMAILTEST="1" ;; --post-test) POSTTEST="1" ;; --analytics-test) ANALYTICSTEST="1" ;; + --monitor-test) MONITORTEST="1" ;; --stats) PROJSTATS="1" ;; --unlock) UNLOCK="1" ;; --repair) REPAIR="1"; FORCE="1"; MERGE="1"; STASH="TRUE"; VERBOSE="1" ;; diff --git a/etc/deploy.sh b/etc/deploy.sh index 45db2e1..61de5ee 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -200,20 +200,39 @@ # LOCALHOSTPOST="TRUE" # LOCALHOSTPATH="/var/www/production/deploy" +# Server Monitoring +# +# Uptime and average latency can be included in logs, digests, and reports when +# integrating with PHP Server Monitor, and an add-on API. +# See https://github.com/EMRL/deploy/wiki/Integration for more information. +# +# Full API URL +# MONITORURL="https://your.phpservermonitor.com/api/monitorapi.php" +# +# Email/password of the user that will access the API. Password can be stored in +# a file outside of the project repo for security reasons +# MONITORUSER="user@domain.com" +# MONITORPASS="/path/to/password/file" +# +# Server ID to monitor. When viewing the server on your web console, your URL will +# look something like https://monitor.com/?&mod=server&action=view&id=3 - in this +# case SERVERID would be "3" (notice the &id=3 at the end of the URL) +# SERVERID="###" + # Google Analytics # # API credentials # CLIENTID="#############################################.apps.googleusercontent.com" # CLIENTSECRET="########################" # REDIRECTURI="http://localhost" - +# # OAuth authorization will expire after one hour, but will be updated when needed # if the tokens below are configured correctly # AUTHORIZATIONCODE="##############################################" - +# # Tokens # ACCESSTOKEN="#################################################################################################################################" # REFRESHTOKEN="##################################################################" - +# # Google Analytics ID # PROFILEID="########" diff --git a/etc/html/default/approve.html b/etc/html/default/approve.html index e658d7e..3016d05 100755 --- a/etc/html/default/approve.html +++ b/etc/html/default/approve.html @@ -1,4 +1,4 @@ -

Proposed commit from {{USER}}
+

Proposed commit from {{USER}}
{{NOTES}}

diff --git a/etc/html/default/error.html b/etc/html/default/error.html index 2c3e39a..5288396 100755 --- a/etc/html/default/error.html +++ b/etc/html/default/error.html @@ -1,4 +1,4 @@ -

ERROR: +

ERROR: {{NOTES}}

diff --git a/etc/html/default/header.html b/etc/html/default/header.html index 43412e8..4537e1b 100755 --- a/etc/html/default/header.html +++ b/etc/html/default/header.html @@ -61,8 +61,10 @@ {{PROJCLIENT}} -

Date: {{NOW}}
- Project: {{PROJNAME}} ({{PROJCLIENT}})
+

Date: {{NOW}}
+ Project: {{PROJNAME}} ({{PROJCLIENT}})
Staging URL: {{DEVURL}}
Production URL: {{PRODURL}}

+
Uptime: {{UPTIME}}%
+
Latency: {{LATENCY}}s
\ No newline at end of file diff --git a/etc/html/default/success.html b/etc/html/default/success.html index 7c9c872..787a54e 100755 --- a/etc/html/default/success.html +++ b/etc/html/default/success.html @@ -1,4 +1,4 @@ -

Commit {{COMMITHASH}} by {{USER}} +

Commit {{COMMITHASH}} by {{USER}}
Notes: {{NOTES}}

diff --git a/lib/log-handling.sh b/lib/log-handling.sh index c0d0b9a..55dde5d 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -174,6 +174,7 @@ function htmlBuild() { # Insert the full deployment logfile & button it all up if [[ "${REPORT}" != "1" ]]; then cat "${logFile}" "${deployPath}/html/${HTMLTEMPLATE}/footer.html" >> "${htmlFile}" + # There's probably a better place for this. processHTML fi } diff --git a/lib/mail-log.sh b/lib/mail-log.sh index e3b64e0..301a858 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -124,6 +124,14 @@ function emailTest() { [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}
" echo "
" fi + # Server monitoring + if [[ -n "${MONITORURL}" ]] || [[ -n "${MONITORUSER}" ]] || [[ -n "${SERVERID}" ]]; then + echo "Server Monitoring
" + [[ -n "${TASK}" ]] && echo "Monitor URL: ${MONITORURL}
" + [[ -n "${TASK}" ]] && echo "User: ${MONITORUSER}
" + [[ -n "${TASK}" ]] && echo "Server ID: ${SERVERID}
" + echo "
" + fi # Logging if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then echo "Logging
" @@ -203,6 +211,15 @@ function emailTest() { [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}" echo fi + # Server monitoring + if [[ -n "${MONITORURL}" ]] || [[ -n "${MONITORUSER}" ]] || [[ -n "${SERVERID}" ]]; then + echo "Server Monitoring" + echo "-----------------" + [[ -n "${TASK}" ]] && echo "Monitor URL: ${MONITORURL}" + [[ -n "${TASK}" ]] && echo "User: ${MONITORUSER}" + [[ -n "${TASK}" ]] && echo "Server ID: ${SERVERID}" + echo + fi # Logging if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then echo "Logging" diff --git a/lib/monitor.sh b/lib/monitor.sh new file mode 100755 index 0000000..166988e --- /dev/null +++ b/lib/monitor.sh @@ -0,0 +1,70 @@ +#!/bin/bash +# +# monitor.sh +# +############################################################################### +# Uses PHP Server Monitor and an add-on API to retrieve a production server's +# uptime and latency +############################################################################### +trace "Loading server monitoring" + +function server_monitor() { + # Don't bother unless all the needed variables are declared + if [[ -n "${MONITORURL}" ]] && [[ -n "${MONITORUSER}" ]] && [[ -n "${SERVERID}" ]] && [[ -n "${MONITORPASS}" ]]; then + # What kind of log is this? + if [[ "${REPORT}" == "1" ]]; then + # Last 30 days; this will not correlate exactly with the time range of the report + # which is dealing with the last calendar month, but oh well we get what we pay + # for. The PHP Monitor API has no ability to look up results in that way + MONITORHOURS="720" + else + # Default to last 7 days + MONITORHOURS="168" + fi + server_monitor_log + trace "Uptime: ${UPTIME} / Latency: ${LATENCY} (avg. over last ${MONITORHOURS} hours)" + fi +} + +function server_monitor_test() { + notice "Testing server monitor integration..." + if [[ -n "${MONITORURL}" ]] && [[ -n "${MONITORUSER}" ]] && [[ -n "${SERVERID}" ]] && [[ -n "${MONITORPASS}" ]]; then + console "Monitor URL: ${MONITORURL}" + console "User: ${MONITORUSER}" + console "Server ID: ${SERVERID}" + console "Password file: ${MONITORPASS}" + else + warning "Server monitoring is not configured; check your project's configuration file." + return + fi + + # Check last 7 days for the sake of the test + MONITORHOURS="168" + server_monitor_log + console "API: ${MONITORAPI}" + notice "Results (last 7 days)" + console "Uptime: ${UPTIME}%" + console "Latency: ${LATENCY}s" +} + +function server_monitor_log() { + # :oad the password and setup the curl command + MONITORPASS=$(<$MONITORPASS) + MONITORAPI="${MONITORURL}?tag=serveruptime&email=${MONITORUSER}&app_password=${MONITORPASS}&server_id=${SERVERID}&HoursUnit=${MONITORHOURS}" + curl -s --request GET "${MONITORAPI}" -o "${trshFile}" + # Uptime + UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trshFile}) + UPTIME="$(cut -d ',' -f 1 <<< "${UPTIME}")" + # Isolate the value we need + UPTIME="$(sed 's/^[^:]*://g' <<< "${UPTIME}")" + # Round to two decimal places + UPTIME="$(printf '%0.2f\n' "${UPTIME}")" + + # Latency + LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trshFile})" + LATENCY="$(cut -d ',' -f 1 <<< "${LATENCY}")" + # Isolate the value we need + LATENCY="$(sed 's/^[^:]*://g' <<< "${LATENCY}")" + # Round to two decimal places + LATENCY="$(printf '%0.2f\n' "${LATENCY}")" +} diff --git a/lib/process-html.sh b/lib/process-html.sh index 47bb48a..4ce4391 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -8,14 +8,15 @@ trace "Loading html handling" function processHTML() { - # Clean out the variables stuff we don't need + # Clean out the stuff we don't need [[ -z "${DEVURL}" ]] && sed -i '/Staging URL:/d' "${htmlFile}" [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${htmlFile}" + [[ -z "${UPTIME}" ]] && sed -i '/UPTIME/d' "${htmlFile}" + [[ -z "${LATENCY}" ]] && sed -i '/LATENCY/d' "${htmlFile}" [[ -z "${PROJCLIENT}" ]] && sed -i 's/()//' "${htmlFile}" [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${htmlFile}" [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${htmlFile}" [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${htmlFile}" - [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]] && sed -i '/ANALYTICS/d' "${htmlFile}" [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${htmlFile}" @@ -59,5 +60,7 @@ function processHTML() { -e "s^{{DIGESTCOVER}}^${DIGESTCOVER}^g" \ -e "s^{{WEEKOF}}^${WEEKOF}^g" \ -e "s^{{LASTMONTH}}^${LASTMONTH}^g" \ + -e "s^{{UPTIME}}^${UPTIME}^g" \ + -e "s^{{LATENCY}}^${LATENCY}^g" \ "${htmlFile}" } diff --git a/lib/utilities.sh b/lib/utilities.sh index f7b2aa5..c7a9014 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -37,6 +37,11 @@ function go() { analyticsTest; quickExit fi + # Test server monitoring + if [[ "${MONITORTEST}" == "1" ]]; then + server_monitor_test; quickExit + fi + # Test SSH key authentication using the --ssh-check flag if [[ "${SSHTEST}" == "1" ]]; then if [[ "${NOKEY}" != "TRUE" ]] && [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then @@ -95,6 +100,9 @@ function go() { if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ -f "${WORKPATH}/${APP}/.queued" ]] && [[ -f "${WORKPATH}/${APP}/.approved" ]]; then notice "Processing outstanding approval..." fi + + # Weird spot for this I know + server_monitor } function fixIndex() { From d2265e2d22d4718bf187268fa20a9e3a47a284e3 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 13 Dec 2017 00:30:53 -0800 Subject: [PATCH 015/334] Temp cleanup --- etc/html/default/digest/header.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html index ce3735c..79a8391 100755 --- a/etc/html/default/digest/header.html +++ b/etc/html/default/digest/header.html @@ -46,6 +46,7 @@ + + + + + + + + + + + + + + + + + +
From 8b090900919080a0ba92ee12e7ad8e32baece41b Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 13 Dec 2017 14:28:57 -0800 Subject: [PATCH 016/334] awk or gawk? --- lib/git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git.sh b/lib/git.sh index fd89d7f..84c5c13 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -330,6 +330,6 @@ function gitStats() { FULLUSER=$(<"${trshFile}") git log --author="${FULLUSER}" --pretty=tformat: --numstat | \ # The single quotes were messing with trying to line break this one - gawk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf "Your total lines of code contributed so far: %s\n(+%s added | -%s deleted)\n",loc,add,subs }' - + awk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf "Your total lines of code contributed so far: %s\n(+%s added | -%s deleted)\n",loc,add,subs }' - fi } From ba3c364d2c5cd58e72fc82d462ca762671c71d7b Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 18 Dec 2017 09:31:26 -0800 Subject: [PATCH 017/334] Trimming decimal points that equal .00 from monitor reports --- install/doinst.sh | 4 ++-- lib/analytics.sh | 2 +- lib/monitor.sh | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/install/doinst.sh b/install/doinst.sh index bb787e4..2e35155 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -75,7 +75,7 @@ else fi # Declare dependencies -dependencies=(awk cat curl echo eval gawk git grep pkill printf read sed sendmail sleep tput wget) +dependencies=(awk cat curl echo eval git grep pkill printf read sed sendmail sleep tput wget) # Declare optional stuff options=(gitchart grunt npm scp ssh sshpass wp) @@ -110,7 +110,7 @@ for k in "${options[@]}" ; do done if [[ -n "${message}" ]] ; then - echo "${fg_red}WARNING: Some extended functions will not be available${reset}" + echo "${fg_red}WARNING: Some extended functionality may not be available${reset}" # echo ${message}; fi diff --git a/lib/analytics.sh b/lib/analytics.sh index 222296e..0f02057 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -41,7 +41,7 @@ function analytics() { if [[ "${RND}" == "1" ]]; then # Sometimes Google reports confusion percentages that exceed # 100%, let's kill those results - if [[ "${}" -gt "100" ]]; then + if [[ "${SIZE}" -gt "100" ]]; then analyticsFail elif [[ "${SIZE}" -gt "50" ]]; then ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That's great!" diff --git a/lib/monitor.sh b/lib/monitor.sh index 166988e..85d2a2b 100755 --- a/lib/monitor.sh +++ b/lib/monitor.sh @@ -48,7 +48,7 @@ function server_monitor_test() { } function server_monitor_log() { - # :oad the password and setup the curl command + # Load the password and setup the curl command MONITORPASS=$(<$MONITORPASS) MONITORAPI="${MONITORURL}?tag=serveruptime&email=${MONITORUSER}&app_password=${MONITORPASS}&server_id=${SERVERID}&HoursUnit=${MONITORHOURS}" curl -s --request GET "${MONITORAPI}" -o "${trshFile}" @@ -59,6 +59,10 @@ function server_monitor_log() { UPTIME="$(sed 's/^[^:]*://g' <<< "${UPTIME}")" # Round to two decimal places UPTIME="$(printf '%0.2f\n' "${UPTIME}")" + # Lop off the .00 if we're at 100% + if [[ "${UPTIME}" == "100.00" ]]; then + UPTIME="100" + fi # Latency LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trshFile})" From 6c5442785768cdb85ddf4bc122b683547bdbcded Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 27 Dec 2017 23:48:26 -0800 Subject: [PATCH 018/334] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9def72..ed6bea5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added +- Server health information now included in email/html logs via integration with [PHP Server Monitor](http://www.phpservermonitor.org/) using this [API](https://github.com/skydiver/PHP-Server-Monitor-API) - Option to include web hosting as a line item on monthly reports - Remote servers can now host project logs, digests, statistics, and reports ### Changed From 0ca8a7676e581096cd89cc0b3628b882d2679296 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 28 Dec 2017 00:16:52 -0800 Subject: [PATCH 019/334] Server monitor integration --- etc/html/default/digest/footer.html | 2 +- etc/html/default/footer.html | 2 +- etc/html/default/header.html | 4 +++- etc/html/default/stats/index.html | 2 +- lib/monitor.sh | 13 ++++++++----- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/etc/html/default/digest/footer.html b/etc/html/default/digest/footer.html index 5658922..5d22d9a 100755 --- a/etc/html/default/digest/footer.html +++ b/etc/html/default/digest/footer.html @@ -19,7 +19,7 @@ diff --git a/etc/html/default/footer.html b/etc/html/default/footer.html index e2557fb..ec82169 100755 --- a/etc/html/default/footer.html +++ b/etc/html/default/footer.html @@ -10,7 +10,7 @@ diff --git a/etc/html/default/header.html b/etc/html/default/header.html index 4537e1b..03e0f37 100755 --- a/etc/html/default/header.html +++ b/etc/html/default/header.html @@ -1,3 +1,4 @@ + @@ -67,4 +68,5 @@ Production URL:{{PRODURL}}

Uptime: {{UPTIME}}%
-
Latency: {{LATENCY}}s
\ No newline at end of file +
Latency: {{LATENCY}}s
+ \ No newline at end of file diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index c008afa..24f0f39 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -111,7 +111,7 @@

Any Quest

diff --git a/lib/monitor.sh b/lib/monitor.sh index 85d2a2b..6af8492 100755 --- a/lib/monitor.sh +++ b/lib/monitor.sh @@ -17,9 +17,12 @@ function server_monitor() { # which is dealing with the last calendar month, but oh well we get what we pay # for. The PHP Monitor API has no ability to look up results in that way MONITORHOURS="720" - else - # Default to last 7 days + elif [[ "${DIGEST}" == "1" ]] || [[ "${PROJSTATS}" == "1" ]]; then + # Digests and reports should average the 7 days MONITORHOURS="168" + else + # Anything else defaults to 24 hours + MONITORHOURS="24" fi server_monitor_log trace "Uptime: ${UPTIME} / Latency: ${LATENCY} (avg. over last ${MONITORHOURS} hours)" @@ -39,10 +42,10 @@ function server_monitor_test() { fi # Check last 7 days for the sake of the test - MONITORHOURS="168" + MONITORHOURS="24" server_monitor_log - console "API: ${MONITORAPI}" - notice "Results (last 7 days)" + console "API: ${MONITORAPI}" + notice "Results (last 24 hours)" console "Uptime: ${UPTIME}%" console "Latency: ${LATENCY}s" } From 1997457202f76e70a4576298761ae756a7e4f953 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 31 Dec 2017 13:28:23 -0800 Subject: [PATCH 020/334] Improved report URL, resolve #119 --- CHANGELOG.md | 1 + etc/html/default/report/header.html | 2 +- lib/post-log.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed6bea5..347c4b4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Item descriptions are now editable in reports - Cleaned up email output generated using `deploy --email-test` +- Report URLs are now writted as `report/YEAR-MONTH.php` instead of using a hard to remember string ### Fixed - Fixed a bug that kept SSH keys from being properly checked - Added a workaround for Google potentially displaying over 100% of user sessions as new diff --git a/etc/html/default/report/header.html b/etc/html/default/report/header.html index ec6e499..0e5a447 100755 --- a/etc/html/default/report/header.html +++ b/etc/html/default/report/header.html @@ -32,7 +32,7 @@

{{PROJCLIENT}}

 - + diff --git a/lib/post-log.sh b/lib/post-log.sh index e931831..c5a6791 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -91,7 +91,7 @@ function postLog() { fi if [[ "${REPORT}" == "1" ]]; then - REMOTEFILE="${EPOCH}.php" + REMOTEFILE="${CURYR}-${CURMTH}.php" REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css" From 6a49f4b222131e2eeba7f8f75a854a39af37245f Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 1 Jan 2018 13:03:32 -0800 Subject: [PATCH 021/334] Fixed calendar year rollover, resolve #120 --- lib/report.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/report.sh b/lib/report.sh index dac791d..f4a7ba5 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -16,7 +16,7 @@ function createReport() { CURYR="$(date +%Y)" if [[ "${CURMTH}" -eq 1 ]]; then - PRVMTH="12" + PRVMTH="11" PRVYR=`expr "${CURYR}" - 1` else PRVMTH=`expr "${CURMTH}" - 2` PRVYR="${CURYR}" @@ -30,16 +30,16 @@ function createReport() { LASTDY=`cal ${PRVMTH} ${PRVYR} | egrep "28|29|30|31" |tail -1 |awk '{print $NF}'` if [[ -n "${INCLUDEHOSTING}" ]] && [[ "${INCLUDEHOSTING}" != "FALSE" ]]; then - # If INCLUDEHOSTING is equal to something other than TRUE, its value - # will be used as the text string in the report + # If INCLUDEHOSTING is equal to something other than TRUE (And not FALSE), + # its value will be used as the text string in the report if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then - INCLUDEHOSTING="Web hosting for the month of ${LASTMONTH}" + INCLUDEHOSTING="Web hosting for the month of ${LASTMONTH} ${PRVYR}" fi echo "" >> "${statFile}" fi - #if [[ $(git log --before={'date "+%Y-%m-01"'} --after=${PRVYR}-${PRVMTH}-31) ]]; then - git log --all --no-merges --first-parent --before={'date "+%Y-%m-01"'} --after="${PRVYR}-${PRVMTH}-31 00:00" --pretty=format:"" >> "${statFile}" + trace "git log --all --no-merges --first-parent --before=\"${CURYR}-${CURMTH}-1 00:00\" --after=\"${PRVYR}-${PRVMTH}-${LASTDY} 00:00\" --pretty=format:\"\"" + git log --all --no-merges --first-parent --before="${CURYR}-${CURMTH}-1 00:00" --after="${PRVYR}-${PRVMTH}-${LASTDY} 00:00" --pretty=format:"" >> "${statFile}" # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know. if [[ ! -s "${statFile}" ]]; then From ee55f493add0dfbeef3160014ac45aa78eb3e788 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 1 Jan 2018 13:06:51 -0800 Subject: [PATCH 022/334] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 347c4b4..0fd0aae 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Cleaned up email output generated using `deploy --email-test` - Report URLs are now writted as `report/YEAR-MONTH.php` instead of using a hard to remember string ### Fixed -- Fixed a bug that kept SSH keys from being properly checked +- Fixed a bug with running a report on dates in the previous calendar year - Added a workaround for Google potentially displaying over 100% of user sessions as new +- Fixed a bug that kept SSH keys from being properly checked ## [3.6.5] - 11-17-2017 ### Added From 727f95b50316ed84e6afa546e23cac3b8a8279d0 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 2 Jan 2018 16:33:46 -0800 Subject: [PATCH 023/334] Report format tweak --- etc/html/default/report/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/html/default/report/header.html b/etc/html/default/report/header.html index 0e5a447..e6e0b1f 100755 --- a/etc/html/default/report/header.html +++ b/etc/html/default/report/header.html @@ -32,7 +32,7 @@

{{PROJCLIENT}}

Invoice #Invoice Ref. #
${TASK}X
${INCLUDEHOSTING}
%hX
%s
%hX
%s
%hX
%s
- + From 011129e2cd2a19fcacdcef67792b02a3bb8225b6 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 8 Jan 2018 09:25:17 -0800 Subject: [PATCH 024/334] Analytics payload bug, resolve #122 --- lib/analytics.sh | 1 + lib/digest.sh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/analytics.sh b/lib/analytics.sh index 0f02057..206fbac 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -82,6 +82,7 @@ function analyticsData() { SIZE="$(printf "%.0f\n" "${RESULT}")" } +# If no other results are worht displaying, fall back to displaying hits function analyticsFail() { METRIC="hits" analyticsData diff --git a/lib/digest.sh b/lib/digest.sh index 744d96c..6ccb967 100755 --- a/lib/digest.sh +++ b/lib/digest.sh @@ -66,8 +66,13 @@ function createDigest() { # git log --no-merges --since="7 days ago" --reverse --stat | grep -Eo "[0-9]{1,} files? changed" | grep -Eo "[0-9]{1,}" | awk "{ sum += \$1 } END { print sum }" processHTML + # Strip out useless analytics results if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then sed -i '/ANALYTICS/d' "${htmlFile}" + else + if [[ "${METRIC}" == "hits" ]] && [[ "${RESULT}" -lt "499" ]]; then + sed -i '/ANALYTICS/d' "${htmlFile}" + fi fi # Get the email payload ready From c3b6a2d201611286b2360c69286bfd29e6213db7 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 10 Jan 2018 21:17:52 -0800 Subject: [PATCH 025/334] New release function, resolves #123 --- CHANGELOG.md | 1 + deploy.sh | 5 +++-- lib/core.sh | 9 +++++---- lib/release-check.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100755 lib/release-check.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd0aae..90a4a2d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Server health information now included in email/html logs via integration with [PHP Server Monitor](http://www.phpservermonitor.org/) using this [API](https://github.com/skydiver/PHP-Server-Monitor-API) - Option to include web hosting as a line item on monthly reports - Remote servers can now host project logs, digests, statistics, and reports +- New release check now runs upon launch ### Changed - Item descriptions are now editable in reports - Cleaned up email output generated using `deploy --email-test` diff --git a/deploy.sh b/deploy.sh index 273769b..ac63e12 100755 --- a/deploy.sh +++ b/deploy.sh @@ -92,7 +92,8 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX QUEUED \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile CURMTH \ CURYR PRVMTH PRVYR LASTDY TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ - MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI <<< "" + MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI RELEASE RELEASENOTES \ + RELEASEURL <<< "" echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} ${urlFile} ${htmlFile} ${htmlSendmail} ${htmlEmail} ${clientEmail} ${textSendmail} ${deployPath} ${etcLocation} ${libLocation} @@ -109,7 +110,7 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${CURMTH} ${CURYR} ${PRVMTH} ${PRVYR} ${LASTDY} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} - ${MONITORAPI}" > /dev/null + ${MONITORAPI} ${RELEASE} ${RELEASENOTES} ${RELEASEURL}" > /dev/null # Options function flags() { diff --git a/lib/core.sh b/lib/core.sh index d43beca..ebfa86f 100755 --- a/lib/core.sh +++ b/lib/core.sh @@ -7,10 +7,11 @@ ############################################################################### function coreApp() { - depCheck # Check that required commands are available - gitStart # Check for a valid git project and get set up - lock # Create lock file - go # Start a deployment work session + depCheck # Check that required commands are available + release_check # Check for newer version at Github + gitStart # Check for a valid git project and get set up + lock # Create lock file + go # Start a deployment work session if [[ "${DIGEST}" == "1" ]]; then createDigest elif [[ "${REPORT}" == "1" ]]; then diff --git a/lib/release-check.sh b/lib/release-check.sh new file mode 100755 index 0000000..c384584 --- /dev/null +++ b/lib/release-check.sh @@ -0,0 +1,46 @@ +#!/bin/bash +# +# release-check.sh +# +############################################################################### +# Check to see if there is a new release version on Github +############################################################################### + +function release_check() { + # Only check for a newer release when someone is at the console + if [[ "${FORCE}" != "1" ]]; then + # Get the release tag + trace "Checking for deploy updates..." + RELEASE="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"tag_name\")" + # Remove the extra garbage + RELEASE="${RELEASE#*v}" + RELEASE="$(printf '%s' "${RELEASE}" | sed 's/",//g')" + + # Compare versions + if version_compare "${RELEASE}" "${VERSION}"; then + # Get release notes + RELEASENOTES="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"body\")" + # Remove the extra garbage + RELEASENOTES="$(printf '%s' "${RELEASENOTES}" | sed 's^\"body\": \"^^g')" + RELEASENOTES="${RELEASENOTES//\"}" + RELEASENOTES=${RELEASENOTES#" "} + + # User feedback + info "\r\nNew release found: ${RELEASE}" + printf "${RELEASENOTES}" | fold --spaces -w 78; emptyLine + # Update? + if yesno --default yes "Would you like to download now? [Y/n] "; then + # Get latest + RELEASEURL="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep tarball_url | cut -d '"' -f 4)" + curl -Ls "${RELEASEURL}" -o "deploy-${RELEASE}.tar.gz" + # Eventually I'll have a full install here but for now we'll bail + console "Try 'tar zxvf deploy-${RELEASE}.tar.gz' and then 'sudo doinst.sh' from the archive root directory." + quietExit + fi + fi + fi +} + +function version_compare() { + test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; +} From 15db0e5584de4446f4f72496dae5b67f5d604d7b Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sat, 13 Jan 2018 11:04:12 -0800 Subject: [PATCH 026/334] Release 3.6.6 --- CHANGELOG.md | 7 +++++-- README.md | 8 ++++---- deploy.sh | 2 +- lib/invoice.sh | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 7 deletions(-) create mode 100755 lib/invoice.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a4a2d..4d274b0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [3.6.6] - 01-13-2018 ### Added - Server health information now included in email/html logs via integration with [PHP Server Monitor](http://www.phpservermonitor.org/) using this [API](https://github.com/skydiver/PHP-Server-Monitor-API) - Option to include web hosting as a line item on monthly reports @@ -179,7 +179,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Old monolithic script rewritten -[Unreleased]: https://github.com/EMRL/deploy/compare/v3.6.5...HEAD +[Unreleased]: https://github.com/EMRL/deploy/compare/v3.6.6...HEAD +[3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...3.6.8 +[3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...3.6.7 +[3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...3.6.6 [3.6.5]: https://github.com/EMRL/deploy/compare/v3.6.4...3.6.5 [3.6.4]: https://github.com/EMRL/deploy/compare/v3.6...v3.6.4 [3.6]: https://github.com/EMRL/deploy/compare/v3.5.7...v3.6 diff --git a/README.md b/README.md index 87e6cfc..adae3e4 100755 --- a/README.md +++ b/README.md @@ -1,18 +1,16 @@ # Deploy -[![release](https://img.shields.io/badge/release-v3.6.5-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) +[![release](https://img.shields.io/badge/release-v3.6.6-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy) `deploy` is a shell script designed to speed up and automate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. -[![asciicast](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP.png)](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP?t=0) +[Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md) This script is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us. Please note that our documentation here is nearly useless, and there is quite a bit of setup involved in getting this running reliably. A full setup guide is coming soon™. -[View Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md) - ## Startup Options ``` @@ -52,6 +50,8 @@ Other Options: --variable-list Output a project's declared variables ``` +[![asciicast](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP.png)](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP?t=0) + ## How It Works Basically, this thing is a wrapper that simplifies web app deployment from a development or staging environment to a production server. At the moment is mostly focused on Wordpress projects but in it should work for other stuff too. diff --git a/deploy.sh b/deploy.sh index ac63e12..faf8e70 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.6rc" +VERSION="3.6.6" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LASTMONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" diff --git a/lib/invoice.sh b/lib/invoice.sh new file mode 100755 index 0000000..31a784b --- /dev/null +++ b/lib/invoice.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# +# invoice.sh +# +############################################################################### +# Handles creating invoices and integration with InvoiceNinja +############################################################################### + +function create_invoice() { + # Will create the invoice payload + trace "This is an empty function" +} + +function send_invoice() { + # Hit the InvoiceNinja API and create the invoice + # + # Things that need to be defined: + # API URL + # client_id + # + # And then we'll loop through + # product + # notes + # cost + # qty + # + # Example to create an invoice: + # + # curl -X POST https://invoice.com/api/v1/invoices -H "Content-Type:application/json" \ + # -d '{"client_id":"1", "invoice_items":[{"product_key": "ITEM", "notes":"Test", "cost":10, "qty":1}]}' \ + # -H "X-Ninja-Token: ###################################" + trace "This is an empty function" +} \ No newline at end of file From 5c0b341e5f4133483dea0f49f880a70a195a955d Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 14 Jan 2018 23:39:00 -0800 Subject: [PATCH 027/334] Some functions renamed --- deploy.sh | 2 +- install/doinst.sh | 20 ++++++++++---------- lib/active-check.sh | 2 +- lib/analytics.sh | 18 +++++++++--------- lib/approval.sh | 2 +- lib/core.sh | 16 ++++++++-------- lib/deployment.sh | 12 ++++++------ lib/digest.sh | 2 +- lib/display-styles.sh | 2 +- lib/error-check.sh | 12 ++++++------ lib/git.sh | 30 +++++++++++++++--------------- lib/mail-log.sh | 4 ++-- lib/permissions-fix.sh | 10 +++++----- lib/post-integration.sh | 4 ++-- lib/post-log.sh | 10 +++++----- lib/quit.sh | 18 +++++++++--------- lib/report.sh | 2 +- lib/slack.sh | 4 ++-- lib/ssh-check.sh | 4 ++-- lib/utilities.sh | 6 +++--- lib/webhook.sh | 6 +++--- lib/wp-acf.sh | 2 +- lib/wp-plugins.sh | 4 ++-- 23 files changed, 96 insertions(+), 96 deletions(-) diff --git a/deploy.sh b/deploy.sh index faf8e70..e7f97c3 100755 --- a/deploy.sh +++ b/deploy.sh @@ -564,7 +564,7 @@ if [[ "${MERGE}" == "1" ]] && [[ -z "${PRODUCTION}" ]]; then fi # Execute the deploy process -coreApp +core # Trapping stuff trap userExit INT diff --git a/install/doinst.sh b/install/doinst.sh index 2e35155..da2d401 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -57,7 +57,7 @@ function check_optional() { command -v $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } } -function errorChk() { +function error_check() { EXITCODE=$?; if [[ "${EXITCODE}" != "0" ]]; then echo "Error ${EXITCODE}: deploy not installed." @@ -119,27 +119,27 @@ echo; sleep 1 if [[ ! -d /etc/deploy ]] && [[ ! -d /etc/deploy/lib ]] && [[ ! -d /etc/deploy/crontab ]]; then echo "Creating directories" if [[ ! -d /etc/deploy ]]; then - sudo mkdir /etc/deploy; errorChk + sudo mkdir /etc/deploy; error_check fi if [[ ! -d /etc/deploy/lib ]]; then - sudo mkdir /etc/deploy/lib; errorChk + sudo mkdir /etc/deploy/lib; error_check fi if [[ ! -d /etc/deploy/lib/crontab ]]; then - sudo mkdir /etc/deploy/lib/crontab; errorChk + sudo mkdir /etc/deploy/lib/crontab; error_check fi fi echo "Installing configuration files" -sudo cp -R etc/* /etc/deploy; errorChk -sudo cp etc/.deployrc /etc/deploy; errorChk +sudo cp -R etc/* /etc/deploy; error_check +sudo cp etc/.deployrc /etc/deploy; error_check if [[ ! -f /etc/deploy/deploy.conf ]]; then - cp /etc/deploy/deploy-example.conf /etc/deploy/deploy.conf; errorChk + cp /etc/deploy/deploy-example.conf /etc/deploy/deploy.conf; error_check fi -cp -R lib/* /etc/deploy/lib; errorChk -cp deploy.sh /usr/local/bin/deploy; errorChk -sudo chmod 755 /usr/local/bin/deploy; errorChk +cp -R lib/* /etc/deploy/lib; error_check +cp deploy.sh /usr/local/bin/deploy; error_check +sudo chmod 755 /usr/local/bin/deploy; error_check echo "Successfully installed, try typing 'deploy' for help." diff --git a/lib/active-check.sh b/lib/active-check.sh index 4f1dcad..6ddf2f1 100755 --- a/lib/active-check.sh +++ b/lib/active-check.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading activity checking" -function activeChk() { +function active_check() { if [[ "${FORCE}" == "1" ]] && [[ "${UPGRADE}" == "1" ]] && [[ "${QUIET}" == "1" ]] && [[ "${ACTIVECHECK}" = "TRUE" ]]; then trace "Checking for active files" active_files=$(find "${WORKPATH}/${APP}" -mmin -"${CHECKTIME}" ! -path "${WORKPATH}/${APP}/public/app/wflogs/*" ! -path "${WORKPATH}/${APP}/.git/*" ! -path "${WORKPATH}/${APP}/.git") diff --git a/lib/analytics.sh b/lib/analytics.sh index 206fbac..eb3be70 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -28,13 +28,13 @@ function analytics() { ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")" # Grab data from Google - analyticsData + ga_data if [[ "${RND}" == "0" ]]; then if [[ "${RESULT}" -gt "499" ]]; then ANALYTICSMSG="You had ${SIZE} hits in the last week. Awesome!" else - analyticsFail + ga_fail fi fi @@ -42,7 +42,7 @@ function analytics() { # Sometimes Google reports confusion percentages that exceed # 100%, let's kill those results if [[ "${SIZE}" -gt "100" ]]; then - analyticsFail + ga_fail elif [[ "${SIZE}" -gt "50" ]]; then ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That's great!" else @@ -55,7 +55,7 @@ function analytics() { if [[ "${SIZE}" -ge "30" ]]; then ANALYTICSMSG="You had traffic from ${SIZE} organic searches last week. Not bad!" else - analyticsFail + ga_fail fi fi @@ -64,7 +64,7 @@ function analytics() { if [[ "${RESULT}" -gt "2" ]]; then ANALYTICSMSG="Last week visitors averaged over ${RESULT} minutes each on your site. Nice!" else - analyticsFail + ga_fail fi fi @@ -72,24 +72,24 @@ function analytics() { if [[ "${SIZE}" -ge "20" ]]; then ANALYTICSMSG="Your site had ${SIZE} social media interactions in the last week!" else - analyticsFail + ga_fail fi fi } -function analyticsData() { +function ga_data() { RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) SIZE="$(printf "%.0f\n" "${RESULT}")" } # If no other results are worht displaying, fall back to displaying hits -function analyticsFail() { +function ga_fail() { METRIC="hits" analyticsData ANALYTICSMSG="You had ${SIZE} hits in the last week." } -function analyticsTest() { +function ga_test() { emptyLine if [[ -z "${CLIENTID}" ]] || [[ -z "${CLIENTSECRET}" ]]; then warning "Define API project" diff --git a/lib/approval.sh b/lib/approval.sh index b078c9f..502c9a8 100755 --- a/lib/approval.sh +++ b/lib/approval.sh @@ -35,7 +35,7 @@ function approve() { git add "${QUEUED}" | tee --append "${logFile}" fi done < "${WORKPATH}/${APP}/.queued" - git commit -m "${notes}" &>> "${logFile}"; errorChk + git commit -m "${notes}" &>> "${logFile}"; error_check trace "Commit message: ${notes}" } diff --git a/lib/core.sh b/lib/core.sh index ebfa86f..d46cf79 100755 --- a/lib/core.sh +++ b/lib/core.sh @@ -6,16 +6,16 @@ # The core application ############################################################################### -function coreApp() { - depCheck # Check that required commands are available - release_check # Check for newer version at Github - gitStart # Check for a valid git project and get set up - lock # Create lock file - go # Start a deployment work session +function core() { + dependency_check # Check that required commands are available + release_check # Check for newer version at Github + gitStart # Check for a valid git project and get set up + lock # Create lock file + go # Start a deployment work session if [[ "${DIGEST}" == "1" ]]; then - createDigest + create_digest elif [[ "${REPORT}" == "1" ]]; then - createReport + create_report else srvCheck # Check that servers are up and running if [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then diff --git a/lib/deployment.sh b/lib/deployment.sh index 8e94a88..f04c7cc 100755 --- a/lib/deployment.sh +++ b/lib/deployment.sh @@ -23,9 +23,9 @@ function preDeploy() { emptyLine trace "Stashing dirty files" if [[ "${VERBOSE}" == "1" ]] && [[ "${QUIET}" != "1" ]]; then - git stash | tee --append "${logFile}"; errorChk + git stash | tee --append "${logFile}"; error_check else - git stash >> "${logFile}"; errorChk + git stash >> "${logFile}"; error_check fi currentStash="1" else @@ -55,7 +55,7 @@ function pkgDeploy() { emptyLine if [[ -n "${DEPLOY}" ]]; then # Add ssh keys and double check directoy - cd "${WORKPATH}/${APP}" || errorChk + cd "${WORKPATH}/${APP}" || error_check if [[ "${INCOGNITO}" != "TRUE" ]]; then trace "Launching deployment" else @@ -73,18 +73,18 @@ function pkgDeploy() { # If we don't require approval to push to live, keep going if [[ "${FORCE}" = "1" ]] || yesno --default yes "Deploy to live server? [Y/n] "; then # Test deployment command before running - deployChk + deploy_check # Deploy via deployment command specified in configuration if [[ "${VERBOSE}" == "1" ]] && [[ "${INCOGNITO}" != "TRUE" ]]; then eval "${DEPLOY}" | tee --append "${logFile}" - errorChk + error_check else if [[ "${QUIET}" != "1" ]]; then eval "${DEPLOY}" &>> "${logFile}" & spinner $! else eval "${DEPLOY}" &>> "${logFile}" - errorChk + error_check fi fi diff --git a/lib/digest.sh b/lib/digest.sh index 6ccb967..9f9e97a 100755 --- a/lib/digest.sh +++ b/lib/digest.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading digest handling" -function createDigest() { +function create_digest() { message_state="DIGEST" htmlDir diff --git a/lib/display-styles.sh b/lib/display-styles.sh index 9426318..e95c3e0 100755 --- a/lib/display-styles.sh +++ b/lib/display-styles.sh @@ -71,7 +71,7 @@ function error() { fi echo -e "\nERROR: $*" >> "${logFile}" error_msg="$*" - errorExit + error_exit } function warning() { diff --git a/lib/error-check.sh b/lib/error-check.sh index 0414c30..40820af 100755 --- a/lib/error-check.sh +++ b/lib/error-check.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# errorChk() +# error_check() # ############################################################################### # Handles various exit code checking @@ -8,16 +8,16 @@ trace "Loading error checking" # Try to get exit/error code, with a hard stop on fail -function errorChk() { +function error_check() { EXITCODE=$?; if [[ "${EXITCODE}" != 0 ]]; then warning "Exiting on error code ${EXITCODE}" error_msg="Exited on error code ${EXITCODE}" - errorExit + error_exit fi } -function deployChk() { +function deploy_check() { if [[ "${DEPLOY}" == *"mina"* ]]; then # && [[ "${DEPLOY}" != *"bundle"* ]]; then DEPLOYTEST="mina --simulate deploy" # Get variables organized @@ -102,14 +102,14 @@ function deployChk() { if [[ "${EXITCODE}" != 0 ]]; then warning "Deployment exited due to a configuration problem (Error ${EXITCODE})" error_msg="Deployment exited due to a configuration problem (Error ${EXITCODE})" - errorExit + error_exit fi trace "OK" fi } # Try to get exit/error code, with a hard stop on fail -function errorStatus() { +function error_status() { EXITCODE=$?; if [[ "${EXITCODE}" != 0 ]]; then error_msg="WARNING: Error code ${EXITCODE}" diff --git a/lib/git.sh b/lib/git.sh index 84c5c13..4fabcea 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -17,7 +17,7 @@ function gitStart() { info "${WORKPATH}/${APP} is not a valid directory." exit 1 else - cd "${WORKPATH}/${APP}" || errorChk + cd "${WORKPATH}/${APP}" || error_check fi # Check that .git exists @@ -43,7 +43,7 @@ function gitStart() { fi # Check for active files - activeChk + active_check # Try to clear out old git processes owned by this user, if they exist pkill -f git &>> /dev/null || true @@ -106,9 +106,9 @@ function gitStage() { if [[ "${FORCE}" = "1" ]] || yesno --default yes "Stage files? [Y/n] "; then trace "Staging files" if [[ "${VERBOSE}" -eq 1 ]]; then - git add -A | tee --append "${logFile}"; errorChk + git add -A | tee --append "${logFile}"; error_check else - git add -A &>> "${logFile}"; errorChk + git add -A &>> "${logFile}"; error_check fi else trace "Exiting without staging files"; userExit @@ -179,7 +179,7 @@ function gitCommit() { trace "Queuing commit message" echo "${notes}" > "${WORKPATH}/${APP}/.queued" else - git commit -m "${notes}" &>> "${logFile}"; errorChk + git commit -m "${notes}" &>> "${logFile}"; error_check trace "Commit message: ${notes}" fi fi @@ -196,7 +196,7 @@ function gitPushMstr() { trace "Pushing ${MASTER}"; fixIndex emptyLine if [[ "${VERBOSE}" -eq 1 ]]; then - git push | tee --append "${logFile}"; errorChk + git push | tee --append "${logFile}"; error_check else if [[ "${FORCE}" = "1" ]] || yesno --default yes "Push ${MASTER} branch? [Y/n] "; then if [[ "${NOKEY}" != "TRUE" ]]; then @@ -205,10 +205,10 @@ function gitPushMstr() { spinner $! info "Success. " else - git push &>> "${logFile}"; errorChk + git push &>> "${logFile}"; error_check fi else - git push &>> "${logFile}"; errorChk + git push &>> "${logFile}"; error_check fi else safeExit @@ -224,14 +224,14 @@ function gitChkProd() { notice "Checking out ${PRODUCTION} branch..."; fixIndex if [[ "${VERBOSE}" -eq 1 ]]; then - git checkout "${PRODUCTION}" | tee --append "${logFile}"; errorChk + git checkout "${PRODUCTION}" | tee --append "${logFile}"; error_check else if [[ "${QUIET}" != "1" ]]; then git checkout "${PRODUCTION}" &>> "${logFile}" & spinner $! info "Success. " else - git checkout "${PRODUCTION}" &>> "${logFile}"; errorChk + git checkout "${PRODUCTION}" &>> "${logFile}"; error_check fi fi @@ -243,7 +243,7 @@ function gitChkProd() { if [[ "${FORCE}" = "1" ]] || yesno --default yes "Current branch is ${current_branch} and should be ${PRODUCTION}, try again? [Y/n] "; then if [[ "${current_branch}" = "${MASTER}" ]]; then [[ -f "${gitLock}" ]] && rm "${gitLock}" - git add .; git checkout "${PRODUCTION}" &>> "${logFile}" #; errorChk + git add .; git checkout "${PRODUCTION}" &>> "${logFile}" #; error_check fi else safeExit @@ -269,7 +269,7 @@ function gitMerge() { # Clear out the index.lock file, cause reasons [[ -f "${gitLock}" ]] && rm "${gitLock}" # Bonus add, just because. Ugh. - # git add -A; errorChk + # git add -A; error_check if [[ "${VERBOSE}" -eq 1 ]]; then git merge "${MASTER}" | tee --append "${logFile}" else @@ -278,7 +278,7 @@ function gitMerge() { git merge "${MASTER}" &>> "${logFile}" & showProgress else - git merge "${MASTER}"&>> "${logFile}"; errorChk + git merge "${MASTER}"&>> "${logFile}"; error_check fi fi fi @@ -292,7 +292,7 @@ function gitPushProd() { trace "Push ${PRODUCTION}"; fixIndex emptyLine if [[ "${VERBOSE}" -eq 1 ]]; then - git push | tee --append "${logFile}"; errorChk + git push | tee --append "${logFile}"; error_check trace "OK" else if [[ "${FORCE}" = "1" ]] || yesno --default yes "Push ${PRODUCTION} branch? [Y/n] "; then @@ -302,7 +302,7 @@ function gitPushProd() { spinner $! info "Success. " else - git push &>> "${logFile}"; errorChk + git push &>> "${logFile}"; error_check fi sleep 1 if [[ $(git status --porcelain) ]]; then diff --git a/lib/mail-log.sh b/lib/mail-log.sh index 301a858..fb41ded 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -60,11 +60,11 @@ function mailLog() { fi } -function emailTest() { +function email_test() { console "Testing email..." if [[ -z "${TO}" ]]; then warning "No recipient address found."; emptyLine - cleanUp; exit 1 + clean_up; exit 1 else # Send HTML mail ( diff --git a/lib/permissions-fix.sh b/lib/permissions-fix.sh index 2918ec7..4c48b94 100755 --- a/lib/permissions-fix.sh +++ b/lib/permissions-fix.sh @@ -13,7 +13,7 @@ function permFix() { # /lib is obsolete for future repositories if [[ -d "$WORKPATH/$APP/lib" ]]; then - sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/lib; #errorChk + sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/lib; #error_check info " ${APP}/lib/" else sleep 1 @@ -28,13 +28,13 @@ function permFix() { sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/.gitmodules; > /dev/null; fi - sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/.git; #errorChk + sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/.git; #error_check info " ${APP}/.git" - sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/public/system; #errorChk + sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/public/system; #error_check info " ${APP}/public/system/" - sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/public/app; #errorChk + sudo chown -R "${DEVUSER}"."${DEVGROUP}" "${WORKPATH}"/"${APP}"/public/app; #error_check info " ${APP}/public/app/" - sudo chown -R "${APACHEUSER}"."${APACHEGROUP}" "${WORKPATH}"/"${APP}"/public/app; #errorChk + sudo chown -R "${APACHEUSER}"."${APACHEGROUP}" "${WORKPATH}"/"${APP}"/public/app; #error_check info " ${APP}/public/app/plugins" fi } diff --git a/lib/post-integration.sh b/lib/post-integration.sh index 94f5570..6aef391 100755 --- a/lib/post-integration.sh +++ b/lib/post-integration.sh @@ -8,7 +8,7 @@ trace "Loading integration" # Compile commit message with other stuff for integration -function buildLog() { +function build_log() { if [[ "${DIGEST}" != "1" ]]; then # OK let's grab the short version of the commit hash COMMITHASH="$(git rev-parse --short HEAD)"; @@ -86,7 +86,7 @@ function postCommit() { if [[ -n "$POSTEMAIL" ]]; then # Is it a valid email address? Ghetto check but better than nothing if [[ "$POSTEMAIL" == ?*@?*.?* ]]; then - buildLog; mailPost + build_log; mailPost else trace "Integration email address ${POSTEMAIL} does not look valid" fi diff --git a/lib/post-log.sh b/lib/post-log.sh index c5a6791..077d834 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -124,12 +124,12 @@ function htmlDir() { if [[ "${message_state}" == "REPORT" ]]; then if [[ ! -d "${LOCALHOSTPATH}/${APP}/report" ]]; then - mkdir "${LOCALHOSTPATH}/${APP}/report"; errorChk - mkdir "${LOCALHOSTPATH}/${APP}/report/css"; errorChk - mkdir "${LOCALHOSTPATH}/${APP}/report/js"; errorChk + mkdir "${LOCALHOSTPATH}/${APP}/report"; error_check + mkdir "${LOCALHOSTPATH}/${APP}/report/css"; error_check + mkdir "${LOCALHOSTPATH}/${APP}/report/js"; error_check fi - cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; errorChk - cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; errorChk + cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${LOCALHOSTPATH}/${APP}/report"; error_check + cp -R "${deployPath}/html/${HTMLTEMPLATE}/report/js" "${LOCALHOSTPATH}/${APP}/report"; error_check fi fi } diff --git a/lib/quit.sh b/lib/quit.sh index eb9eca1..a987b0a 100755 --- a/lib/quit.sh +++ b/lib/quit.sh @@ -16,17 +16,17 @@ function userExit() { mailLog fi # Clean up your mess - cleanUp; exit 0 + clean_up; exit 0 } # Quick exit, never send log. Ever. function quickExit() { # Clean up your mess - cleanUp; exit 0 + clean_up; exit 0 } # Exit on error -function errorExit() { +function error_exit() { message_state="ERROR"; makeLog # Compile log # Check email settings if [[ "${EMAILERROR}" == "TRUE" ]]; then @@ -40,7 +40,7 @@ function errorExit() { fi # Clean up your mess - cleanUp; exit 1 + clean_up; exit 1 } # Clean exit @@ -60,7 +60,7 @@ function safeExit() { else if [[ "${POSTTOSLACK}" == "TRUE" ]]; then trace "Posting to Slack" - buildLog; slackPost > /dev/null 2>&1 + build_log; slackPost > /dev/null 2>&1 fi fi @@ -68,16 +68,16 @@ function safeExit() { postWebhook # Clean up your mess - cleanUp; exit 0 + clean_up; exit 0 } # Clean exit, nothing to commit function quietExit() { # Clean up your mess - cleanUp; exit 0 + clean_up; exit 0 } -function cleanUp() { +function clean_up() { # If anything is stashed, unstash it. if [[ "${currentStash}" == "1" ]]; then trace "Unstashing files" @@ -108,7 +108,7 @@ function cleanUp() { # If Wordfence was an issue, restart the plugin if [[ "${WFOFF}" = "1" ]]; then - "${WPCLI}"/wp plugin activate --no-color wordfence &>> $logFile; errorChk + "${WPCLI}"/wp plugin activate --no-color wordfence &>> $logFile; error_check fi # Was this an approval? diff --git a/lib/report.sh b/lib/report.sh index f4a7ba5..4de845f 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading report handling" -function createReport() { +function create_report() { message_state="REPORT" htmlDir diff --git a/lib/slack.sh b/lib/slack.sh index d6dee08..839371d 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -123,7 +123,7 @@ function slackPost () { if [[ "${DIGEST}" == "1" ]] && [[ -z "${GREETING}" ]]; then trace "No activity found, canceling digest." else - curl -X POST --data "payload={\"text\": \"${slack_icon} ${slack_message}\"}" "${SLACKURL}" > /dev/null 2>&1; errorStatus + curl -X POST --data "payload={\"text\": \"${slack_icon} ${slack_message}\"}" "${SLACKURL}" > /dev/null 2>&1; error_status fi } @@ -133,7 +133,7 @@ function slackTest { echo "${SLACKURL}" if [[ -z "${SLACKURL}" ]]; then warning "No Slack configuration found."; emptyLine - cleanUp; exit 1 + clean_up; exit 1 else curl -X POST --data "payload={\"text\": \"${slack_icon} Testing Slack integration of ${APP} from deploy ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${SLACKURL}" emptyLine diff --git a/lib/ssh-check.sh b/lib/ssh-check.sh index c59ed81..82ece58 100755 --- a/lib/ssh-check.sh +++ b/lib/ssh-check.sh @@ -12,7 +12,7 @@ function sshChk() { if [[ "${NOKEY}" != "TRUE" ]]; then trace "Checking SSH configuration" if [[ "${REPOHOST}" == *"bitbucket"* ]]; then - ssh -oStrictHostKeyChecking=no git@bitbucket.org &> /dev/null; errorStatus + ssh -oStrictHostKeyChecking=no git@bitbucket.org &> /dev/null; error_status if [[ "${EXITCODE}" != "0" ]]; then error "git@bitbucket.org: SSH check failed (Error code ${EXITCODE})" else @@ -20,7 +20,7 @@ function sshChk() { trace "git@bitbucket.org: OK" fi elif [[ "${REPOHOST}" == *"github"* ]]; then - ssh -oStrictHostKeyChecking=no git@github.org &> /dev/null; errorStatus + ssh -oStrictHostKeyChecking=no git@github.org &> /dev/null; error_status if [[ "${EXITCODE}" != "0" ]]; then error "git@github.org: SSH check failed (Error code ${EXITCODE})" else diff --git a/lib/utilities.sh b/lib/utilities.sh index c7a9014..495b519 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -29,7 +29,7 @@ function go() { # Email test if [[ "${EMAILTEST}" == "1" ]]; then - emailTest; quickExit + email_test; quickExit fi # Test analytics authentication @@ -110,7 +110,7 @@ function fixIndex() { if [[ "${FIXINDEX}" == "TRUE" ]]; then if [[ ! -w "${WORKPATH}/${APP}/.git/index" ]]; then trace "Index is not writable, attempting to fix..." - sudo chmod 777 "${WORKPATH}/${APP}/.git/index"; errorChk + sudo chmod 777 "${WORKPATH}/${APP}/.git/index"; error_check if [[ ! -w "${WORKPATH}/${APP}/.git/index" ]]; then error "Unable to write new index file."; fi @@ -120,7 +120,7 @@ function fixIndex() { } # Check that dependencies exist -function depCheck() { +function dependency_check() { # Is git installed? hash git 2>/dev/null || { error "deploy ${VERSION} requires git to function properly." diff --git a/lib/webhook.sh b/lib/webhook.sh index 7015a10..3b737f1 100755 --- a/lib/webhook.sh +++ b/lib/webhook.sh @@ -14,13 +14,13 @@ function postWebhook { message_state="DIGEST" payload="*${PROJNAME}* updates for the week of ${WEEKOF} (<${DIGESTURL})" # Send it - curl -X POST --data "payload={\"text\": \"${payload}\"}" "${POSTURL}" > /dev/null 2>&1; errorStatus + curl -X POST --data "payload={\"text\": \"${payload}\"}" "${POSTURL}" > /dev/null 2>&1; error_status fi # Create payload for reports if [[ "${REPORT}" == "1" ]]; then payload="Monthly report for *${PROJNAME}* created (<${REPORTURL})" - curl -X POST --data "payload={\"text\": \"${payload}\"}" "${POSTURL}" > /dev/null 2>&1; errorStatus + curl -X POST --data "payload={\"text\": \"${payload}\"}" "${POSTURL}" > /dev/null 2>&1; error_status fi fi } @@ -31,7 +31,7 @@ function postTest { echo "${POSTURL}" if [[ -z "${POSTURL}" ]]; then warning "No webhook URL found."; emptyLine - cleanUp; exit 1 + clean_up; exit 1 else curl -X POST --data "payload={\"text\": \"Testing POST integration of ${APP} from deploy ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${POSTURL}" emptyLine diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh index 5ae2bfa..0880b35 100755 --- a/lib/wp-acf.sh +++ b/lib/wp-acf.sh @@ -6,7 +6,7 @@ # Handle ACF Pro updates in more reliable way than wp-cli ############################################################################### -function acfUpdate() { +function acf_update() { if grep -q "advanced-custom-fields-pro" "${wpFile}"; then ACFFILE="/tmp/acfpro.zip" # Download the ACF Pro upgrade file diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh index f2d8c26..7d151df 100755 --- a/lib/wp-plugins.sh +++ b/lib/wp-plugins.sh @@ -33,10 +33,10 @@ function wpPlugins() { if [[ "${FORCE}" = "1" ]] || yesno --default no "Proceed with updates? [y/N] "; then # If ACFPRO needs an update, do it first via wget if [[ "${QUIET}" != "1" ]]; then - acfUpdate & + acf_update & spinner $! else - acfUpdate + acf_update fi # Let's get to work From 075c2c4fba3aff41cd9d7f9179f48f2ea9c4efb8 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 21 Jan 2018 11:26:13 -0800 Subject: [PATCH 028/334] Ongoing code cleanup, a couple small bug fixes --- CHANGELOG.md | 7 ++ deploy.sh | 49 ++++---- etc/deploy.sh | 270 +++++++++++++++++++++++----------------- install/doinst.sh | 2 +- lib/active-check.sh | 6 +- lib/analytics.sh | 103 ++++++++------- lib/approval.sh | 2 +- lib/core.sh | 2 +- lib/deployment.sh | 4 +- lib/digest.sh | 7 +- lib/display-styles.sh | 2 +- lib/error-check.sh | 2 +- lib/git.sh | 12 +- lib/invoice.sh | 2 +- lib/lock.sh | 2 +- lib/log-handling.sh | 2 +- lib/mail-log.sh | 3 +- lib/monitor.sh | 2 +- lib/package-manager.sh | 2 +- lib/permissions-fix.sh | 2 +- lib/post-integration.sh | 2 +- lib/post-log.sh | 2 +- lib/quit.sh | 2 +- lib/release-check.sh | 2 +- lib/report.sh | 2 +- lib/server-check.sh | 2 +- lib/slack.sh | 2 +- lib/smart-commits.sh | 2 +- lib/ssh-check.sh | 2 +- lib/statistics.sh | 2 +- lib/user-feedback.sh | 2 +- lib/utilities.sh | 8 +- lib/validate.sh | 4 +- lib/webhook.sh | 2 +- lib/wp-acf.sh | 6 +- lib/wp-core.sh | 2 +- lib/wp-plugins.sh | 2 +- lib/wp-wordfence.sh | 2 +- lib/wp.sh | 2 +- lib/yes-no.sh | 2 +- test/extended.sh | 0 41 files changed, 298 insertions(+), 237 deletions(-) mode change 100644 => 100755 test/extended.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d274b0..3bc9872 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Changed +- Configuration files restructred for better readability +- Many function and variable names changed for better consistency +### Fixed +- Google analytics no longer incorrectly display for projects that do not use them + ## [3.6.6] - 01-13-2018 ### Added - Server health information now included in email/html logs via integration with [PHP Server Monitor](http://www.phpservermonitor.org/) using this [API](https://github.com/skydiver/PHP-Server-Monitor-API) diff --git a/deploy.sh b/deploy.sh index e7f97c3..72c3e68 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # deploy.sh # @@ -23,7 +23,7 @@ APP="null" # Set mode set -uo pipefail -# Initialize and export all variables +# Initialize variables # Startup switches read -r APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \ SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \ @@ -34,6 +34,7 @@ echo "${APP} ${UPGRADE} ${SKIPUPDATE} ${CURRENT} ${VERBOSE} ${QUIET} ${STRICT} ${AUTOMATE} ${EMAILTEST} ${APPROVE} ${DENY} ${PUBLISH} ${DIGEST} ${ANALYTICS} ${ANALYTICSTEST} ${PROJSTATS} ${UNLOCK} ${SSHTEST} ${TIME} ${UPDATEONLY} ${POSTTEST} ${REPORT} ${REPAIR}" > /dev/null + # Temp files read -r logFile wpFile coreFile postFile trshFile statFile urlFile <<< "" echo "${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} @@ -61,7 +62,7 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD \ SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME \ TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ - REFRESHTOKEN PROFILEID METRIC RESULT ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO \ + REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO \ REPORTURL CLIENTCONTACT INCLUDEHOSTING <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} @@ -76,19 +77,18 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} - ${REFRESHTOKEN} ${PROFILEID} ${METRIC} ${RESULT}" "${ALLOWROOT} + ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} ${SHORTEMAIL} ${DIGESTCOVER} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \ - etcLocation libLocation POSTEMAIL current_branch error_msg active_files notes \ + etcLocation libLocation POSTEMAIL current_branch error_msg notes \ UPDCORE TASKLOG PCA PCB PCC PCD PLUGINS slack_icon APPRC USERRC message_state \ COMMITURL COMMITHASH UPD1 UPD2 UPDATE gitLock AUTOMERGE MERGE EXITCODE \ currentStash deploy_cmd deps start_branch postSendmail SLACKUSER NOCHECK \ - ACFFILE VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \ - WPAPP WPSYSTEM DONOTUPDATEWP gitHistory DIGESTWRAP AUTHOR AUTHOREMAIL \ - AUTHORNAME GRAVATAR IMGFILE SIZE RND ANALYTICSMSG digestSendmail MINAUSER \ + VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \ + WPAPP WPSYSTEM DONOTUPDATEWP gitHistory ANALYTICSMSG digestSendmail MINAUSER \ MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX QUEUED \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile CURMTH \ CURYR PRVMTH PRVYR LASTDY TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ @@ -97,14 +97,13 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} ${urlFile} ${htmlFile} ${htmlSendmail} ${htmlEmail} ${clientEmail} ${textSendmail} ${deployPath} ${etcLocation} ${libLocation} - ${POSTEMAIL} ${current_branch} ${error_msg} ${active_files} ${notes} ${UPDCORE} + ${POSTEMAIL} ${current_branch} ${error_msg} ${notes} ${UPDCORE} ${TASKLOG} ${PCA} ${PCB} ${PCC} ${PCD} ${PLUGINS} ${slack_icon} ${APPRC} ${USERRC} ${message_state} ${COMMITURL} ${COMMITHASH} ${UPD1} ${UPD2} ${UPDATE} ${gitLock} ${AUTOMERGE} ${MERGE} ${EXITCODE} ${currentStash} ${deploy_cmd} ${deps} - ${start_branch} ${postSendmail} ${SLACKUSER} ${NOCHECK} ${ACFFILE} ${VIEWPORT} + ${start_branch} ${postSendmail} ${SLACKUSER} ${NOCHECK} ${VIEWPORT} ${VIEWPORTPRE} ${LOGTITLE} ${LOGURL} ${TIMESTAMP} ${STARTUP} ${WPROOT} ${WPAPP} - ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${DIGESTWRAP} ${AUTHOR} ${AUTHOREMAIL} - ${AUTHORNAME} ${GRAVATAR} ${IMGFILE} ${SIZE} ${RND} ${ANALYTICSMSG} + ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${ANALYTICSMSG} ${digestSendmail} ${MINAUSER} ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${QUEUED} ${DISABLESSHCHECK} ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${CURMTH} ${CURYR} @@ -112,7 +111,7 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} ${MONITORAPI} ${RELEASE} ${RELEASENOTES} ${RELEASEURL}" > /dev/null -# Options +# Display command options function flags() { echo -n "Usage: deploy [options] [target] ... @@ -272,28 +271,28 @@ fi # Fire up temporary log files. Consolidate this shit better someday, geez. # # Crash and burn -function logFail() { +function log_fail() { echo "Could not create temporary file, exiting."; exit 1 } # Main log file logFile="/tmp/$APP.log-$RANDOM.log" -(umask 077 && touch "${logFile}") || logFail -wpFile="/tmp/$APP.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || logFail -coreFile="/tmp/$APP.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || logFail +(umask 077 && touch "${logFile}") || log_fail +wpFile="/tmp/$APP.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail +coreFile="/tmp/$APP.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail # Start writing the logfile echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}" echo -e "Launching deploy${STARTUP}\n" >> "${logFile}" # More crappy tmp files -postFile="/tmp/$APP.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || logFail -trshFile="/tmp/$APP.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || logFail -statFile="/tmp/$APP.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || logFail -urlFile="/tmp/$APP.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || logFail -htmlFile="/tmp/$APP.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || logFail -htmlEmail="/tmp/$APP.email-$RANDOM.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || logFail -clientEmail="/tmp/$APP.shortemail-$RANDOM.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || logFail +postFile="/tmp/$APP.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail +trshFile="/tmp/$APP.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail +statFile="/tmp/$APP.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail +urlFile="/tmp/$APP.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail +htmlFile="/tmp/$APP.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail +htmlEmail="/tmp/$APP.email-$RANDOM.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail +clientEmail="/tmp/$APP.shortemail-$RANDOM.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail # Path of the script; I should flip this check to make it more useful if [ -d "/etc/deploy" ]; then @@ -430,7 +429,7 @@ for var in "${REPOHOST} ${CLIENTLOGO}" "${DEVURL}" "${PRODURL}"; do done # Check variables for weird characters -validateVar +validate_conf # Are we using "smart" *cough* commits? if [[ "${SMARTCOMMIT}" == "TRUE" ]]; then diff --git a/etc/deploy.sh b/etc/deploy.sh index 61de5ee..12140db 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -6,20 +6,10 @@ # # If any value set here will override both global and per-user settings. -# The URL for this repo's hosting, with no trailing slash. For example, if -# you use Github and your repo URL looks like https://github.com/EMRL/deploy -# your REPOHOST should be set to https://github.com/EMRL (with no trailing slash) -# If most of your repos are all hosted at the same location, you may want to define -# this in either the global or user configuration files. -# REPOHOST="" -# If you have no SSH key or wish to login manually using your account name and -# password in the console, set NOKEY to exactly "TRUE" -# NOKEY="TRUE" - -# By default deploy will check for valid SSH keys; if you want to override this -# behavior, set DISABLESSHCHECK to TRUE -# DISABLESSHCHECK="FALSE" +############################################################################### +# Project Information +############################################################################### # A human readable project name # PROJNAME="Best Webapp Ever" @@ -27,33 +17,11 @@ # A human readable client name # PROJCLIENT="Client Name" -# If you are using html logfiles, define the full URL to the client's logo -# CLIENTLOGO="http://client.com/assets/img/logo.png" - -# First and last name of the primary contact for this client -# CLIENTCONTACT="First Last" - -# Include hosting as a line item on monthly reports? If set to TRUE, the report -# line item will read "Monthly web hosting"; customize the text included in -# report by setting it to any other value. -# INCLUDEHOSTING="TRUE" - -# If you need to send logfiles and email alerts to address(es) other -# than those configured globally, enter them below. -# TO="notify@client.com" - -# If you'd like to send branded HTML emails using the `deploy --digest [project]` -# command, enter the recipient's email address below. Email value can be a comma -# separated string of multiple addresses. -# DIGESTEMAIL="digest@email.com" - -# If you are using a digest theme that includes a cover image, at the URL below. -# DIGESTCOVER="http://client.com/assets/img/cover.jpg" +# Development project URL, including http:// or https:// +# DEVURL="http://devurl.com" -# If you'd like to post a Slack notification with a URL to view the weekly digest -# set the following to TRUE. IF you want to use an incoming webhook other than the -# one defined in SLACKURL below, enter that here *instead* of TRUE. -# DIGESTSLACK="TRUE" +# Production, or "Live" project URL, including http:// or https:// +# PRODURL="http://productionurl.com" # If you want to use an email template unique to this project (instead of the # globally configured template) define it below. HTML templates are stored in @@ -61,24 +29,26 @@ # folder name of your template. # HTMLTEMPLATE="default" -# Development project URL, including http:// or https:// -# DEVURL="http://devurl.com" +# If you are using html logfiles, define the full URL to the client's logo +# CLIENTLOGO="http://client.com/assets/img/logo.png" -# Production, or "Live" project URL, including http:// or https:// -# PRODURL="http://productionurl.com" + +############################################################################### +# Git Configuration +############################################################################### + +# The URL for this repo's hosting, with no trailing slash. For example, if +# you use Github and your repo URL looks like https://github.com/EMRL/deploy +# your REPOHOST should be set to https://github.com/EMRL (with no trailing +# slash) If most of your repos are all hosted at the same location, you may +# want to define this in either the global or user configuration files. +# REPOHOST="" # The exact name of the Bitbucket/Github repository # REPO="name-of-repo" -# Advanced Custom Fields Pro License -# -# Too many issues seem to crop up with the normal method of updating the Wordpress -# plugin Advanced Custom Fields Pro. Including your license key below will enable -# upgrades to happen more reliably. -# ACFKEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - -# Configure your branches. In most cases the name will be master & production. If -# you are only using a master branch, leave production undefined. +# Configure your branches. In most cases the name will be master & production. +# If you are only using a master branch, leave production undefined. # MASTER="master" # PRODUCTION="production" @@ -86,10 +56,10 @@ # PRODUCTION branches when deploying, set AUTOMERGE to TRUE. # AUTOMERGE="TRUE" -# If dirty (yet to be committed) files exist in the repo, deploy will normally not halt -# execution when running with the --automate flag. If you prefer to have the dirty files -# stashed and proceed with updates set the below value to TRUE. Files will be unstashed -# after the deployment is complete. +# If dirty (yet to be committed) files exist in the repo, deploy will normally +# not halt execution when running with the --automate flag. If you prefer to +# have the dirty files stashed and proceed with updates set the below value +# to TRUE. Files will be unstashed after the deployment is complete. # STASH="TRUE" # Define CHECKBRANCH if you only want deploy to run when the set branch is @@ -97,12 +67,24 @@ # "production", deployment will halt. # CHECKBRANCH="master" +# If you have no SSH key or wish to login manually using your account name and +# password in the console, set NOKEY to exactly "TRUE" +# +# NOKEY="TRUE" + +# By default deploy will check for valid SSH keys; if you want to override this +# behavior, set DISABLESSHCHECK to TRUE +# DISABLESSHCHECK="FALSE" + # If for some reason you'd like a default commit message. It will # always be editable before finalizing commit. # COMMITMSG="This is a default commit message" -# Wordpress configuration -# + +############################################################################### +# Wordpress Setup +############################################################################### + # Some developers employ a file structure that separates Wordpress core from # their application code. If you're using non-standard file paths, define the # root, system, and app (plugin/theme) directories below. Note that the forward @@ -110,10 +92,22 @@ # WPROOT="/public" # WPAPP="/app" # WPSYSTEM="/system" -# -# If you do not want to allow Wordpress core updates, set DONOTUPDATEWP to TRUE. + +# If you do not want to allow core updates, set DONOTUPDATEWP to TRUE. # DONOTUPDATEWP="FALSE" +# Advanced Custom Fields Pro License +# +# Too many issues seem to crop up with the normal method of updating the +# Wordpress plugin ACF Pro. Including your license key below will enable +# upgrades to happen more reliably. +# ACFKEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + + +############################################################################### +# Deployment Configuration +############################################################################### + # The command to finalize deployment of your project(s) # DEPLOY="mina deploy" @@ -121,25 +115,22 @@ # environment, set REQUIREAPPROVAL="TRUE" # REQUIREAPPROVAL="TRUE" -# If this project needs logs mailed to an address other than the one configured -# globally, set it below. -# TO="deploy@emrl.com" +# Disallow deployment; set to TRUE to enable. Double negative, it's tricky. +# DONOTDEPLOY="TRUE" -# IF INCOGNITO is set to true, log files as well as verbose output to screen -# will be stripped of details such as email addresses and system file paths. -# INCOGNITO="TRUE" -# Disallow deployment; set to TRUE to enable. Double negative, it's tricky. -# DONOTDEPLOY="TRUE" +############################################################################### +# Integration +############################################################################### -# Integration ID +# Project Management # -# This is used to post deploy logs to project management systems that can -# external email input. For examples, for our task management system +# Task#: This is used to post deploy logs to project management systems +# that can external email input. For examples, for our task management system # accepts emails in the format task-####@projects.emrl.com, with the #### # being the task identification number for the project being deployed. # TASK="task" - +# # If you wish to have automated deployments add tracked time to your project # management system, uncomment and configure the two values below. TASKUSER # should be the email address of the user that the time will be logged as, @@ -148,7 +139,7 @@ # TASKUSER="deploy@emrl.com" # ADDTIME="10m" -# Slack Integration +# Slack # # You'll need to set up an "Incoming Webhook" custom integration on the Slack # side to get this ready to roll. @@ -158,81 +149,126 @@ # # Set POSTTOSLACK to "TRUE" to enable Slack integration. # POSTTOSLACK="TRUE" - +# # Add your full Webhook URL below, including https:// # SLACKURL="https://hooks.slack.com/services/###################/########################" - +# # Normally only successful deployments are posted to Slack. # Enable the settings below to post on WARNiNG and/or ERROR. # SLACKERROR="FALSE" -# Logging +# Google Analytics +# +# API credentials +# CLIENTID="#############################################.apps.googleusercontent.com" +# CLIENTSECRET="########################" +# REDIRECTURI="http://localhost" # +# OAuth authorization will expire after one hour, but will be updated when needed +# if the tokens below are configured correctly +# AUTHORIZATIONCODE="##############################################" +# +# Tokens +# ACCESSTOKEN="#################################################################################################################################" +# REFRESHTOKEN="##################################################################" +# +# Google Analytics ID +# PROFILEID="########" + + +############################################################################### +# Server Monitoring +############################################################################### + +# Uptime and average latency can be included in logs, digests, and reports when +# integrating with PHP Server Monitor, and an add-on API. +# See https://github.com/EMRL/deploy/wiki/Integration for more information. +# +# Full API URL +# MONITORURL="https://your.phpservermonitor.com/api/monitorapi.php" +# +# Email/password of the user that will access the API. Password can be stored in +# a file outside of the project repo for security reasons +# MONITORUSER="user@domain.com" +# MONITORPASS="/path/to/password/file" +# +# Server ID to monitor. When viewing the server on your web console, your URL +# will be something like https://monitor.com/?&mod=server&action=view&id=3 - in +# this case SERVERID would be "3" (notice the &id=3 at the end of the URL) +# SERVERID="###" + + +############################################################################### +# Logging +############################################################################### + +# If you need to send logfiles and email alerts to address(es) other +# than those configured globally, enter them below. +# TO="notify@client.com" + +# IF INCOGNITO is set to true, log files as well as verbose output to screen +# will be stripped of details such as email addresses and system file paths. +# INCOGNITO="TRUE" + # Post HTML logs to remote server. This needs to be set to "TRUE" even you # are only posting to LOCALHOST. # REMOTELOG="TRUE" -# + # Define the root url where the deploy log will be accessible with no # trailing slash # REMOTEURL="http://deploy.domain.com" -# + # If using HTML logs, define which template you'd like to use. HTML templates # are stored in separate folders in /etc/deploy/html. The value used below # should be the folder name of your template. # REMOTETEMPLATE="default" -# + # Post logs via SCP # SCPPOST="TRUE" # SCPUSER="user" # SCPHOST="hostname.com" # SCPHOSTPATH="/full/path/to/file" -# + # DANGER DANGER: If for some reason you absolutely can't use an SSH key you # can configure your password here # SCPPASS="password" -# + # Post commit logs to this URL. # POSTURL="" -# + # If you're posting logs to a place on the same machine you're deploying from, # set POSTTOLOCALHOST to "TRUE" and define the path where you want to store # the HTML logs. # LOCALHOSTPOST="TRUE" # LOCALHOSTPATH="/var/www/production/deploy" -# Server Monitoring -# -# Uptime and average latency can be included in logs, digests, and reports when -# integrating with PHP Server Monitor, and an add-on API. -# See https://github.com/EMRL/deploy/wiki/Integration for more information. -# -# Full API URL -# MONITORURL="https://your.phpservermonitor.com/api/monitorapi.php" -# -# Email/password of the user that will access the API. Password can be stored in -# a file outside of the project repo for security reasons -# MONITORUSER="user@domain.com" -# MONITORPASS="/path/to/password/file" -# -# Server ID to monitor. When viewing the server on your web console, your URL will -# look something like https://monitor.com/?&mod=server&action=view&id=3 - in this -# case SERVERID would be "3" (notice the &id=3 at the end of the URL) -# SERVERID="###" -# Google Analytics -# -# API credentials -# CLIENTID="#############################################.apps.googleusercontent.com" -# CLIENTSECRET="########################" -# REDIRECTURI="http://localhost" -# -# OAuth authorization will expire after one hour, but will be updated when needed -# if the tokens below are configured correctly -# AUTHORIZATIONCODE="##############################################" -# -# Tokens -# ACCESSTOKEN="#################################################################################################################################" -# REFRESHTOKEN="##################################################################" -# -# Google Analytics ID -# PROFILEID="########" +############################################################################### +# Weekly Digests +############################################################################### + +# If you'd like to send branded HTML emails using the `deploy --digest [project]` +# command, enter the recipient's email address below. Email value can be a comma +# separated string of multiple addresses. +# DIGESTEMAIL="digest@email.com" + +# If you are using a digest theme that includes a cover image, at the URL below. +# DIGESTCOVER="http://client.com/assets/img/cover.jpg" + +# If you'd like to post a Slack notification with a URL to view the weekly digest +# set the following to TRUE. IF you want to use an incoming webhook other than the +# one defined in SLACKURL below, enter that here *instead* of TRUE. +# DIGESTSLACK="TRUE" + + +############################################################################### +# Monthly Reporting +############################################################################### + +# First and last name of the primary contact for this client +# CLIENTCONTACT="First Last" + +# Include hosting as a line item on monthly reports? If set to TRUE, the report +# line item will read "Monthly web hosting"; customize the text included in +# report by setting it to any other value. +# INCLUDEHOSTING="TRUE" diff --git a/install/doinst.sh b/install/doinst.sh index da2d401..cea846f 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # doinst.sh # diff --git a/lib/active-check.sh b/lib/active-check.sh index 6ddf2f1..d337c94 100755 --- a/lib/active-check.sh +++ b/lib/active-check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # active-check.sh # @@ -7,6 +7,10 @@ ############################################################################### trace "Loading activity checking" +# Declare needed variables +read -r active_files <<< "" +echo "${active_files}" > /dev/null + function active_check() { if [[ "${FORCE}" == "1" ]] && [[ "${UPGRADE}" == "1" ]] && [[ "${QUIET}" == "1" ]] && [[ "${ACTIVECHECK}" = "TRUE" ]]; then trace "Checking for active files" diff --git a/lib/analytics.sh b/lib/analytics.sh index eb3be70..c1c389c 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # analytics.sh # @@ -7,6 +7,10 @@ ############################################################################### trace "Loading analytics functions" +# Initializa needed variables +read -r SIZE RND METRIC RESULT <<< "" +echo "${SIZE} ${RND} ${METRIC} ${RESULT}" > /dev/null + function ga_metrics() { array[0]="hits" array[1]="percentNewSessions" @@ -19,60 +23,63 @@ function ga_metrics() { } function analytics() { - # Setup the metric we're after - ga_metrics - - # Update access token - curl -s -d "client_id=${CLIENTID}&client_secret=${CLIENTSECRET}&refresh_token=${REFRESHTOKEN}&grant_type=refresh_token" https://accounts.google.com/o/oauth2/token > "${trshFile}" - sed -i '/access_token/!d' "${trshFile}" - ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")" - - # Grab data from Google - ga_data - - if [[ "${RND}" == "0" ]]; then - if [[ "${RESULT}" -gt "499" ]]; then - ANALYTICSMSG="You had ${SIZE} hits in the last week. Awesome!" - else - ga_fail + # If profile does not exist, skip it all + if [[ -n "${PROFILEID}" ]]; then + # Setup the metric we're after + ga_metrics + + # Update access token + curl -s -d "client_id=${CLIENTID}&client_secret=${CLIENTSECRET}&refresh_token=${REFRESHTOKEN}&grant_type=refresh_token" https://accounts.google.com/o/oauth2/token > "${trshFile}" + sed -i '/access_token/!d' "${trshFile}" + ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")" + + # Grab data from Google + ga_data + + if [[ "${RND}" == "0" ]]; then + if [[ "${RESULT}" -gt "499" ]]; then + ANALYTICSMSG="You had ${SIZE} hits in the last week. Awesome!" + else + ga_fail + fi fi - fi - if [[ "${RND}" == "1" ]]; then - # Sometimes Google reports confusion percentages that exceed - # 100%, let's kill those results - if [[ "${SIZE}" -gt "100" ]]; then - ga_fail - elif [[ "${SIZE}" -gt "50" ]]; then - ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That's great!" - else - RESULT="$((100 - ${SIZE}))" - ANALYTICSMSG="Last week ${RESULT} percent of your users were return visitors. That's great!" + if [[ "${RND}" == "1" ]]; then + # Sometimes Google reports confusion percentages that exceed + # 100%, let's kill those results + if [[ "${SIZE}" -gt "100" ]]; then + ga_fail + elif [[ "${SIZE}" -gt "50" ]]; then + ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That's great!" + else + RESULT="$((100 - ${SIZE}))" + ANALYTICSMSG="Last week ${RESULT} percent of your users were return visitors. That's great!" + fi fi - fi - if [[ "${RND}" == "2" ]]; then - if [[ "${SIZE}" -ge "30" ]]; then - ANALYTICSMSG="You had traffic from ${SIZE} organic searches last week. Not bad!" - else - ga_fail + if [[ "${RND}" == "2" ]]; then + if [[ "${SIZE}" -ge "30" ]]; then + ANALYTICSMSG="You had traffic from ${SIZE} organic searches last week. Not bad!" + else + ga_fail + fi fi - fi - if [[ "${RND}" == "3" ]]; then - RESULT="$((${SIZE} / 60))" - if [[ "${RESULT}" -gt "2" ]]; then - ANALYTICSMSG="Last week visitors averaged over ${RESULT} minutes each on your site. Nice!" - else - ga_fail + if [[ "${RND}" == "3" ]]; then + RESULT="$((${SIZE} / 60))" + if [[ "${RESULT}" -gt "2" ]]; then + ANALYTICSMSG="Last week visitors averaged over ${RESULT} minutes each on your site. Nice!" + else + ga_fail + fi fi - fi - if [[ "${RND}" == "4" ]]; then - if [[ "${SIZE}" -ge "20" ]]; then - ANALYTICSMSG="Your site had ${SIZE} social media interactions in the last week!" - else - ga_fail + if [[ "${RND}" == "4" ]]; then + if [[ "${SIZE}" -ge "20" ]]; then + ANALYTICSMSG="Your site had ${SIZE} social media interactions in the last week!" + else + ga_fail + fi fi fi } @@ -85,7 +92,7 @@ function ga_data() { # If no other results are worht displaying, fall back to displaying hits function ga_fail() { METRIC="hits" - analyticsData + ga_data ANALYTICSMSG="You had ${SIZE} hits in the last week." } diff --git a/lib/approval.sh b/lib/approval.sh index 502c9a8..05f68df 100755 --- a/lib/approval.sh +++ b/lib/approval.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # approval.sh # diff --git a/lib/core.sh b/lib/core.sh index d46cf79..6f9cd9e 100755 --- a/lib/core.sh +++ b/lib/core.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # core.sh # diff --git a/lib/deployment.sh b/lib/deployment.sh index f04c7cc..27a2c45 100755 --- a/lib/deployment.sh +++ b/lib/deployment.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # deployment.sh # @@ -61,7 +61,7 @@ function pkgDeploy() { else trace "Launching deployment from ${PWD}" fi - fixIndex + fix_index # Make sure the project's deploy command is going to work deploy_cmd=$(echo "${DEPLOY}" | awk '{print $1;}') diff --git a/lib/digest.sh b/lib/digest.sh index 9f9e97a..7764b1a 100755 --- a/lib/digest.sh +++ b/lib/digest.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # digest.sh # @@ -7,6 +7,11 @@ ############################################################################### trace "Loading digest handling" +# Initializa needed variables +read -r AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP <<< "" +echo "${AUTHOR} ${AUTHOREMAIL} ${AUTHORNAME} ${GRAVATAR} ${IMGFILE} + ${DIGESTWRAP}" > /dev/null + function create_digest() { message_state="DIGEST" htmlDir diff --git a/lib/display-styles.sh b/lib/display-styles.sh index e95c3e0..2553b7c 100755 --- a/lib/display-styles.sh +++ b/lib/display-styles.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # display-styles.sh # diff --git a/lib/error-check.sh b/lib/error-check.sh index 40820af..7dc10d3 100755 --- a/lib/error-check.sh +++ b/lib/error-check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # error_check() # diff --git a/lib/git.sh b/lib/git.sh index 4fabcea..c67b1fb 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # git.sh # @@ -56,7 +56,7 @@ function gitChkMstr() { else current_branch="$(git rev-parse --abbrev-ref HEAD)" if [[ "${current_branch}" != "${MASTER}" ]]; then - notice "Checking out master branch..."; fixIndex + notice "Checking out master branch..."; fix_index if [[ "${VERBOSE}" -eq 1 ]]; then git checkout master | tee --append "${logFile}" else @@ -193,7 +193,7 @@ function gitCommit() { # Push master function gitPushMstr() { if [[ -n "${MASTER}" ]]; then - trace "Pushing ${MASTER}"; fixIndex + trace "Pushing ${MASTER}"; fix_index emptyLine if [[ "${VERBOSE}" -eq 1 ]]; then git push | tee --append "${logFile}"; error_check @@ -221,7 +221,7 @@ function gitPushMstr() { function gitChkProd() { if [[ "${MERGE}" = "1" ]]; then if [[ -n "${PRODUCTION}" ]]; then - notice "Checking out ${PRODUCTION} branch..."; fixIndex + notice "Checking out ${PRODUCTION} branch..."; fix_index if [[ "${VERBOSE}" -eq 1 ]]; then git checkout "${PRODUCTION}" | tee --append "${logFile}"; error_check @@ -265,7 +265,7 @@ function gitChkProd() { function gitMerge() { if [[ "${MERGE}" = "1" ]]; then if [[ -n "${PRODUCTION}" ]]; then - notice "Merging ${MASTER} into ${PRODUCTION}..."; fixIndex + notice "Merging ${MASTER} into ${PRODUCTION}..."; fix_index # Clear out the index.lock file, cause reasons [[ -f "${gitLock}" ]] && rm "${gitLock}" # Bonus add, just because. Ugh. @@ -289,7 +289,7 @@ function gitMerge() { function gitPushProd() { if [[ "${MERGE}" = "1" ]]; then if [[ -n "${PRODUCTION}" ]]; then - trace "Push ${PRODUCTION}"; fixIndex + trace "Push ${PRODUCTION}"; fix_index emptyLine if [[ "${VERBOSE}" -eq 1 ]]; then git push | tee --append "${logFile}"; error_check diff --git a/lib/invoice.sh b/lib/invoice.sh index 31a784b..5d17c0f 100755 --- a/lib/invoice.sh +++ b/lib/invoice.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # invoice.sh # diff --git a/lib/lock.sh b/lib/lock.sh index b6f980d..cab9c3b 100755 --- a/lib/lock.sh +++ b/lib/lock.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # lock.sh # diff --git a/lib/log-handling.sh b/lib/log-handling.sh index 55dde5d..0f82e3a 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # log-handling.sh # diff --git a/lib/mail-log.sh b/lib/mail-log.sh index fb41ded..f7c90b1 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # mail-log.sh # @@ -237,7 +237,6 @@ function email_test() { echo fi - ) | "${MAILPATH}"/sendmail -t fi diff --git a/lib/monitor.sh b/lib/monitor.sh index 6af8492..61ebcaa 100755 --- a/lib/monitor.sh +++ b/lib/monitor.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # monitor.sh # diff --git a/lib/package-manager.sh b/lib/package-manager.sh index cddaa01..a5c7c62 100755 --- a/lib/package-manager.sh +++ b/lib/package-manager.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # package-manager # diff --git a/lib/permissions-fix.sh b/lib/permissions-fix.sh index 4c48b94..2ac444f 100755 --- a/lib/permissions-fix.sh +++ b/lib/permissions-fix.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # permissions-fix.sh # diff --git a/lib/post-integration.sh b/lib/post-integration.sh index 6aef391..2fb4593 100755 --- a/lib/post-integration.sh +++ b/lib/post-integration.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # post-integration.sh # diff --git a/lib/post-log.sh b/lib/post-log.sh index 077d834..cf3d873 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # post-log.sh # diff --git a/lib/quit.sh b/lib/quit.sh index a987b0a..3aceb9a 100755 --- a/lib/quit.sh +++ b/lib/quit.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # quit.sh # diff --git a/lib/release-check.sh b/lib/release-check.sh index c384584..dee44a7 100755 --- a/lib/release-check.sh +++ b/lib/release-check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # release-check.sh # diff --git a/lib/report.sh b/lib/report.sh index 4de845f..3bbe9f8 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # report.sh # diff --git a/lib/server-check.sh b/lib/server-check.sh index baf6639..53ee1d0 100755 --- a/lib/server-check.sh +++ b/lib/server-check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # server-check.sh # diff --git a/lib/slack.sh b/lib/slack.sh index 839371d..6b7741b 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # slack.sh # diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh index ecd0c51..8fb32cf 100755 --- a/lib/smart-commits.sh +++ b/lib/smart-commits.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # smart-commit.sh # diff --git a/lib/ssh-check.sh b/lib/ssh-check.sh index 82ece58..7ebe208 100755 --- a/lib/ssh-check.sh +++ b/lib/ssh-check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # ssh-check.sh # diff --git a/lib/statistics.sh b/lib/statistics.sh index 8653e0a..1812bd5 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # statistics.sh # diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh index 7dd3abe..4d43fe6 100755 --- a/lib/user-feedback.sh +++ b/lib/user-feedback.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # user-feedback.sh # diff --git a/lib/utilities.sh b/lib/utilities.sh index 495b519..0efe71f 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # utilities.sh # @@ -34,7 +34,7 @@ function go() { # Test analytics authentication if [[ "${ANALYTICSTEST}" == "1" ]]; then - analyticsTest; quickExit + ga_test; quickExit fi # Test server monitoring @@ -105,14 +105,14 @@ function go() { server_monitor } -function fixIndex() { +function fix_index() { # A rather brutal fix for index permissions issues if [[ "${FIXINDEX}" == "TRUE" ]]; then if [[ ! -w "${WORKPATH}/${APP}/.git/index" ]]; then trace "Index is not writable, attempting to fix..." sudo chmod 777 "${WORKPATH}/${APP}/.git/index"; error_check if [[ ! -w "${WORKPATH}/${APP}/.git/index" ]]; then - error "Unable to write new index file."; + error "Unable to write new index file." fi fi sleep 1 diff --git a/lib/validate.sh b/lib/validate.sh index ab57938..c54b77d 100755 --- a/lib/validate.sh +++ b/lib/validate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # validate.sh # @@ -7,7 +7,7 @@ ############################################################################### trace "Loading validation tests" -function validateVar() { +function validate_conf() { array=( "${PROJNAME}" "${PROJCLIENT}" ) for i in "${array[@]}" do diff --git a/lib/webhook.sh b/lib/webhook.sh index 3b737f1..68492ac 100755 --- a/lib/webhook.sh +++ b/lib/webhook.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # webhook.sh # diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh index 0880b35..e67d872 100755 --- a/lib/wp-acf.sh +++ b/lib/wp-acf.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # wp-acf.sh # @@ -6,6 +6,10 @@ # Handle ACF Pro updates in more reliable way than wp-cli ############################################################################### +# Declare needed variables +read -r ACFFILE <<< "" +echo "${ACFFILE}" > /dev/null + function acf_update() { if grep -q "advanced-custom-fields-pro" "${wpFile}"; then ACFFILE="/tmp/acfpro.zip" diff --git a/lib/wp-core.sh b/lib/wp-core.sh index a516161..a20679a 100755 --- a/lib/wp-core.sh +++ b/lib/wp-core.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # wp-core.sh # diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh index 7d151df..043cf22 100755 --- a/lib/wp-plugins.sh +++ b/lib/wp-plugins.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # wp-plugins.sh # diff --git a/lib/wp-wordfence.sh b/lib/wp-wordfence.sh index ce369a2..8873299 100755 --- a/lib/wp-wordfence.sh +++ b/lib/wp-wordfence.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # wp-wordfence.sh # diff --git a/lib/wp.sh b/lib/wp.sh index 9b65b2c..60e0919 100755 --- a/lib/wp.sh +++ b/lib/wp.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # wp.sh # diff --git a/lib/yes-no.sh b/lib/yes-no.sh index 21c5cd5..0284dd9 100755 --- a/lib/yes-no.sh +++ b/lib/yes-no.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # yesno.sh # diff --git a/test/extended.sh b/test/extended.sh old mode 100644 new mode 100755 From 106d808b0c2bf626ee00ec22691dace4ca17ed48 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 21 Jan 2018 14:50:32 -0800 Subject: [PATCH 029/334] Fixed install dependency check, more cleanup --- deploy.sh | 13 ++-- etc/deploy.sh | 142 ++++++++++++++++++++++--------------------- install/doinst.sh | 46 ++++++++------ lib/active-check.sh | 2 +- lib/analytics.sh | 2 +- lib/approval.sh | 5 +- lib/digest.sh | 2 +- lib/log-handling.sh | 2 +- lib/process-html.sh | 9 ++- lib/report.sh | 2 +- lib/statistics.sh | 2 +- lib/user-feedback.sh | 4 ++ 12 files changed, 127 insertions(+), 104 deletions(-) diff --git a/deploy.sh b/deploy.sh index 72c3e68..4fddb82 100755 --- a/deploy.sh +++ b/deploy.sh @@ -44,13 +44,8 @@ read -r black red green yellow blue magenta cyan white endColor bold underline \ reset purple tan <<< "" echo "${black} ${red} ${green} ${yellow} ${blue} ${magenta} ${cyan} ${white} ${endColor} ${bold} ${underline} ${reset} ${purple} ${tan}" > /dev/null -# User feedback -read -r pid delay spinstr <<< "" -echo "${pid} ${delay} ${spinstr}" > /dev/null -# HTML Themes -read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID <<< "" -echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} - ${SMOOCHID}" + + # Constants and environment variables read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ EMAILHTML NOPHP FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP TO \ @@ -89,7 +84,7 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile currentStash deploy_cmd deps start_branch postSendmail SLACKUSER NOCHECK \ VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \ WPAPP WPSYSTEM DONOTUPDATEWP gitHistory ANALYTICSMSG digestSendmail MINAUSER \ - MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX QUEUED \ + MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile CURMTH \ CURYR PRVMTH PRVYR LASTDY TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI RELEASE RELEASENOTES \ @@ -105,7 +100,7 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${VIEWPORTPRE} ${LOGTITLE} ${LOGURL} ${TIMESTAMP} ${STARTUP} ${WPROOT} ${WPAPP} ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${ANALYTICSMSG} ${digestSendmail} ${MINAUSER} ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} - ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${QUEUED} ${DISABLESSHCHECK} + ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${DISABLESSHCHECK} ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${CURMTH} ${CURYR} ${PRVMTH} ${PRVYR} ${LASTDY} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} diff --git a/etc/deploy.sh b/etc/deploy.sh index 12140db..f71914f 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -1,10 +1,9 @@ -#!/bin/bash +#!/usr/bin/env bash # # Here are examples of settings you might need to change on a per-project -# basis. This file should be placed in config/deploy.sh in your projects' -# root folder. Project settings will override both system & per-user settings. -# -# If any value set here will override both global and per-user settings. +# basis. This file should be placed in either the project's root folder, +# or in /config/. Settings configured in this file will override both +# system & user settings. ############################################################################### @@ -23,15 +22,6 @@ # Production, or "Live" project URL, including http:// or https:// # PRODURL="http://productionurl.com" -# If you want to use an email template unique to this project (instead of the -# globally configured template) define it below. HTML templates are stored in -# separate folders in /etc/deploy/html. The value used below should be the -# folder name of your template. -# HTMLTEMPLATE="default" - -# If you are using html logfiles, define the full URL to the client's logo -# CLIENTLOGO="http://client.com/assets/img/logo.png" - ############################################################################### # Git Configuration @@ -120,16 +110,16 @@ ############################################################################### -# Integration +# Notifications ############################################################################### # Project Management -# +# ------------------ # Task#: This is used to post deploy logs to project management systems -# that can external email input. For examples, for our task management system +# that can accept external email input. For examples, our task management system # accepts emails in the format task-####@projects.emrl.com, with the #### # being the task identification number for the project being deployed. -# TASK="task" +# TASK="####" # # If you wish to have automated deployments add tracked time to your project # management system, uncomment and configure the two values below. TASKUSER @@ -140,7 +130,7 @@ # ADDTIME="10m" # Slack -# +# ----- # You'll need to set up an "Incoming Webhook" custom integration on the Slack # side to get this ready to roll. # See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get @@ -156,46 +146,16 @@ # Normally only successful deployments are posted to Slack. # Enable the settings below to post on WARNiNG and/or ERROR. # SLACKERROR="FALSE" - -# Google Analytics # -# API credentials -# CLIENTID="#############################################.apps.googleusercontent.com" -# CLIENTSECRET="########################" -# REDIRECTURI="http://localhost" -# -# OAuth authorization will expire after one hour, but will be updated when needed -# if the tokens below are configured correctly -# AUTHORIZATIONCODE="##############################################" -# -# Tokens -# ACCESSTOKEN="#################################################################################################################################" -# REFRESHTOKEN="##################################################################" -# -# Google Analytics ID -# PROFILEID="########" - - -############################################################################### -# Server Monitoring -############################################################################### +# If you'd like to post a Slack notification with a URL to view the weekly digest +# set the following to TRUE. If you want to use an incoming webhook other than the +# one defined in SLACKURL, enter that here *instead* of TRUE. +# DIGESTSLACK="FALSE" -# Uptime and average latency can be included in logs, digests, and reports when -# integrating with PHP Server Monitor, and an add-on API. -# See https://github.com/EMRL/deploy/wiki/Integration for more information. -# -# Full API URL -# MONITORURL="https://your.phpservermonitor.com/api/monitorapi.php" -# -# Email/password of the user that will access the API. Password can be stored in -# a file outside of the project repo for security reasons -# MONITORUSER="user@domain.com" -# MONITORPASS="/path/to/password/file" -# -# Server ID to monitor. When viewing the server on your web console, your URL -# will be something like https://monitor.com/?&mod=server&action=view&id=3 - in -# this case SERVERID would be "3" (notice the &id=3 at the end of the URL) -# SERVERID="###" +# Webhooks +# -------- +# Post event notifications to this URL. +# POSTURL="" ############################################################################### @@ -206,6 +166,18 @@ # than those configured globally, enter them below. # TO="notify@client.com" +# If you want to use an email template unique to this project (instead of the +# globally configured template) define it below. HTML templates are stored in +# separate folders in /etc/deploy/html. The value used below should be the +# folder name of your template. +# HTMLTEMPLATE="default" + +# If you are using html logfiles, define the full URL to the client's logo +# CLIENTLOGO="http://client.com/assets/img/logo.png" + +# If you are using a digest theme that includes a cover image, at the URL below. +# COVER="http://client.com/assets/img/cover.jpg" + # IF INCOGNITO is set to true, log files as well as verbose output to screen # will be stripped of details such as email addresses and system file paths. # INCOGNITO="TRUE" @@ -230,12 +202,9 @@ # SCPHOSTPATH="/full/path/to/file" # DANGER DANGER: If for some reason you absolutely can't use an SSH key you -# can configure your password here +# can configure the path to a text file containing *only* your password. # SCPPASS="password" -# Post commit logs to this URL. -# POSTURL="" - # If you're posting logs to a place on the same machine you're deploying from, # set POSTTOLOCALHOST to "TRUE" and define the path where you want to store # the HTML logs. @@ -252,14 +221,6 @@ # separated string of multiple addresses. # DIGESTEMAIL="digest@email.com" -# If you are using a digest theme that includes a cover image, at the URL below. -# DIGESTCOVER="http://client.com/assets/img/cover.jpg" - -# If you'd like to post a Slack notification with a URL to view the weekly digest -# set the following to TRUE. IF you want to use an incoming webhook other than the -# one defined in SLACKURL below, enter that here *instead* of TRUE. -# DIGESTSLACK="TRUE" - ############################################################################### # Monthly Reporting @@ -272,3 +233,46 @@ # line item will read "Monthly web hosting"; customize the text included in # report by setting it to any other value. # INCLUDEHOSTING="TRUE" + + +############################################################################### +# Google Analytics +############################################################################### + +# API credentials +# CLIENTID="#############################################.apps.googleusercontent.com" +# CLIENTSECRET="########################" +# REDIRECTURI="http://localhost" +# +# OAuth authorization will expire after one hour, but will be updated when needed +# if the tokens below are configured correctly +# AUTHORIZATIONCODE="##############################################" +# +# Tokens +# ACCESSTOKEN="#################################################################################################################################" +# REFRESHTOKEN="##################################################################" +# +# Google Analytics ID +# PROFILEID="########" + + +############################################################################### +# Server Monitoring +############################################################################### + +# Uptime and average latency can be included in logs, digests, and reports when +# integrating with PHP Server Monitor, and an add-on API. +# See https://github.com/EMRL/deploy/wiki/Integration for more information. + +# Full API URL +# MONITORURL="https://your.phpservermonitor.com/api/monitorapi.php" + +# Email/password of the user that will access the API. Password can be stored in +# a file outside of the project repo for security reasons +# MONITORUSER="user@domain.com" +# MONITORPASS="/path/to/password/file" + +# Server ID to monitor. When viewing the server on your web console, your URL +# will be something like https://monitor.com/?&mod=server&action=view&id=3 - in +# this case SERVERID would be "3" (notice the &id=3 at the end of the URL) +# SERVERID="###" diff --git a/install/doinst.sh b/install/doinst.sh index cea846f..1c56d9b 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -8,6 +8,15 @@ # https://github.com/EMRL/deploy ############################################################################### +# Set mode +set -uo pipefail + +# Initialize variables +read -r OS VER EXITCODE dependencies option message fg_green fg_red reset \ + YES NO NOT i k <<< "" +echo "${OS} ${VER} ${EXITCODE} ${dependencies} ${option} ${message} ${fg_green} + ${fg_red} ${reset} ${YES} ${NO} ${NOT} ${i} ${k}" > /dev/null + # No root, no fun if [[ "${EUID}" -ne 0 ]]; then echo "You must have root access to install - try 'sudo install/doinst.sh'" 2>&1 @@ -17,7 +26,8 @@ fi function check_os() { # Try to discover the OS flavor if [[ -f /etc/os-release ]]; then - # freedesktop.org and systemd + # freedesktop.org and systemd + # shellcheck disable=SC1091 . /etc/os-release OS="${NAME}" VER="${VERSION_ID}" @@ -27,6 +37,7 @@ function check_os() { VER="$(lsb_release -sr)" elif [[ -f /etc/lsb-release ]]; then # For some versions of Debian/Ubuntu without lsb_release command + # shellcheck disable=SC1091 . /etc/lsb-release OS="${DISTRIB_ID}" VER="${DISTRIB_RELEASE}" @@ -49,12 +60,13 @@ function check_os() { function check_program() { printf "%-40s" "Checking for ${1}..." - command -v $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } -} - -function check_optional() { - printf "%-40s" "Checking for ${1}..." - command -v $1 >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } + # There's potential for non-global stuff to fail this check so here's a + # fairly kludgey way to hopefully allow those to pass + if [[ "${1}" =~ ^(wp|grunt|npm)$ ]]; then + command -v $(type -p "${1}") >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } + else + command -v "${1}" >/dev/null 2>&1 && echo "${YES}" || { echo "${NOT}"; message+="${1} "; } + fi } function error_check() { @@ -81,9 +93,9 @@ dependencies=(awk cat curl echo eval git grep pkill printf read sed sendmail sle options=(gitchart grunt npm scp ssh sshpass wp) message='' -fg_red=`tput setaf 1` -fg_green=`tput setaf 2` -reset=`tput sgr0` +fg_red="$(tput setaf 1)" +fg_green="$(tput setaf 2)" +reset="$(tput sgr0)" # Common messages YES="${fg_green}OK${reset}" @@ -92,7 +104,7 @@ NOT="${fg_red}NOT FOUND${reset}" echo; echo "=> Checking for required dependencies:"; sleep 1 for i in "${dependencies[@]}" ; do - check_program $i + check_program "${i}" done if [[ -z "${message}" ]] ; then @@ -106,7 +118,7 @@ fi echo; echo "=> Checking optional dependencies:"; sleep 1 for k in "${options[@]}" ; do - check_optional $k + check_program "${k}" done if [[ -n "${message}" ]] ; then @@ -114,9 +126,9 @@ if [[ -n "${message}" ]] ; then # echo ${message}; fi -# Start the install: First check for root +# Start the install echo; sleep 1 -if [[ ! -d /etc/deploy ]] && [[ ! -d /etc/deploy/lib ]] && [[ ! -d /etc/deploy/crontab ]]; then +if [[ ! -d /etc/deploy ]] || [[ ! -d /etc/deploy/lib ]] || [[ ! -d /etc/deploy/crontab ]]; then echo "Creating directories" if [[ ! -d /etc/deploy ]]; then sudo mkdir /etc/deploy; error_check @@ -139,7 +151,7 @@ if [[ ! -f /etc/deploy/deploy.conf ]]; then cp /etc/deploy/deploy-example.conf /etc/deploy/deploy.conf; error_check fi -cp -R lib/* /etc/deploy/lib; error_check -cp deploy.sh /usr/local/bin/deploy; error_check -sudo chmod 755 /usr/local/bin/deploy; error_check +cp -R lib/* /etc/deploy/lib || error_check +cp deploy.sh /usr/local/bin/deploy || error_check +sudo chmod 755 /usr/local/bin/deploy || error_check echo "Successfully installed, try typing 'deploy' for help." diff --git a/lib/active-check.sh b/lib/active-check.sh index d337c94..db5d06f 100755 --- a/lib/active-check.sh +++ b/lib/active-check.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading activity checking" -# Declare needed variables +# Initialize variables read -r active_files <<< "" echo "${active_files}" > /dev/null diff --git a/lib/analytics.sh b/lib/analytics.sh index c1c389c..c0993a6 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading analytics functions" -# Initializa needed variables +# Initialize variables read -r SIZE RND METRIC RESULT <<< "" echo "${SIZE} ${RND} ${METRIC} ${RESULT}" > /dev/null diff --git a/lib/approval.sh b/lib/approval.sh index 05f68df..cba6dfe 100755 --- a/lib/approval.sh +++ b/lib/approval.sh @@ -7,11 +7,14 @@ ############################################################################### trace "Loading approval functions" +# Initialize variables +read -r QUEUED <<< "" +echo "${QUEUED}" > /dev/null + function queue() { # Make sure there's something to do gitStatus gitCommit - #(git status --porcelain | sed '/^ D /d' | sed s/^...//) >> "${WORKPATH}/${APP}/.queued" (git status --porcelain | sed s/^...//) >> "${WORKPATH}/${APP}/.queued" info "Queuing proposed updates for approval" diff --git a/lib/digest.sh b/lib/digest.sh index 7764b1a..e9fe28c 100755 --- a/lib/digest.sh +++ b/lib/digest.sh @@ -69,7 +69,7 @@ function create_digest() { # Git some stats # git log --no-merges --since="7 days ago" --reverse --stat | grep -Eo "[0-9]{1,} files? changed" | grep -Eo "[0-9]{1,}" | awk "{ sum += \$1 } END { print sum }" - processHTML + process_html # Strip out useless analytics results if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then diff --git a/lib/log-handling.sh b/lib/log-handling.sh index 0f82e3a..fccd0d6 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -175,6 +175,6 @@ function htmlBuild() { if [[ "${REPORT}" != "1" ]]; then cat "${logFile}" "${deployPath}/html/${HTMLTEMPLATE}/footer.html" >> "${htmlFile}" # There's probably a better place for this. - processHTML + process_html fi } diff --git a/lib/process-html.sh b/lib/process-html.sh index 4ce4391..d90c4b5 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # process-html.sh # @@ -7,7 +7,12 @@ ############################################################################### trace "Loading html handling" -function processHTML() { +# Initialize variables +read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID <<< "" +echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} + ${SMOOCHID}" + +function process_html() { # Clean out the stuff we don't need [[ -z "${DEVURL}" ]] && sed -i '/Staging URL:/d' "${htmlFile}" [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${htmlFile}" diff --git a/lib/report.sh b/lib/report.sh index 3bbe9f8..f230e55 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -50,5 +50,5 @@ function create_report() { cat "${deployPath}/html/${HTMLTEMPLATE}/report/header.html" "${statFile}" "${deployPath}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}" # Filter and replace template variables - processHTML + process_html } diff --git a/lib/statistics.sh b/lib/statistics.sh index 1812bd5..0066414 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -21,7 +21,7 @@ function projStats() { # Process the HTML cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" - processHTML + process_html cat "${htmlFile}" > "/tmp/stats/index.html" # Create the charts diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh index 4d43fe6..c8225c1 100755 --- a/lib/user-feedback.sh +++ b/lib/user-feedback.sh @@ -7,6 +7,10 @@ ############################################################################### trace "Loading interface" +# Initialize variables +read -r pid delay spinstr temp <<< "" +echo "${pid} ${delay} ${spinstr} %{temp}" > /dev/null + # Progress spinner; we'll see if this works function spinner() { if [[ "${QUIET}" != "1" ]]; then From 433fedb73a809d6c1301767a8a51cda7b867a6b0 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 21 Jan 2018 14:59:18 -0800 Subject: [PATCH 030/334] Fixed a dangerous bug with --repair --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 4fddb82..949ba3f 100755 --- a/deploy.sh +++ b/deploy.sh @@ -206,7 +206,7 @@ while [[ ${1:-unset} = -?* ]]; do --monitor-test) MONITORTEST="1" ;; --stats) PROJSTATS="1" ;; --unlock) UNLOCK="1" ;; - --repair) REPAIR="1"; FORCE="1"; MERGE="1"; STASH="TRUE"; VERBOSE="1" ;; + --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="1" ;; --no-check) NOCHECK="1" ;; --function-list) FUNCTIONLIST="1"; CURRENT="1" ;; # Spoofs --current --variable-list) VARIABLELIST="1"; CURRENT="1" ;; # Spoofs --current From df44ac2a999cd3bb8403e516815632bd1c99515f Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 21 Jan 2018 21:20:56 -0800 Subject: [PATCH 031/334] More function cleanup --- CHANGELOG.md | 2 +- deploy.sh | 30 ++++++++++++++--------------- etc/html/civil/digest/header.html | 2 +- etc/html/default/report/header.html | 4 ++-- install/doinst.sh | 12 ++++++------ lib/analytics.sh | 14 +++++++------- lib/core.sh | 4 ++-- lib/deployment.sh | 8 ++++---- lib/display-styles.sh | 2 +- lib/error-check.sh | 23 +++++++++++----------- lib/git.sh | 10 +++++----- lib/log-handling.sh | 6 +++--- lib/mail-log.sh | 2 +- lib/process-html.sh | 8 ++++---- lib/release-check.sh | 2 +- lib/report.sh | 2 +- lib/server-check.sh | 2 +- lib/slack.sh | 4 ++-- lib/ssh-check.sh | 2 +- lib/user-feedback.sh | 2 +- lib/utilities.sh | 4 ++-- lib/webhook.sh | 4 ++-- lib/wp-plugins.sh | 2 +- lib/wp-wordfence.sh | 2 +- 24 files changed, 77 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc9872..1de0394 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Changed -- Configuration files restructred for better readability +- Configuration files restructured for better readability - Many function and variable names changed for better consistency ### Fixed - Google analytics no longer incorrectly display for projects that do not use them diff --git a/deploy.sh b/deploy.sh index 949ba3f..0b3f6b4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -13,7 +13,7 @@ IFS=$'\n\t' VERSION="3.6.6" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" -LASTMONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" +LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" WEEKOF="$(date -d '7 days ago' +"%B %d, %Y")" GASTART="$(date -d '7 days ago' "+%Y-%m-%d")" GAEND="$(date "+%Y-%m-%d")" @@ -45,7 +45,6 @@ read -r black red green yellow blue magenta cyan white endColor bold underline \ echo "${black} ${red} ${green} ${yellow} ${blue} ${magenta} ${cyan} ${white} ${endColor} ${bold} ${underline} ${reset} ${purple} ${tan}" > /dev/null - # Constants and environment variables read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ EMAILHTML NOPHP FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP TO \ @@ -57,7 +56,7 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD \ SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME \ TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ - REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL DIGESTCOVER INCOGNITO \ + REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO \ REPORTURL CLIENTCONTACT INCLUDEHOSTING <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} @@ -73,7 +72,7 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} - ${SHORTEMAIL} ${DIGESTCOVER} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} + ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ @@ -259,7 +258,7 @@ fi [[ "${VARIABLELIST}" == "1" ]] && STARTUP="${STARTUP} --variable-list" # If not trying to deploy current directory, and no repo is named in the startup command, exit -if [[ "${CURRENT}" != "1" ]] && [[ -z "${@}" ]]; then +if [[ "${CURRENT}" != "1" ]] && [[ -z "${*}" ]]; then echo "Choose a valid project, or use the --current flag to deploy from the current directory."; exit 1 fi @@ -271,23 +270,23 @@ function log_fail() { } # Main log file -logFile="/tmp/$APP.log-$RANDOM.log" +logFile="/tmp/${APP}.log-$RANDOM.log" (umask 077 && touch "${logFile}") || log_fail -wpFile="/tmp/$APP.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail -coreFile="/tmp/$APP.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail +wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail +coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail # Start writing the logfile echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}" echo -e "Launching deploy${STARTUP}\n" >> "${logFile}" # More crappy tmp files -postFile="/tmp/$APP.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail -trshFile="/tmp/$APP.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail -statFile="/tmp/$APP.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail -urlFile="/tmp/$APP.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail -htmlFile="/tmp/$APP.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail -htmlEmail="/tmp/$APP.email-$RANDOM.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail -clientEmail="/tmp/$APP.shortemail-$RANDOM.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail +postFile="/tmp/${APP}.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail +trshFile="/tmp/${APP}.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail +statFile="/tmp/${APP}.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail +urlFile="/tmp/${APP}.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail +htmlFile="/tmp/${APP}.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail +htmlEmail="/tmp/${APP}.email-$RANDOM.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail +clientEmail="/tmp/${APP}.shortemail-$RANDOM.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail # Path of the script; I should flip this check to make it more useful if [ -d "/etc/deploy" ]; then @@ -374,6 +373,7 @@ else nano ~/.deployrc clear; sleep 1 console "Loading user configuration." + # shellcheck source=/dev/null source ~/.deployrc # quickExit else diff --git a/etc/html/civil/digest/header.html b/etc/html/civil/digest/header.html index 04af4bb..73b7a07 100755 --- a/etc/html/civil/digest/header.html +++ b/etc/html/civil/digest/header.html @@ -61,7 +61,7 @@ " >> "${statFile}" fi diff --git a/lib/server-check.sh b/lib/server-check.sh index 53ee1d0..7f3e991 100755 --- a/lib/server-check.sh +++ b/lib/server-check.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading server checks" -function srvCheck() { +function server_check() { if [ "${SERVERCHECK}" == "TRUE" ]; then notice "Checking servers..." # Set SERVERFAIL to 0 diff --git a/lib/slack.sh b/lib/slack.sh index 6b7741b..05a1015 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -132,10 +132,10 @@ function slackTest { console "Testing Slack integration..." echo "${SLACKURL}" if [[ -z "${SLACKURL}" ]]; then - warning "No Slack configuration found."; emptyLine + warning "No Slack configuration found."; empty_line clean_up; exit 1 else curl -X POST --data "payload={\"text\": \"${slack_icon} Testing Slack integration of ${APP} from deploy ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${SLACKURL}" - emptyLine + empty_line fi } diff --git a/lib/ssh-check.sh b/lib/ssh-check.sh index 7ebe208..cb44293 100755 --- a/lib/ssh-check.sh +++ b/lib/ssh-check.sh @@ -8,7 +8,7 @@ # TODO: Rewrite this to store git@domain stuff in a variable, allow for other # repohosts to work (Gitlab etc.) and shorten the entire function -function sshChk() { +function ssh_check() { if [[ "${NOKEY}" != "TRUE" ]]; then trace "Checking SSH configuration" if [[ "${REPOHOST}" == *"bitbucket"* ]]; then diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh index c8225c1..e3a9720 100755 --- a/lib/user-feedback.sh +++ b/lib/user-feedback.sh @@ -55,6 +55,6 @@ function showProgress() { do progressBar "${number}" ${_end} done; - emptyLine; sleep 3 + empty_line; sleep 3 fi } diff --git a/lib/utilities.sh b/lib/utilities.sh index 0efe71f..f811b4c 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -46,7 +46,7 @@ function go() { if [[ "${SSHTEST}" == "1" ]]; then if [[ "${NOKEY}" != "TRUE" ]] && [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then notice "Checking SSH Configuration..." - sshChk + ssh_check else warning "This project is not configured to use SSH keys, no check needed." fi @@ -130,7 +130,7 @@ function dependency_check() { if [[ -z "${APPRC}" ]]; then # Make sure app directory is writable if [[ -w "${WORKPATH}/${APP}" ]]; then - emptyLine; info "Project configuration not found, creating."; sleep 2 + empty_line; info "Project configuration not found, creating."; sleep 2 # If configuration directory is defined if [[ -n "${CONFIGDIR}" ]]; then if [[ ! -d "${WORKPATH}/${APP}/${CONFIGDIR}" ]]; then diff --git a/lib/webhook.sh b/lib/webhook.sh index 68492ac..22fb329 100755 --- a/lib/webhook.sh +++ b/lib/webhook.sh @@ -30,10 +30,10 @@ function postTest { console "Testing POST integration..." echo "${POSTURL}" if [[ -z "${POSTURL}" ]]; then - warning "No webhook URL found."; emptyLine + warning "No webhook URL found."; empty_line clean_up; exit 1 else curl -X POST --data "payload={\"text\": \"Testing POST integration of ${APP} from deploy ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${POSTURL}" - emptyLine + empty_line fi } diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh index 043cf22..1f243e4 100755 --- a/lib/wp-plugins.sh +++ b/lib/wp-plugins.sh @@ -27,7 +27,7 @@ function wpPlugins() { # Display plugin list if [[ "${QUIET}" != "1" ]]; then - cat "${wpFile}"; emptyLine + cat "${wpFile}"; empty_line fi if [[ "${FORCE}" = "1" ]] || yesno --default no "Proceed with updates? [y/N] "; then diff --git a/lib/wp-wordfence.sh b/lib/wp-wordfence.sh index 8873299..802e141 100755 --- a/lib/wp-wordfence.sh +++ b/lib/wp-wordfence.sh @@ -10,7 +10,7 @@ function wfCheck() { if [[ "${WFCHECK}" == "TRUE" ]]; then if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/wflogs/config.php" ]]; then - trace "Wordfence detected"; emptyLine + trace "Wordfence detected"; empty_line warning "Wordfence firewall detected, and may cause issues with deployment." if [[ "${FORCE}" = "1" ]] || [[ "${QUIET}" = "1" ]]; then error "Deployment can not continue while Wordfence firewall is enabled." From e5d218d256cab840e0c113e31b5863e2d3f24339 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 2 Feb 2018 10:36:09 -0800 Subject: [PATCH 032/334] Date fix, resolve #124 --- deploy.sh | 8 ++--- etc/html/default/header.html | 55 +++++++++++++++++------------ etc/html/default/report/header.html | 4 +-- install/doinst.sh | 2 +- lib/process-html.sh | 2 +- lib/report.sh | 9 ++++- 6 files changed, 48 insertions(+), 32 deletions(-) diff --git a/deploy.sh b/deploy.sh index 0b3f6b4..943d5c8 100755 --- a/deploy.sh +++ b/deploy.sh @@ -84,8 +84,8 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \ WPAPP WPSYSTEM DONOTUPDATEWP gitHistory ANALYTICSMSG digestSendmail MINAUSER \ MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX \ - DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile CURMTH \ - CURYR PRVMTH PRVYR LASTDY TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ + DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile \ + TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI RELEASE RELEASENOTES \ RELEASEURL <<< "" echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} @@ -100,8 +100,8 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${ANALYTICSMSG} ${digestSendmail} ${MINAUSER} ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${DISABLESSHCHECK} - ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${CURMTH} ${CURYR} - ${PRVMTH} ${PRVYR} ${LASTDY} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} + ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} + ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} ${MONITORAPI} ${RELEASE} ${RELEASENOTES} ${RELEASEURL}" > /dev/null diff --git a/etc/html/default/header.html b/etc/html/default/header.html index 03e0f37..6f155ae 100755 --- a/etc/html/default/header.html +++ b/etc/html/default/header.html @@ -1,6 +1,5 @@ - - - + + @@ -11,37 +10,48 @@ + - - - - - + @@ -49,7 +59,6 @@ " >> "${statFile}" fi From fd592f4fbaafe7eabb8f7982c7595410ccf5cfc1 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 8 Feb 2018 20:27:16 -0800 Subject: [PATCH 033/334] Resolve #118 --- CHANGELOG.md | 2 ++ deploy.sh | 4 +-- etc/deploy.sh | 18 +++++++------ lib/approval.sh | 67 +++++++++++++++++++++++++++-------------------- lib/statistics.sh | 58 ++++++++++++++++++++-------------------- 5 files changed, 82 insertions(+), 67 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de0394..8b641da 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Configuration files restructured for better readability - Many function and variable names changed for better consistency ### Fixed +- Fixed a crash that could occur when creating statistics for projects with code in approval queue +- Reports for the month of Januray now generate correctly - Google analytics no longer incorrectly display for projects that do not use them ## [3.6.6] - 01-13-2018 diff --git a/deploy.sh b/deploy.sh index 943d5c8..f18fdd2 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.6" +VERSION="3.6.7-alpha.2" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -518,7 +518,7 @@ fi # Check if a deployment is queued if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ -f "${WORKPATH}/${APP}/.queued" ]]; then if [[ "${APPROVE}" != "1" ]] && [[ "${DENY}" != "1" ]]; then - error "There is changed code already queued. Approve or deny it before attempting another deployment." + queue_check fi if [[ "${DENY}" == "1" ]] || [[ -f "${WORKPATH}/${APP}/.denied" ]]; then deny diff --git a/etc/deploy.sh b/etc/deploy.sh index f71914f..6dab455 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -115,12 +115,13 @@ # Project Management # ------------------ + # Task#: This is used to post deploy logs to project management systems # that can accept external email input. For examples, our task management system # accepts emails in the format task-####@projects.emrl.com, with the #### # being the task identification number for the project being deployed. # TASK="####" -# + # If you wish to have automated deployments add tracked time to your project # management system, uncomment and configure the two values below. TASKUSER # should be the email address of the user that the time will be logged as, @@ -131,22 +132,23 @@ # Slack # ----- + # You'll need to set up an "Incoming Webhook" custom integration on the Slack # side to get this ready to roll. # See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get # going. Once your Slack webhook is setup, run # 'deploy --slack-test' to # test your configuration. -# + # Set POSTTOSLACK to "TRUE" to enable Slack integration. # POSTTOSLACK="TRUE" -# + # Add your full Webhook URL below, including https:// # SLACKURL="https://hooks.slack.com/services/###################/########################" -# + # Normally only successful deployments are posted to Slack. # Enable the settings below to post on WARNiNG and/or ERROR. # SLACKERROR="FALSE" -# + # If you'd like to post a Slack notification with a URL to view the weekly digest # set the following to TRUE. If you want to use an incoming webhook other than the # one defined in SLACKURL, enter that here *instead* of TRUE. @@ -243,15 +245,15 @@ # CLIENTID="#############################################.apps.googleusercontent.com" # CLIENTSECRET="########################" # REDIRECTURI="http://localhost" -# + # OAuth authorization will expire after one hour, but will be updated when needed # if the tokens below are configured correctly # AUTHORIZATIONCODE="##############################################" -# + # Tokens # ACCESSTOKEN="#################################################################################################################################" # REFRESHTOKEN="##################################################################" -# + # Google Analytics ID # PROFILEID="########" diff --git a/lib/approval.sh b/lib/approval.sh index cba6dfe..05020da 100755 --- a/lib/approval.sh +++ b/lib/approval.sh @@ -12,40 +12,49 @@ read -r QUEUED <<< "" echo "${QUEUED}" > /dev/null function queue() { - # Make sure there's something to do - gitStatus - gitCommit - (git status --porcelain | sed s/^...//) >> "${WORKPATH}/${APP}/.queued" + # Make sure there's something to do + gitStatus + gitCommit + (git status --porcelain | sed s/^...//) >> "${WORKPATH}/${APP}/.queued" - info "Queuing proposed updates for approval" - safeExit - # slackPost + info "Queuing proposed updates for approval" + safeExit + # slackPost } function approve() { - info "Approving proposed updates" - # Read proposed commit message from the first line of .queued - notes="$(head -n 1 ${WORKPATH}/${APP}/.queued)" - # Remove first line - sed -i -e "1d" "${WORKPATH}/${APP}/.queued" - # Loop through file, git add each file (line) - while read QUEUED; do - # Verify file date is older than .queued - if [[ "${QUEUED}" -nt "${WORKPATH}/${APP}/.queued" ]]; then - error "The file ${QUEUED} was modified after it was queued for approval." - sed -i '1s/^/${notes}\n/' "${QUEUED}" - else - git add "${QUEUED}" | tee --append "${logFile}" - fi - done < "${WORKPATH}/${APP}/.queued" - git commit -m "${notes}" &>> "${logFile}"; error_check - trace "Commit message: ${notes}" + info "Approving proposed updates" + # Read proposed commit message from the first line of .queued + notes="$(head -n 1 ${WORKPATH}/${APP}/.queued)" + # Remove first line + sed -i -e "1d" "${WORKPATH}/${APP}/.queued" + # Loop through file, git add each file (line) + while read QUEUED; do + # Verify file date is older than .queued + if [[ "${QUEUED}" -nt "${WORKPATH}/${APP}/.queued" ]]; then + error "The file ${QUEUED} was modified after it was queued for approval." + sed -i '1s/^/${notes}\n/' "${QUEUED}" + else + git add "${QUEUED}" | tee --append "${logFile}" + fi + done < "${WORKPATH}/${APP}/.queued" + git commit -m "${notes}" &>> "${logFile}"; error_check + trace "Commit message: ${notes}" } function deny() { - info "Denying proposed updates" - if [[ -f "${WORKPATH}/${APP}/.queued" ]]; then - rm "${WORKPATH}/${APP}/.queued" - fi - quietExit + info "Denying proposed updates" + if [[ -f "${WORKPATH}/${APP}/.queued" ]]; then + rm "${WORKPATH}/${APP}/.queued" + fi + quietExit +} + +# Check for approval queue +function queue_check() { + if [[ -f "${WORKPATH}/${APP}/.queued" ]]; then + warning "Can not continue while code is queued for approval." + + quietExit + fi } diff --git a/lib/statistics.sh b/lib/statistics.sh index 0066414..e0672b5 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -8,43 +8,45 @@ trace "Loading statistics functions" function projStats() { - hash gitchart 2>/dev/null || { - error "gitchart not installed." - } - if [[ "${REMOTELOG}" == "TRUE" ]]; then - # Setup up tmp work folder - if [[ ! -d "/tmp/stats" ]]; then - umask 077 && mkdir /tmp/stats &> /dev/null - fi + hash gitchart 2>/dev/null || { + error "gitchart not installed." + } + if [[ "${REMOTELOG}" == "TRUE" ]]; then + # Check for approval queue + queue_check - notice "Generating files..." + # Setup up tmp work folder + if [[ ! -d "/tmp/stats" ]]; then + umask 077 && mkdir /tmp/stats &> /dev/null + fi - # Process the HTML - cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" - process_html - cat "${htmlFile}" > "/tmp/stats/index.html" + notice "Generating files..." - # Create the charts - /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & - # /usr/bin/gitchart -r "${WORKPATH}/${APP}" commits_day "${LOCALHOSTPATH}/${APP}/stats/commits_day.svg" &>> /dev/null & - spinner $! + # Process the HTML + cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" + process_html + cat "${htmlFile}" > "/tmp/stats/index.html" - # Process primary chart color and set permissions if needed - sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; + # Create the charts + /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & + spinner $! - postLog + # Process primary chart color and set permissions if needed + sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; + + postLog # if [[ "${LOCALHOSTPOST}" == "TRUE" ]]; then # [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" # [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" # cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}" # chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null # fi - fi + fi } From 5f76085eb556a0d1ff7b13f58a3cacd34eeb47e2 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 9 Feb 2018 15:02:27 -0800 Subject: [PATCH 034/334] Fix for core update version number bug, resolve #83 --- lib/wp-core.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/wp-core.sh b/lib/wp-core.sh index a20679a..1cacdcb 100755 --- a/lib/wp-core.sh +++ b/lib/wp-core.sh @@ -29,9 +29,10 @@ function wpCore() { # messing up output with PHP crap sed '/^\s*$/d' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}"; - # Remove line breaks, value should noe equal 'version x.x.x' or - # some such. - sed ':a;N;$!ba;s/\n/ /g' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}"; + # Remove line breaks, value should noe equal 'version x.x.x' or some such. + sed ':a;N;$!ba;s/\n/ /g' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}" + # Remove everything up to and including the first space (in case of multiple core updates) + sed -i 's/[^ ]* //' "${coreFile}" COREUPD=$(<$coreFile) if [[ -n "${COREUPD}" ]]; then From 7c9f36587505a38c106de5a4cb1375fd6e67f709 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 9 Feb 2018 18:32:54 -0800 Subject: [PATCH 035/334] Fix for remote log expiration, resolve #125 --- CHANGELOG.md | 4 +++- deploy.sh | 2 +- lib/post-log.sh | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b641da..c1d3ca5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Configuration files restructured for better readability - Many function and variable names changed for better consistency ### Fixed +- Remote hosted log files are now correctly deleted when they expire - Fixed a crash that could occur when creating statistics for projects with code in approval queue -- Reports for the month of Januray now generate correctly +- Reports for the month of January now generate correctly +- Fixed a bug that could rarely report an incorrect Wordpress version number - Google analytics no longer incorrectly display for projects that do not use them ## [3.6.6] - 01-13-2018 diff --git a/deploy.sh b/deploy.sh index f18fdd2..a07a9c1 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.7-alpha.2" +VERSION="3.6.7-alpha.3" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" diff --git a/lib/post-log.sh b/lib/post-log.sh index cf3d873..7a53f42 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -105,6 +105,12 @@ function postLog() { if [[ "${REPORT}" != "1" ]] && [[ "${PROJSTATS}" != "1" ]]; then eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null fi + + # Remove logs older then X days + if [[ -n "${EXPIRELOGS}" ]]; then + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "'find ${SCPHOSTPATH}/${APP}* -mtime +${EXPIRELOGS} -exec rm {} \;' &> /dev/null" + fi + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "chmod -R 755 ${SCPHOSTPATH}/${APP}/" fi fi From 4a4f836805b4848fc17884122ac95eb01e256165 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sat, 10 Feb 2018 16:30:06 -0800 Subject: [PATCH 036/334] Added integer checking function --- deploy.sh | 7 ++- lib/git.sh | 5 +- lib/{core.sh => main.sh} | 7 +-- lib/monitor.sh | 106 +++++++++++++++++++-------------------- lib/post-log.sh | 11 +++- lib/release-check.sh | 31 +++++++----- lib/statistics.sh | 58 ++++++++++----------- lib/utilities.sh | 15 ++++++ lib/wp.sh | 4 +- 9 files changed, 135 insertions(+), 109 deletions(-) rename lib/{core.sh => main.sh} (98%) diff --git a/deploy.sh b/deploy.sh index a07a9c1..c7893d3 100755 --- a/deploy.sh +++ b/deploy.sh @@ -86,8 +86,7 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile \ TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ - MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI RELEASE RELEASENOTES \ - RELEASEURL <<< "" + MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI <<< "" echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} ${urlFile} ${htmlFile} ${htmlSendmail} ${htmlEmail} ${clientEmail} ${textSendmail} ${deployPath} ${etcLocation} ${libLocation} @@ -103,7 +102,7 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} - ${MONITORAPI} ${RELEASE} ${RELEASENOTES} ${RELEASEURL}" > /dev/null + ${MONITORAPI}" > /dev/null # Display command options function flags() { @@ -558,7 +557,7 @@ if [[ "${MERGE}" == "1" ]] && [[ -z "${PRODUCTION}" ]]; then fi # Execute the deploy process -core +main # Trapping stuff trap userExit INT diff --git a/lib/git.sh b/lib/git.sh index b35b61b..a458120 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -15,7 +15,7 @@ function gitStart() { # Directory exists? if [[ ! -d "${WORKPATH}/${APP}" ]]; then info "${WORKPATH}/${APP} is not a valid directory." - exit 1 + clean_up; exit 1 else cd "${WORKPATH}/${APP}" || error_check fi @@ -25,7 +25,7 @@ function gitStart() { sleep 1 else info "There is nothing at ${WORKPATH}/${APP} to deploy." - exit 1 + clean_up; exit 1 fi # Make sure there has been at least one commit previously made @@ -123,6 +123,7 @@ function gitCommit() { # Do a dry run; check for anything to commit git commit --dry-run &>> "${logFile}" + if grep -q "nothing to commit, working directory clean" "${logFile}"; then info "Nothing to commit, working directory clean." safeExit diff --git a/lib/core.sh b/lib/main.sh similarity index 98% rename from lib/core.sh rename to lib/main.sh index 35c9776..facbe9f 100755 --- a/lib/core.sh +++ b/lib/main.sh @@ -1,17 +1,18 @@ #!/usr/bin/env bash # -# core.sh +# main.sh # ############################################################################### -# The core application +# The main application ############################################################################### -function core() { +function main() { dependency_check # Check that required commands are available release_check # Check for newer version at Github gitStart # Check for a valid git project and get set up lock # Create lock file go # Start a deployment work session + if [[ "${DIGEST}" == "1" ]]; then create_digest elif [[ "${REPORT}" == "1" ]]; then diff --git a/lib/monitor.sh b/lib/monitor.sh index 61ebcaa..240a6c5 100755 --- a/lib/monitor.sh +++ b/lib/monitor.sh @@ -9,69 +9,69 @@ trace "Loading server monitoring" function server_monitor() { - # Don't bother unless all the needed variables are declared - if [[ -n "${MONITORURL}" ]] && [[ -n "${MONITORUSER}" ]] && [[ -n "${SERVERID}" ]] && [[ -n "${MONITORPASS}" ]]; then - # What kind of log is this? - if [[ "${REPORT}" == "1" ]]; then - # Last 30 days; this will not correlate exactly with the time range of the report - # which is dealing with the last calendar month, but oh well we get what we pay - # for. The PHP Monitor API has no ability to look up results in that way - MONITORHOURS="720" - elif [[ "${DIGEST}" == "1" ]] || [[ "${PROJSTATS}" == "1" ]]; then - # Digests and reports should average the 7 days - MONITORHOURS="168" - else - # Anything else defaults to 24 hours - MONITORHOURS="24" - fi - server_monitor_log - trace "Uptime: ${UPTIME} / Latency: ${LATENCY} (avg. over last ${MONITORHOURS} hours)" - fi + # Don't bother unless all the needed variables are declared + if [[ -n "${MONITORURL}" ]] && [[ -n "${MONITORUSER}" ]] && [[ -n "${SERVERID}" ]] && [[ -n "${MONITORPASS}" ]]; then + # What kind of log is this? + if [[ "${REPORT}" == "1" ]]; then + # Last 30 days; this will not correlate exactly with the time range of the report + # which is dealing with the last calendar month, but oh well we get what we pay + # for. The PHP Monitor API has no ability to look up results in that way + MONITORHOURS="720" + elif [[ "${DIGEST}" == "1" ]] || [[ "${PROJSTATS}" == "1" ]]; then + # Digests and reports should average the 7 days + MONITORHOURS="168" + else + # Anything else defaults to 24 hours + MONITORHOURS="24" + fi + server_monitor_log + trace "Uptime: ${UPTIME} / Latency: ${LATENCY} (avg. over last ${MONITORHOURS} hours)" + fi } function server_monitor_test() { - notice "Testing server monitor integration..." - if [[ -n "${MONITORURL}" ]] && [[ -n "${MONITORUSER}" ]] && [[ -n "${SERVERID}" ]] && [[ -n "${MONITORPASS}" ]]; then - console "Monitor URL: ${MONITORURL}" - console "User: ${MONITORUSER}" - console "Server ID: ${SERVERID}" - console "Password file: ${MONITORPASS}" + notice "Testing server monitor integration..." + if [[ -n "${MONITORURL}" ]] && [[ -n "${MONITORUSER}" ]] && [[ -n "${SERVERID}" ]] && [[ -n "${MONITORPASS}" ]]; then + console "Monitor URL: ${MONITORURL}" + console "User: ${MONITORUSER}" + console "Server ID: ${SERVERID}" + console "Password file: ${MONITORPASS}" else - warning "Server monitoring is not configured; check your project's configuration file." - return + warning "Server monitoring is not configured; check your project's configuration file." + return fi # Check last 7 days for the sake of the test - MONITORHOURS="24" - server_monitor_log - console "API: ${MONITORAPI}" - notice "Results (last 24 hours)" - console "Uptime: ${UPTIME}%" - console "Latency: ${LATENCY}s" + MONITORHOURS="24" + server_monitor_log + console "API: ${MONITORAPI}" + notice "Results (last 24 hours)" + console "Uptime: ${UPTIME}%" + console "Latency: ${LATENCY}s" } function server_monitor_log() { - # Load the password and setup the curl command - MONITORPASS=$(<$MONITORPASS) + # Load the password and setup the curl command + MONITORPASS=$(<$MONITORPASS) MONITORAPI="${MONITORURL}?tag=serveruptime&email=${MONITORUSER}&app_password=${MONITORPASS}&server_id=${SERVERID}&HoursUnit=${MONITORHOURS}" - curl -s --request GET "${MONITORAPI}" -o "${trshFile}" - # Uptime - UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trshFile}) - UPTIME="$(cut -d ',' -f 1 <<< "${UPTIME}")" - # Isolate the value we need - UPTIME="$(sed 's/^[^:]*://g' <<< "${UPTIME}")" - # Round to two decimal places - UPTIME="$(printf '%0.2f\n' "${UPTIME}")" - # Lop off the .00 if we're at 100% - if [[ "${UPTIME}" == "100.00" ]]; then - UPTIME="100" - fi + curl -s --request GET "${MONITORAPI}" -o "${trshFile}" + # Uptime + UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trshFile}) + UPTIME="$(cut -d ',' -f 1 <<< "${UPTIME}")" + # Isolate the value we need + UPTIME="$(sed 's/^[^:]*://g' <<< "${UPTIME}")" + # Round to two decimal places + UPTIME="$(printf '%0.2f\n' "${UPTIME}")" + # Lop off the .00 if we're at 100% + if [[ "${UPTIME}" == "100.00" ]]; then + UPTIME="100" + fi - # Latency - LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trshFile})" - LATENCY="$(cut -d ',' -f 1 <<< "${LATENCY}")" - # Isolate the value we need - LATENCY="$(sed 's/^[^:]*://g' <<< "${LATENCY}")" - # Round to two decimal places - LATENCY="$(printf '%0.2f\n' "${LATENCY}")" + # Latency + LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trshFile})" + LATENCY="$(cut -d ',' -f 1 <<< "${LATENCY}")" + # Isolate the value we need + LATENCY="$(sed 's/^[^:]*://g' <<< "${LATENCY}")" + # Round to two decimal places + LATENCY="$(printf '%0.2f\n' "${LATENCY}")" } diff --git a/lib/post-log.sh b/lib/post-log.sh index 7a53f42..958b15a 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -49,7 +49,10 @@ function postLog() { # Remove logs older then X days if [[ -n "${EXPIRELOGS}" ]]; then - find "${LOCALHOSTPATH}/${APP}"* -mtime +"${EXPIRELOGS}" -exec rm {} \; &> /dev/null + is_integer "${EXPIRELOGS}" + if [[ "${integer_check}" != "1" ]]; then + find "${LOCALHOSTPATH}/${APP}"* -mtime +"${EXPIRELOGS}" -exec rm {} \; &> /dev/null + fi fi fi @@ -108,9 +111,13 @@ function postLog() { # Remove logs older then X days if [[ -n "${EXPIRELOGS}" ]]; then - eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "'find ${SCPHOSTPATH}/${APP}* -mtime +${EXPIRELOGS} -exec rm {} \;' &> /dev/null" + is_integer "${EXPIRELOGS}" + if [[ "${integer_check}" != "1" ]]; then + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "'find ${SCPHOSTPATH}/${APP}* -mtime +${EXPIRELOGS} -exec rm {} \;' &> /dev/null" + fi fi + # Set permissions eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "chmod -R 755 ${SCPHOSTPATH}/${APP}/" fi fi diff --git a/lib/release-check.sh b/lib/release-check.sh index 8a0efc7..d466217 100755 --- a/lib/release-check.sh +++ b/lib/release-check.sh @@ -6,35 +6,40 @@ # Check to see if there is a new release version on Github ############################################################################### +# Initialize variables +read -r release release_notes release_url <<< "" +echo "${active_files}" > /dev/null + function release_check() { # Only check for a newer release when someone is at the console if [[ "${FORCE}" != "1" ]]; then # Get the release tag trace "Checking for deploy updates..." - RELEASE="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"tag_name\")" + release="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"tag_name\")" # Remove the extra garbage - RELEASE="${RELEASE#*v}" - RELEASE="$(printf '%s' "${RELEASE}" | sed 's/",//g')" + release="${release#*v}" + release="$(printf '%s' "${release}" | sed 's/",//g')" # Compare versions - if version_compare "${RELEASE}" "${VERSION}"; then + if version_compare "${release}" "${VERSION}"; then # Get release notes - RELEASENOTES="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"body\")" + release_notes="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"body\")" # Remove the extra garbage - RELEASENOTES="$(printf '%s' "${RELEASENOTES}" | sed 's^\"body\": \"^^g')" - RELEASENOTES="${RELEASENOTES//\"}" - RELEASENOTES=${RELEASENOTES#" "} + release_notes="$(printf '%s' "${release_notes}" | sed 's^\"body\": \"^^g')" + release_notes="${release_notes//\"}" + release_notes=${release_notes#" "} # User feedback - info "\r\nNew release found: ${RELEASE}" - printf "${RELEASENOTES}" | fold --spaces -w 78; empty_line + info "\r\nNew release found: ${release}\r\n" + printf "${release_notes}" | fold --spaces -w 78; empty_line # Update? + empty_line if yesno --default yes "Would you like to download now? [Y/n] "; then # Get latest - RELEASEURL="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep tarball_url | cut -d '"' -f 4)" - curl -Ls "${RELEASEURL}" -o "deploy-${RELEASE}.tar.gz" + release_url="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep tarball_url | cut -d '"' -f 4)" + curl -Ls "${release_url}" -o "deploy-${release}.tar.gz" # Eventually I'll have a full install here but for now we'll bail - console "Try 'tar zxvf deploy-${RELEASE}.tar.gz' and then 'sudo doinst.sh' from the archive root directory." + console "Try 'tar zxvf deploy-${release}.tar.gz' and then 'sudo doinst.sh' from the archive root directory." quietExit fi fi diff --git a/lib/statistics.sh b/lib/statistics.sh index e0672b5..23454fa 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -8,45 +8,45 @@ trace "Loading statistics functions" function projStats() { - hash gitchart 2>/dev/null || { - error "gitchart not installed." - } - if [[ "${REMOTELOG}" == "TRUE" ]]; then - # Check for approval queue - queue_check + hash gitchart 2>/dev/null || { + error "gitchart not installed." + } + if [[ "${REMOTELOG}" == "TRUE" ]]; then + # Check for approval queue + queue_check - # Setup up tmp work folder - if [[ ! -d "/tmp/stats" ]]; then - umask 077 && mkdir /tmp/stats &> /dev/null - fi + # Setup up tmp work folder + if [[ ! -d "/tmp/stats" ]]; then + umask 077 && mkdir /tmp/stats &> /dev/null + fi - notice "Generating files..." + notice "Generating files..." - # Process the HTML - cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" - process_html - cat "${htmlFile}" > "/tmp/stats/index.html" + # Process the HTML + cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" + process_html + cat "${htmlFile}" > "/tmp/stats/index.html" - # Create the charts - /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & - /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & - spinner $! + # Create the charts + /usr/bin/gitchart -r "${WORKPATH}/${APP}" authors "/tmp/stats/authors.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_day_week "/tmp/stats/commits_day_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_day "/tmp/stats/commits_hour_day.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_hour_week "/tmp/stats/commits_hour_week.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_month "/tmp/stats/commits_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year "/tmp/stats/commits_year.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" commits_year_month "/tmp/stats/commits_year_month.svg" &>> /dev/null & + /usr/bin/gitchart -t "" -r "${WORKPATH}/${APP}" files_type "/tmp/stats/files_type.svg" &>> /dev/null & + spinner $! - # Process primary chart color and set permissions if needed - sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; + # Process primary chart color and set permissions if needed + sleep 1; find "/tmp/stats/" -type f -exec sed -i "s/#9999ff/${PRIMARYC}/g" {} \; - postLog + postLog # if [[ "${LOCALHOSTPOST}" == "TRUE" ]]; then # [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}" # [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats" # cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}" # chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null # fi - fi + fi } diff --git a/lib/utilities.sh b/lib/utilities.sh index f811b4c..2ae6732 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -7,12 +7,18 @@ ############################################################################### trace "Loading utilities" +# Initialize variables +read -r integer_check <<< "" +echo "${integer_check}" > /dev/null + # Open a deployment session, ask for user confirmation before beginning function go() { if [[ "${QUIET}" != "1" ]]; then tput cnorm; fi + console "deploy ${VERSION}" + if [[ "${INCOGNITO}" != "TRUE" ]]; then console "Current working path is ${WORKPATH}/${APP}" fi @@ -119,6 +125,15 @@ function fix_index() { fi } +# Check that a variable is an integer +function is_integer() { + declare arg1="$1"; integer_check="0" + if [[ ! "${arg1}" =~ ^[0-9]+$ ]] ; then + integer_check="1" + fi +} + + # Check that dependencies exist function dependency_check() { # Is git installed? diff --git a/lib/wp.sh b/lib/wp.sh index 60e0919..622be03 100755 --- a/lib/wp.sh +++ b/lib/wp.sh @@ -48,9 +48,7 @@ function wpPkg() { # Check the logs #if grep -q "U = Update Available" "${logFile}"; then if grep -q "Available plugin updates:" "${wpFile}"; then - wpPlugins - - + wpPlugins else # Was there a database glitch? if grep -q 'plugins can not be updated' "${wpFile}"; then From f8f5caa46b04f26ab80c2b1cb57e97b6ff7162d8 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 12 Feb 2018 18:34:28 -0800 Subject: [PATCH 037/334] Added .deployrc configuration --- deploy.sh | 11 ++-- etc/.deployrc | 67 +++----------------- etc/deploy-example.conf | 133 +++++++++++++++++++++++++--------------- lib/configure.sh | 63 +++++++++++++++++++ lib/deployment.sh | 4 +- lib/git.sh | 12 ++-- lib/loader.sh | 14 ++--- lib/package-manager.sh | 4 +- 8 files changed, 178 insertions(+), 130 deletions(-) create mode 100755 lib/configure.sh diff --git a/deploy.sh b/deploy.sh index c7893d3..99eb209 100755 --- a/deploy.sh +++ b/deploy.sh @@ -204,7 +204,7 @@ while [[ ${1:-unset} = -?* ]]; do --monitor-test) MONITORTEST="1" ;; --stats) PROJSTATS="1" ;; --unlock) UNLOCK="1" ;; - --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="1" ;; + --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;; --no-check) NOCHECK="1" ;; --function-list) FUNCTIONLIST="1"; CURRENT="1" ;; # Spoofs --current --variable-list) VARIABLELIST="1"; CURRENT="1" ;; # Spoofs --current @@ -238,7 +238,7 @@ fi [[ "${SKIPUPDATE}" == "1" ]] && STARTUP="${STARTUP} --skip-update" [[ "${TIME}" == "1" ]] && STARTUP="${STARTUP} --time" [[ "${CURRENT}" == "1" ]] && STARTUP="${STARTUP} --current" -[[ "${VERBOSE}" == "1" ]] && STARTUP="${STARTUP} --verbose" +[[ "${VERBOSE}" == "TRUE" ]] && STARTUP="${STARTUP} --verbose" [[ "${QUIET}" == "1" ]] && STARTUP="${STARTUP} --quiet" [[ "${STRICT}" == "1" ]] && STARTUP="${STARTUP} --strict" [[ "${DEBUG}" == "1" ]] && STARTUP="${STARTUP} --debug" @@ -352,6 +352,8 @@ if [[ "${VARIABLELIST}" == "1" ]]; then ( set -o posix ; set ) | cat -v; quickExit fi + + # Spam all the things! trace "Version ${VERSION}" if [[ "${INCOGNITO}" != "TRUE" ]]; then @@ -369,14 +371,15 @@ else cp "${deployPath}"/.deployrc ~/.deployrc console "User configuration file missing, creating ~/.deployrc" if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then - nano ~/.deployrc - clear; sleep 1 + # nano ~/.deployrc + configure_user; sleep 1 console "Loading user configuration." # shellcheck source=/dev/null source ~/.deployrc # quickExit else info "You can change configuration later by editing ~/.deployrc" + clear_user fi fi diff --git a/etc/.deployrc b/etc/.deployrc index 0637c49..87b31a7 100755 --- a/etc/.deployrc +++ b/etc/.deployrc @@ -8,65 +8,12 @@ # settings will override those settings found here. Anything you leave # commented out or unset in this file will use the global configuration. -# Miscellaneous settings -# -# Activate "Smart Commits"; this feature tries to create automatic -# commit messages by parsing the log files generated during -# Wordpress updates. Set to exactly "TRUE" to activate. -# SMARTCOMMIT="TRUE" -# -# If you want to see statistics about your recent git activity, -# set this value to exactly "TRUE" -# GITSTATS="TRUE" +# Clear screen on startup, when not running with --quiet or --verbose switch +# CLEARSCREEN="{{CLEARSCREEN}}" -# Log settings -# -# Strips the bulk of nasty PHP debug messages out of the -# log files that are emailed upon deployment. -# NOPHP="TRUE" -# -# Set the address that should receive your log files -# TO="deploy@emrl.com" -# -# Email log subject line "- project name" is appended to this, creating -# a subject line such as "Project deployed - Project Name" -# SUBJECT="[EMRL] Deployment" -# -# When should email logs be sent? -# EMAILERROR="TRUE" -# EMAILSUCCESS="TRUE" -# EMAILQUIT="TRUE" +# Verbose output to console? +# VERBOSE="{{VERBOSE}}" -# If you want your emails to be sent "clean" (with no detailed logging) set -# SHORTEMAIL to TRUE. Full logs will still be posted to web logs. Error emails -# will continue to contain full logs. -# SHORTEMAIL="FALSE" - -# Send log file in HTML? -# EMAILHTML="FALSE" - -# Integration options -# -# Set values for where you'd like to post commit messages to -# via email. You can use something like Zapier to re-post that -# to whatever service you like, or if your project tracker allows -# for input directly via email like ours does, you post directly. -# Some of these options will definitely need to be set in the -# project's deploy.sh, not in a master configuration. -# -# Email from domain. Whatever you're integrating with may need -# a different From: address than that of the the machine you're -# actually deploying from. -# FROMDOMAIN="emrl.com" -# -# If you need to specify a user, other than your unix user name -# to be the in the From: email, do it here. Otherwise Leave blank. -# FROMUSER="" -# -# Post commit logs to this email address. This should probably -# be set per-project. For examples, for oour task management -# system, this email would be task-####@projects.emrl.com, with -# the #### being the task identification number for the project -# being deployed. -# POSTEMAILHEAD="task-" -# POSTEMAILTAIL="@projects.emrl.com" +# If you want to see statistics about your recent git activity, +# set this value to exactly "TRUE" +# GITSTATS="{{GITSTATS}}" diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf index c5f8ecf..8f79cda 100755 --- a/etc/deploy-example.conf +++ b/etc/deploy-example.conf @@ -3,9 +3,12 @@ # deploy.conf # # Global configuration file for deploy -# -# -# Clear screen on startup, when not running with --quiet switch + +############################################################################### +# General Setup +############################################################################### + +# Clear screen on startup, when not running with --quiet or --verbose switch CLEARSCREEN="TRUE" # Set the work path. This is the directory where all your @@ -16,18 +19,30 @@ WORKPATH="/var/www/html" # root directory, usually ./config CONFIGDIR="config" +# Check to see all servers defined (repo host, staging, production, etc) are +# returning a 200OK response +SERVERCHECK="TRUE" + +# Running deploy as the root user can be dangerous so it is not allowed by +# default. Set to TRUE is really must do this. +# ALLOWROOT="FALSE" + +# When ACTIVECHECK="TRUE", when running as deploy --force --update --quit +# files will be scanned for changes made within the timeframe set in +# ACTIVETiME (in minutes) and if any changes are found, deployment will be halted. +ACTIVECHECK="TRUE" +CHECKTIME="10" + + +############################################################################### +# Git Configuration +############################################################################### + # The URL for your repository hosting, with no trailing slash. For example, # if you use Github and your repo URL looks like https://github.com/EMRL/deploy # your REPOHOST should be set to https://github.com/EMRL (with no trailing slash) # REPOHOST="https://bitbucket.org/teamname" -# Check to see all servers defined (repo host, staging, production, etc) are -# returning a 200OK response -SERVERCHECK="TRUE" - -# Path to wp-cli, with no trailing slash -WPCLI="/usr/local/bin" - # Activate "Smart Commits"; this feature tries to create automatic # commit messages by parsing the log files generated during # Wordpress updates. Set to "TRUE" to activate. @@ -35,11 +50,33 @@ SMARTCOMMIT="TRUE" # If you want to see statistics about your recent git # commits, set this value to exactly "TRUE" -GITSTATS="TRUE" +GITSTATS="TRUE" -# Running deploy as the root user can be dangerous so it is not allowed by -# default. Set to TRUE is really must do this. -# ALLOWROOT="FALSE" +# If dirty (yet to be committed) files exist in the repo, deploy will normally not halt +# execution when running with the --automate flag. If you prefer to have the dirty files +# stashed and proceed with updates set the below value to TRUE. Files will be unstashed +# after the deployment is complete. +# STASH="TRUE" + +# Clean and compress repo before starting up +# GARBAGE="TRUE" + +############################################################################### +# Wordpress +############################################################################### + +# Path to wp-cli, with no trailing slash +WPCLI="/usr/local/bin" + +# Wordfence check - Wordfence makes some crappy files that break certain commands +# because of permissions garbage. Setting this to TRUE will enable a check that +# stops deployment if evidence of these files is detected. +# WFCHECK="FALSE" + + +############################################################################### +# Permission Fixes +############################################################################### # Activate Permission Fix. With multi-user stuff going on, sometimes # permission problems may arise. This function will reset permissions @@ -50,28 +87,13 @@ GITSTATS="TRUE" # APACHEUSER="apache" # Apache user # APACHEGROUP="apache" # Apache group -# Wordfence check - Wordfence makes some crappy files that break certain commands -# because of permissions garbage. Setting this to TRUE will enable a check that -# stops deployment if evidence of these files is detected. -# WFCHECK="FALSE" - -# Clean and compress repo before starting up -# GARBAGE="TRUE" - # If you have issues with the fatal permissions errors on .git/index, set this to TRUE # FIXINDEX="TRUE" -# If dirty (yet to be committed) files exist in the repo, deploy will normally not halt -# execution when running with the --automate flag. If you prefer to have the dirty files -# stashed and proceed with updates set the below value to TRUE. Files will be unstashed -# after the deployment is complete. -# STASH="TRUE" -# When ACTIVECHECK="TRUE", when running as deploy --force --update --quit -# files will be scanned for changes made within the timeframe set in -# ACTIVETiME (in minutes) and if any changes are found, deployment will be halted. -ACTIVECHECK="TRUE" -CHECKTIME="10" +############################################################################### +# Email +############################################################################### # Define the path to your mail program, with no trailing slash. As of now, deploy # only works with sendmail. @@ -92,14 +114,6 @@ MAILPATH="/usr/sbin" # EMAILSUCCESS="TRUE" # EMAILQUIT="FALSE" -# Strips the bulk of nasty PHP debug messages out of the -# log files that are emailed upon deployment. -NOPHP="TRUE" - -# IF INCOGNITO is set to true, log files as well as verbose output to screen -# will be stripped of details such as email addresses and system file paths. -# INCOGNITO="TRUE" - # If you want your emails to be sent "clean" (with no detailed logging) set # SHORTEMAIL to TRUE. Full logs will still be posted to web logs. Error emails # will continue to contain full logs. @@ -113,9 +127,9 @@ NOPHP="TRUE" # /etc/deploy/html. The value used below should be the folder name # of your template. # HTMLTEMPLATE="default" - -# Integration options. -# + +# Integration Emails +# ------------------ # Set values for where you'd like to post commit messages to # via email. You can use something like Zapier to re-post that # to whatever service you like, or if your project tracker allows @@ -140,8 +154,11 @@ NOPHP="TRUE" # POSTEMAILHEAD="task-" # POSTEMAILTAIL="@projects.domain.com" -# Slack Integration -# + +############################################################################### +# Slack Notifications +############################################################################### + # You'll need to set up an "Incoming Webhook" custom integration on the Slack # side to get this ready to roll. # See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get @@ -158,7 +175,28 @@ NOPHP="TRUE" # Enable the settings below to post on WARNiNG and/or ERROR. # SLACKERROR="TRUE" -# Post HTML logs to remote server. This needs to be set to "TRUE" even you + +############################################################################### +# Webhooks +############################################################################### + +# Webhook POST URL +# POSTURL="" + + +############################################################################### +# Logging +############################################################################### + +# Strips the bulk of nasty PHP debug messages out of the +# log files that are emailed upon deployment. +NOPHP="TRUE" + +# IF INCOGNITO is set to true, log files as well as verbose output to screen +# will be stripped of details such as email addresses and system file paths. +# INCOGNITO="TRUE" + + # Post HTML logs to remote server. This needs to be set to "TRUE" even you # are only posting to LOCALHOST. # REMOTELOG="TRUE" @@ -190,6 +228,3 @@ NOPHP="TRUE" # Set the number of days before logs should be deleted. Currently this only # works for logs stored on localhost. # EXPIRELOGS="30" - -# Webhook POST URL -# POSTURL="" diff --git a/lib/configure.sh b/lib/configure.sh new file mode 100755 index 0000000..59a203c --- /dev/null +++ b/lib/configure.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +# +# configure.sh +# +############################################################################### +# Global, user, and project configuration +############################################################################### +trace "Loading configuration" + +# Initialize variables +read -r active_files <<< "" +echo "${active_files}" > /dev/null + +function configure_project() { + trace "This is an empty function" +} + +function configure_user() { + empty_line + arg="CLEARSCREEN" + if yesno --default yes "Clear screen on startup? [Y/n] "; then + set_value + else + unset_value + fi + + arg="VERBOSE" + if yesno --default no "Always show verbose output on console? [y/N] "; then + set_value + else + unset_value + fi + + arg="GITSTATS" + if yesno --default yes "Display project statistics after every deployment? [Y/n] "; then + set_value + else + unset_value + fi + [[ "${VERBOSE}" == "TRUE" ]] && VERBOSE="1"; empty_line +} + +function configure_global() { + trace "This is an empty function" +} + +function set_value() { + sed -i -e "s^{{${arg}}}^TRUE^g" \ + -e "s^# ${arg}^${arg}^g" \ + ~/.deployrc +} + +function unset_value() { + sed -i -e "s^{{${arg}}}^FALSE^g" ~/.deployrc +} + +function clear_user() { +settings=(CLEARSCREEN VERBOSE GITSTATS) +empty_line +for arg in "${settings[@]}" ; do + unset_value +done +} diff --git a/lib/deployment.sh b/lib/deployment.sh index 594b607..8c2805f 100755 --- a/lib/deployment.sh +++ b/lib/deployment.sh @@ -22,7 +22,7 @@ function preDeploy() { if [[ "${STASH}" == "TRUE" ]] || [[ "${UPDATEONLY}" == "1" ]]; then # Bah, clunky empty_line trace "Stashing dirty files" - if [[ "${VERBOSE}" == "1" ]] && [[ "${QUIET}" != "1" ]]; then + if [[ "${VERBOSE}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then git stash | tee --append "${logFile}"; error_check else git stash >> "${logFile}"; error_check @@ -75,7 +75,7 @@ function pkgDeploy() { # Test deployment command before running deploy_check # Deploy via deployment command specified in configuration - if [[ "${VERBOSE}" == "1" ]] && [[ "${INCOGNITO}" != "TRUE" ]]; then + if [[ "${VERBOSE}" == "TRUE" ]] && [[ "${INCOGNITO}" != "TRUE" ]]; then eval "${DEPLOY}" | tee --append "${logFile}" error_check else diff --git a/lib/git.sh b/lib/git.sh index a458120..e59a4e1 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -57,7 +57,7 @@ function gitChkMstr() { current_branch="$(git rev-parse --abbrev-ref HEAD)" if [[ "${current_branch}" != "${MASTER}" ]]; then notice "Checking out master branch..."; fix_index - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then git checkout master | tee --append "${logFile}" else if [[ "${QUIET}" != "1" ]]; then @@ -105,7 +105,7 @@ function gitStage() { empty_line if [[ "${FORCE}" = "1" ]] || yesno --default yes "Stage files? [Y/n] "; then trace "Staging files" - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then git add -A | tee --append "${logFile}"; error_check else git add -A &>> "${logFile}"; error_check @@ -196,7 +196,7 @@ function gitPushMstr() { if [[ -n "${MASTER}" ]]; then trace "Pushing ${MASTER}"; fix_index empty_line - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then git push | tee --append "${logFile}"; error_check else if [[ "${FORCE}" = "1" ]] || yesno --default yes "Push ${MASTER} branch? [Y/n] "; then @@ -224,7 +224,7 @@ function gitChkProd() { if [[ -n "${PRODUCTION}" ]]; then notice "Checking out ${PRODUCTION} branch..."; fix_index - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then git checkout "${PRODUCTION}" | tee --append "${logFile}"; error_check else if [[ "${QUIET}" != "1" ]]; then @@ -271,7 +271,7 @@ function gitMerge() { [[ -f "${gitLock}" ]] && rm "${gitLock}" # Bonus add, just because. Ugh. # git add -A; error_check - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then git merge "${MASTER}" | tee --append "${logFile}" else if [[ "${QUIET}" != "1" ]]; then @@ -292,7 +292,7 @@ function gitPushProd() { if [[ -n "${PRODUCTION}" ]]; then trace "Push ${PRODUCTION}"; fix_index empty_line - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then git push | tee --append "${logFile}"; error_check trace "OK" else diff --git a/lib/loader.sh b/lib/loader.sh index d0c8e49..2dacf16 100755 --- a/lib/loader.sh +++ b/lib/loader.sh @@ -7,19 +7,19 @@ ############################################################################### # Save current contents of the terminal -if [ "${QUIET}" != "1" ]; then - if [ "${CLEARSCREEN}" == "TRUE" ]; then +if [[ "${CLEARSCREEN}" == "TRUE" ]]; then + if [[ "${QUIET}" != "1" ]] && [[ "${VERBOSE}" != "TRUE" ]]; then tput smcup; clear fi -else - if [[ "${FORCE}" != "1" ]] && [[ "${QUIET}" = "1" ]]; then - echo "To deploy using the --quiet flag, you must also use --force."; exit 1 - fi +fi + +if [[ "${FORCE}" != "1" ]] && [[ "${QUIET}" = "1" ]]; then + echo "To deploy using the --quiet flag, you must also use --force."; exit 1 fi # Creating this function first, so verbose output option is usable early function trace() { - if [[ "${VERBOSE}" == "1" ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then TIMESTAMP="$(date '+%H:%M:%S')" echo -e "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) $*" echo "${TIMESTAMP} $*" >> "${logFile}" diff --git a/lib/package-manager.sh b/lib/package-manager.sh index a5c7c62..6ca656b 100755 --- a/lib/package-manager.sh +++ b/lib/package-manager.sh @@ -18,7 +18,7 @@ function pkgMgr() { if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then cd "${WORKPATH}"/"${APP}" || errorCheck - if [[ "${VERBOSE}" -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then /usr/local/bin/grunt build --force 2>&1 | tee --append "${trshFile}" else /usr/local/bin/grunt build --force &>> "${trshFile}" & @@ -39,7 +39,7 @@ function pkgMgr() { if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck - if [[ $VERBOSE -eq 1 ]]; then + if [[ "${VERBOSE}" == "TRUE" ]]; then npm run build | tee --append "${trshFile}" else npm run build &>> "${trshFile}" & From a5a98b5639b83e60e6ad964df510c6502fde4da0 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 2 Mar 2018 12:53:46 -0800 Subject: [PATCH 038/334] Improved statistic reports, resolves #116 --- CHANGELOG.md | 2 + deploy.sh | 2 +- etc/html/default/stats/_analytics.html | 224 ------------------------- etc/html/default/stats/index.html | 144 ++++++++++++++++ lib/analytics.sh | 16 +- lib/configure.sh | 22 ++- lib/process-html.sh | 11 +- lib/statistics.sh | 3 + lib/utilities.sh | 6 +- 9 files changed, 191 insertions(+), 239 deletions(-) delete mode 100755 etc/html/default/stats/_analytics.html diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d3ca5..e7cd43d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Added +- Statistic reports now display server uptime, latency, and a few handy Google analytics stats ### Changed - Configuration files restructured for better readability - Many function and variable names changed for better consistency diff --git a/deploy.sh b/deploy.sh index 99eb209..632461a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.7-alpha.3" +VERSION="3.6.7-beta.1" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" diff --git a/etc/html/default/stats/_analytics.html b/etc/html/default/stats/_analytics.html deleted file mode 100755 index fac167b..0000000 --- a/etc/html/default/stats/_analytics.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
Invoice Ref. #Ref. #
- +
{{PROJCLIENT}}
 diff --git a/etc/html/default/report/header.html b/etc/html/default/report/header.html index e6e0b1f..52cb5cf 100755 --- a/etc/html/default/report/header.html +++ b/etc/html/default/report/header.html @@ -18,7 +18,7 @@
- {{LASTMONTH}} maintenance report for + {{LAST_MONTH}} maintenance report for

{{PROJCLIENT}}
@@ -26,7 +26,7 @@

{{PROJCLIENT}}

- This report for the month of {{LASTMONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}} + This report for the month of {{LAST_MONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}}

diff --git a/install/doinst.sh b/install/doinst.sh index 1c56d9b..dca64b2 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -59,7 +59,7 @@ function check_os() { } function check_program() { - printf "%-40s" "Checking for ${1}..." + printf "%-40s" "Checking for ${1}..."; read -p "" -t 0.03 # There's potential for non-global stuff to fail this check so here's a # fairly kludgey way to hopefully allow those to pass if [[ "${1}" =~ ^(wp|grunt|npm)$ ]]; then @@ -79,7 +79,7 @@ function error_check() { echo; check_os if [[ -n "${OS}" ]] && [[ -n "${VER}" ]]; then - echo "=> Checking operating system: "; sleep 1 + echo "=> Checking operating system: "; sleep .3 echo "${OS} ${VER}"; sleep 1 else # No values, crash out for now @@ -87,10 +87,10 @@ else fi # Declare dependencies -dependencies=(awk cat curl echo eval git grep pkill printf read sed sendmail sleep tput wget) +dependencies=(awk cat curl echo eval git grep pkill printf read sed sendmail sleep tput) # Declare optional stuff -options=(gitchart grunt npm scp ssh sshpass wp) +options=(gitchart grunt npm scp ssh sshpass wget wp) message='' fg_red="$(tput setaf 1)" @@ -102,7 +102,7 @@ YES="${fg_green}OK${reset}" NO="${fg_red}NO${reset}" NOT="${fg_red}NOT FOUND${reset}" -echo; echo "=> Checking for required dependencies:"; sleep 1 +echo; echo "=> Checking for required dependencies:" for i in "${dependencies[@]}" ; do check_program "${i}" done @@ -116,7 +116,7 @@ else exit 1 fi -echo; echo "=> Checking optional dependencies:"; sleep 1 +echo; echo "=> Checking optional dependencies:" for k in "${options[@]}" ; do check_program "${k}" done diff --git a/lib/analytics.sh b/lib/analytics.sh index c0993a6..0645af7 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -97,7 +97,7 @@ function ga_fail() { } function ga_test() { - emptyLine + empty_line if [[ -z "${CLIENTID}" ]] || [[ -z "${CLIENTSECRET}" ]]; then warning "Define API project" console "Analytics API project not defined. Check https://console.developers.google.com/" @@ -108,7 +108,7 @@ function ga_test() { fi if [[ -z "${AUTHORIZATIONCODE}" ]]; then - emptyLine; warning "Authorization required" + empty_line; warning "Authorization required" console "Point your browser to this link: https://accounts.google.com/o/oauth2/auth?scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fanalytics&redirect_uri=${REDIRECTURI}&response_type=code&client_id=${CLIENTID}" quickExit else @@ -116,7 +116,7 @@ function ga_test() { fi if [[ -z "${ACCESSTOKEN}" ]] || [[ -z "${REFRESHTOKEN}" ]]; then - emptyLine; warning "Create an access token" + empty_line; warning "Create an access token" console "Run this command: curl -H \"Content-Type: application/x-www-form-urlencoded\" -d code=${AUTHORIZATIONCODE} -d client_id=${CLIENTID} -d client_secret=${CLIENTSECRET} -d redirect_uri=${REDIRECTURI} -d grant_type=authorization_code https://accounts.google.com/o/oauth2/token" quickExit else @@ -125,7 +125,7 @@ function ga_test() { fi if [[ -z "${PROFILEID}" ]]; then - emptyLine; warning "Missing Profile ID" + empty_line; warning "Missing Profile ID" console "Your project's profile ID is not defined." quickExit else @@ -158,12 +158,12 @@ function ga_test() { notice "Retrieving ${METRIC}..." console "Running: printf \"${METRIC} (Last 7 days): \"; curl -s \"https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN\"" # | tr , '\n' | grep \"totalsForAllResults\" | cut -d'\"' -f6" - #emptyLine; analytics + #empty_line; analytics sleep 3 printf "${METRIC} (Last 7 days): "; curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6 - emptyLine + empty_line console "Verbose output" console "--------------" curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" - emptyLine + empty_line } diff --git a/lib/core.sh b/lib/core.sh index 6f9cd9e..35c9776 100755 --- a/lib/core.sh +++ b/lib/core.sh @@ -17,9 +17,9 @@ function core() { elif [[ "${REPORT}" == "1" ]]; then create_report else - srvCheck # Check that servers are up and running + server_check # Check that servers are up and running if [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then - sshChk # Check keys + ssh_check # Check keys fi permFix # Fix permissions if [[ "${PUBLISH}" == "1" ]]; then diff --git a/lib/deployment.sh b/lib/deployment.sh index 27a2c45..594b607 100755 --- a/lib/deployment.sh +++ b/lib/deployment.sh @@ -20,7 +20,7 @@ function preDeploy() { trace "Checking for files that need stashing" # Stash the dirty bits if [[ "${STASH}" == "TRUE" ]] || [[ "${UPDATEONLY}" == "1" ]]; then # Bah, clunky - emptyLine + empty_line trace "Stashing dirty files" if [[ "${VERBOSE}" == "1" ]] && [[ "${QUIET}" != "1" ]]; then git stash | tee --append "${logFile}"; error_check @@ -29,12 +29,12 @@ function preDeploy() { fi currentStash="1" else - emptyLine + empty_line error "There are previously undeployed changes in this project, deployment can not continue." fi else - emptyLine + empty_line warning "There are previously undeployed changes in this project." if yesno --default no "View unresolved files? [y/N] "; then @@ -52,7 +52,7 @@ function preDeploy() { } function pkgDeploy() { - emptyLine + empty_line if [[ -n "${DEPLOY}" ]]; then # Add ssh keys and double check directoy cd "${WORKPATH}/${APP}" || error_check diff --git a/lib/display-styles.sh b/lib/display-styles.sh index 2553b7c..26695e6 100755 --- a/lib/display-styles.sh +++ b/lib/display-styles.sh @@ -81,7 +81,7 @@ function warning() { echo "WARNING: $*" >> "${logFile}" } -function emptyLine() { +function empty_line() { if [[ "${QUIET}" != "1" ]]; then echo "" echo "" >> "${logFile}" diff --git a/lib/error-check.sh b/lib/error-check.sh index 7dc10d3..9fc7aad 100755 --- a/lib/error-check.sh +++ b/lib/error-check.sh @@ -17,6 +17,18 @@ function error_check() { fi } +# I'm not sure why this is here, figure it out! +# Try to get exit/error code, with a hard stop on fail +function error_status() { + EXITCODE=$?; + if [[ "${EXITCODE}" != 0 ]]; then + error_msg="WARNING: Error code ${EXITCODE}" + trace "${error_msg}" + else + trace "OK" + fi +} + function deploy_check() { if [[ "${DEPLOY}" == *"mina"* ]]; then # && [[ "${DEPLOY}" != *"bundle"* ]]; then DEPLOYTEST="mina --simulate deploy" @@ -107,14 +119,3 @@ function deploy_check() { trace "OK" fi } - -# Try to get exit/error code, with a hard stop on fail -function error_status() { - EXITCODE=$?; - if [[ "${EXITCODE}" != 0 ]]; then - error_msg="WARNING: Error code ${EXITCODE}" - trace "${error_msg}" - else - trace "OK" - fi -} diff --git a/lib/git.sh b/lib/git.sh index c67b1fb..b35b61b 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -52,7 +52,7 @@ function gitStart() { # Checkout master function gitChkMstr() { if [[ -z "${MASTER}" ]]; then - emptyLine; error "deploy ${VERSION} requires a master branch to be defined."; + empty_line; error "deploy ${VERSION} requires a master branch to be defined."; else current_branch="$(git rev-parse --abbrev-ref HEAD)" if [[ "${current_branch}" != "${MASTER}" ]]; then @@ -102,7 +102,7 @@ function gitStage() { if [[ -z $(git status --porcelain) ]]; then console "Nothing to commit, working directory clean."; quietExit else - emptyLine + empty_line if [[ "${FORCE}" = "1" ]] || yesno --default yes "Stage files? [Y/n] "; then trace "Staging files" if [[ "${VERBOSE}" -eq 1 ]]; then @@ -119,7 +119,7 @@ function gitStage() { # Commit, with message function gitCommit() { # Smart commit stuff - smrtCommit; emptyLine + smrtCommit; empty_line # Do a dry run; check for anything to commit git commit --dry-run &>> "${logFile}" @@ -194,7 +194,7 @@ function gitCommit() { function gitPushMstr() { if [[ -n "${MASTER}" ]]; then trace "Pushing ${MASTER}"; fix_index - emptyLine + empty_line if [[ "${VERBOSE}" -eq 1 ]]; then git push | tee --append "${logFile}"; error_check else @@ -290,7 +290,7 @@ function gitPushProd() { if [[ "${MERGE}" = "1" ]]; then if [[ -n "${PRODUCTION}" ]]; then trace "Push ${PRODUCTION}"; fix_index - emptyLine + empty_line if [[ "${VERBOSE}" -eq 1 ]]; then git push | tee --append "${logFile}"; error_check trace "OK" diff --git a/lib/log-handling.sh b/lib/log-handling.sh index fccd0d6..9439f78 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -75,7 +75,7 @@ function makeLog() { # IF we're using HTML emails, let's get to work if [[ "${EMAILHTML}" == "TRUE" ]]; then - [[ "${message_state}" != "DIGEST" ]] && htmlBuild + [[ "${message_state}" != "DIGEST" ]] && build_html cat "${htmlFile}" > "${trshFile}" # If this is an approval email, strip out PHP @@ -102,7 +102,7 @@ function makeLog() { VIEWPORTPRE=$(expr ${VIEWPORT} - 80) # Build the html email and details pages - # htmlBuild + # build_html # Strip out the buttons that self-link sed -e "s^// BUTTON: BEGIN //-->^BUTTON HIDE^g" -i "${htmlFile}" @@ -110,7 +110,7 @@ function makeLog() { fi } -function htmlBuild() { +function build_html() { # Build out the HTML LOGSUFFIX="html" if [[ "${message_state}" == "ERROR" ]]; then diff --git a/lib/mail-log.sh b/lib/mail-log.sh index f7c90b1..295022d 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -63,7 +63,7 @@ function mailLog() { function email_test() { console "Testing email..." if [[ -z "${TO}" ]]; then - warning "No recipient address found."; emptyLine + warning "No recipient address found."; empty_line clean_up; exit 1 else # Send HTML mail diff --git a/lib/process-html.sh b/lib/process-html.sh index d90c4b5..e75eaf2 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -8,9 +8,9 @@ trace "Loading html handling" # Initialize variables -read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID <<< "" +read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID COVER <<< "" echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} - ${SMOOCHID}" + ${SMOOCHID} ${COVER}" function process_html() { # Clean out the stuff we don't need @@ -62,9 +62,9 @@ function process_html() { -e "s^{{REMOTEURL}}^${REMOTEURL}^g" \ -e "s^{{ANALYTICSMSG}}^${ANALYTICSMSG}^g" \ -e "s^{{STATURL}}^${REMOTEURL}\/${APP}\/stats^g" \ - -e "s^{{DIGESTCOVER}}^${DIGESTCOVER}^g" \ + -e "s^{{COVER}}^${COVER}^g" \ -e "s^{{WEEKOF}}^${WEEKOF}^g" \ - -e "s^{{LASTMONTH}}^${LASTMONTH}^g" \ + -e "s^{{LASTMONTH}}^${LAST_MONTH}^g" \ -e "s^{{UPTIME}}^${UPTIME}^g" \ -e "s^{{LATENCY}}^${LATENCY}^g" \ "${htmlFile}" diff --git a/lib/release-check.sh b/lib/release-check.sh index dee44a7..8a0efc7 100755 --- a/lib/release-check.sh +++ b/lib/release-check.sh @@ -27,7 +27,7 @@ function release_check() { # User feedback info "\r\nNew release found: ${RELEASE}" - printf "${RELEASENOTES}" | fold --spaces -w 78; emptyLine + printf "${RELEASENOTES}" | fold --spaces -w 78; empty_line # Update? if yesno --default yes "Would you like to download now? [Y/n] "; then # Get latest diff --git a/lib/report.sh b/lib/report.sh index f230e55..2f10ea1 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -33,7 +33,7 @@ function create_report() { # If INCLUDEHOSTING is equal to something other than TRUE (And not FALSE), # its value will be used as the text string in the report if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then - INCLUDEHOSTING="Web hosting for the month of ${LASTMONTH} ${PRVYR}" + INCLUDEHOSTING="Web hosting for the month of ${LAST_MONTH} ${PRVYR}" fi echo "

${TASK}X
${INCLUDEHOSTING}
- @@ -26,7 +26,7 @@

{{PROJCLIENT}}

- This report for the month of {{LAST_MONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}} + This report for the month of {{LASTMONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}}

diff --git a/install/doinst.sh b/install/doinst.sh index dca64b2..398d3c5 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -87,7 +87,7 @@ else fi # Declare dependencies -dependencies=(awk cat curl echo eval git grep pkill printf read sed sendmail sleep tput) +dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sendmail sleep tput) # Declare optional stuff options=(gitchart grunt npm scp ssh sshpass wget wp) diff --git a/lib/process-html.sh b/lib/process-html.sh index e75eaf2..dcdf5e7 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -10,7 +10,7 @@ trace "Loading html handling" # Initialize variables read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID COVER <<< "" echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} - ${SMOOCHID} ${COVER}" + ${SMOOCHID} ${COVER}" > /dev/null function process_html() { # Clean out the stuff we don't need diff --git a/lib/report.sh b/lib/report.sh index 2f10ea1..0896cd1 100755 --- a/lib/report.sh +++ b/lib/report.sh @@ -7,6 +7,10 @@ ############################################################################### trace "Loading report handling" +# Initialize variables +read -r CURMTH CURYR PRVMTH PRVYR LASTDY <<< "" +echo "${CURMTH} ${CURYR} ${PRVMTH} ${PRVYR} ${LASTDY}" > /dev/null + function create_report() { message_state="REPORT" htmlDir @@ -18,6 +22,9 @@ function create_report() { if [[ "${CURMTH}" -eq 1 ]]; then PRVMTH="11" PRVYR=`expr "${CURYR}" - 1` + elif [[ "${CURMTH}" -eq 2 ]]; then + PRVMTH="12" + PRVYR=`expr "${CURYR}" - 1` else PRVMTH=`expr "${CURMTH}" - 2` PRVYR="${CURYR}" fi @@ -33,7 +40,7 @@ function create_report() { # If INCLUDEHOSTING is equal to something other than TRUE (And not FALSE), # its value will be used as the text string in the report if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then - INCLUDEHOSTING="Web hosting for the month of ${LAST_MONTH} ${PRVYR}" + INCLUDEHOSTING="Web hosting for the month of ${LAST_MONTH}" fi echo "

${TASK}X
${INCLUDEHOSTING}
- - - -
-
- - - - - - - - - - - - - - - - - -
-

Project Statistics BETA

- - -

Report generated June 27, 2017

-

CAA Website - (https://caanet.org/) -

- -
California Apartment Association
- - - - - - - - -

3,456Hits[0]

- -

34%New sessions[1] 3:23Avg. time[3] - -145Visitors from search[2] - -12Social interactions[4] - - -

-
- - - - - - - -
- - -

Commits by day of week

-

- -

Commits by hour of week

-

- -

Commits by hour of day

-

- -

Commits by month of year

-

- -

Commits by year

-

- -

Commits by year/month

-

-

- -

- - -

- -

Any Questions?

-

If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

- - - - - - - -

-
- - - - - - -
-
- - - diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index 24f0f39..e270cb6 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -68,6 +68,150 @@

+

Weekly overview

Uptime: {{UPTIME}}%
+
Latency: {{LATENCY}}s
+
+ + + + + + + +
+ + + + + + + +

Commits by day of week

diff --git a/lib/analytics.sh b/lib/analytics.sh index 0645af7..c398d2c 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -8,8 +8,8 @@ trace "Loading analytics functions" # Initialize variables -read -r SIZE RND METRIC RESULT <<< "" -echo "${SIZE} ${RND} ${METRIC} ${RESULT}" > /dev/null +read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION GA_SOCIAL <<< "" +echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL}" > /dev/null function ga_metrics() { array[0]="hits" @@ -87,6 +87,18 @@ function analytics() { function ga_data() { RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) SIZE="$(printf "%.0f\n" "${RESULT}")" + + if [[ "${PROJSTATS}" == "1" ]]; then + GA_HITS=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:hits&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) + GA_PERCENT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:percentNewSessions&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) + GA_SEARCHES=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:organicSearches&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) + GA_DURATION=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:avgSessionDuration&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) + GA_SOCIAL=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:socialInteractions&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6) + + # Make sure we're only dealing with integers + GA_PERCENT="$(printf "%.0f\n" "${GA_PERCENT}")" + GA_DURATION="$(printf "%.0f\n" "${GA_DURATION}")" + fi } # If no other results are worht displaying, fall back to displaying hits diff --git a/lib/configure.sh b/lib/configure.sh index 59a203c..6c99976 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -8,32 +8,37 @@ trace "Loading configuration" # Initialize variables -read -r active_files <<< "" -echo "${active_files}" > /dev/null +read -r value <<< "" +echo "${value}" > /dev/null function configure_project() { - trace "This is an empty function" + empty_line + arg="${PROJNAME}"; read -rp "Project name:" -e -i "${arg}" value; set_value "${value}" + arg="${PROJCLIENT}"; read -rp "Client name:" -e -i "${arg}" value; set_value "${value}" + arg="${DEVURL}"; read -rp "Development URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}" + arg="${PRODURL}"; read -rp "Production URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}" } function configure_user() { empty_line + target_file="/home/fdiebel/.deployrc" arg="CLEARSCREEN" if yesno --default yes "Clear screen on startup? [Y/n] "; then - set_value + set_value TRUE else unset_value fi arg="VERBOSE" if yesno --default no "Always show verbose output on console? [y/N] "; then - set_value + set_value TRUE else unset_value fi arg="GITSTATS" if yesno --default yes "Display project statistics after every deployment? [Y/n] "; then - set_value + set_value TRUE else unset_value fi @@ -45,8 +50,9 @@ function configure_global() { } function set_value() { - sed -i -e "s^{{${arg}}}^TRUE^g" \ - -e "s^# ${arg}^${arg}^g" \ + value="$1" + sed -i -e "s^{{${arg}}}^${value}^g" \ + -e "s^# ${arg}^${arg}^g" ~/.deployrc } diff --git a/lib/process-html.sh b/lib/process-html.sh index dcdf5e7..8dd5d47 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -22,9 +22,13 @@ function process_html() { [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${htmlFile}" [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${htmlFile}" [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${htmlFile}" - [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]] && sed -i '/ANALYTICS/d' "${htmlFile}" [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${htmlFile}" + if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then + sed -i '/BEGIN ANALYTICS/,/END ANALYTICS/d' "${htmlFile}" + sed -i '/ANALYTICS/d' "${htmlFile}" + fi + # Get to work sed -i -e "s^{{VIEWPORT}}^${VIEWPORT}^g" \ -e "s^{{NOW}}^${NOW}^g" \ @@ -67,5 +71,10 @@ function process_html() { -e "s^{{LASTMONTH}}^${LAST_MONTH}^g" \ -e "s^{{UPTIME}}^${UPTIME}^g" \ -e "s^{{LATENCY}}^${LATENCY}^g" \ + -e "s^{{GA_HITS}}^${GA_HITS}^g" \ + -e "s^{{GA_PERCENT}}^${GA_PERCENT}^g" \ + -e "s^{{GA_SEARCHES}}^${GA_SEARCHES}^g" \ + -e "s^{{GA_DURATION}}^${GA_DURATION}^g" \ + -e "s^{{GA_SOCIAL}}^${GA_SOCIAL}^g" \ "${htmlFile}" } diff --git a/lib/statistics.sh b/lib/statistics.sh index 23454fa..df233e0 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -22,6 +22,9 @@ function projStats() { notice "Generating files..." + # Attempt to get analytics + analytics + # Process the HTML cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}" process_html diff --git a/lib/utilities.sh b/lib/utilities.sh index 2ae6732..dd2ad07 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -23,6 +23,9 @@ function go() { console "Current working path is ${WORKPATH}/${APP}" fi + # Weird spot for this I know + server_monitor + # Slack test if [[ "${SLACKTEST}" == "1" ]]; then slackTest; quickExit @@ -106,9 +109,6 @@ function go() { if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ -f "${WORKPATH}/${APP}/.queued" ]] && [[ -f "${WORKPATH}/${APP}/.approved" ]]; then notice "Processing outstanding approval..." fi - - # Weird spot for this I know - server_monitor } function fix_index() { From 43d8bb80a1ee6e18ece9d5d2a766e645eb569881 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sat, 3 Mar 2018 13:21:24 -0800 Subject: [PATCH 039/334] Development is now staging, resolve #126 --- deploy.sh | 2 +- etc/deploy.sh | 2 +- etc/html/default/stats/index.html | 2 +- install/doinst.sh | 2 +- lib/configure.sh | 2 +- lib/server-check.sh | 8 ++++---- lib/statistics.sh | 2 +- lib/utilities.sh | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy.sh b/deploy.sh index 632461a..db62afc 100755 --- a/deploy.sh +++ b/deploy.sh @@ -462,7 +462,7 @@ fi # General info if [[ "${INCOGNITO}" != "TRUE" ]]; then trace "Log file is ${logFile}" - trace "Development workpath is ${WORKPATH}" + trace "Project workpath is ${WORKPATH}" # Are we planning on "fixing" permissions? if [[ "${FIXPERMISSIONS}" == "TRUE" ]]; then trace "Lead developer permissions are ${DEVUSER}.${DEVGROUP}" diff --git a/etc/deploy.sh b/etc/deploy.sh index 6dab455..1773ca7 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -16,7 +16,7 @@ # A human readable client name # PROJCLIENT="Client Name" -# Development project URL, including http:// or https:// +# Staging URL, including http:// or https:// # DEVURL="http://devurl.com" # Production, or "Live" project URL, including http:// or https:// diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index e270cb6..e89adb9 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -60,7 +60,7 @@

Project Statistics BETA

-

Report generated {{NOW}}

+

Weekly report generated {{NOW}}

{{PROJNAME}} ({{PRODURL}})

diff --git a/install/doinst.sh b/install/doinst.sh index 398d3c5..f941615 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -90,7 +90,7 @@ fi dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sendmail sleep tput) # Declare optional stuff -options=(gitchart grunt npm scp ssh sshpass wget wp) +options=(gitchart grunt npm scp ssh sshpass wget wkhtmltopdf wp) message='' fg_red="$(tput setaf 1)" diff --git a/lib/configure.sh b/lib/configure.sh index 6c99976..07adb89 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -15,7 +15,7 @@ function configure_project() { empty_line arg="${PROJNAME}"; read -rp "Project name:" -e -i "${arg}" value; set_value "${value}" arg="${PROJCLIENT}"; read -rp "Client name:" -e -i "${arg}" value; set_value "${value}" - arg="${DEVURL}"; read -rp "Development URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}" + arg="${DEVURL}"; read -rp "Staging URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}" arg="${PRODURL}"; read -rp "Production URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}" } diff --git a/lib/server-check.sh b/lib/server-check.sh index 7f3e991..0a1d83a 100755 --- a/lib/server-check.sh +++ b/lib/server-check.sh @@ -27,14 +27,14 @@ function server_check() { fi if [[ -z "${DEVURL}" ]]; then - trace "No development URL set, skipping check" + trace "No staging URL set, skipping check" else # Should return "200 OK" if all is working well if curl -sL --head "${DEVURL}" | grep "200 OK" > /dev/null; then - console " ${DEVURL} (development) ${tan}OK${endColor}"; + console " ${DEVURL} (staging) ${tan}OK${endColor}"; else - console " ${DEVURL} (development) ${red}FAIL${endColor}" - trace " ${DEVURL} (development) FAIL"; SERVERFAIL="1" + console " ${DEVURL} (staging) ${red}FAIL${endColor}" + trace " ${DEVURL} (staging) FAIL"; SERVERFAIL="1" fi fi diff --git a/lib/statistics.sh b/lib/statistics.sh index df233e0..e839025 100755 --- a/lib/statistics.sh +++ b/lib/statistics.sh @@ -7,7 +7,7 @@ ############################################################################### trace "Loading statistics functions" -function projStats() { +function project_stats() { hash gitchart 2>/dev/null || { error "gitchart not installed." } diff --git a/lib/utilities.sh b/lib/utilities.sh index dd2ad07..d844217 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -64,7 +64,7 @@ function go() { # Generate git stats if [[ "${PROJSTATS}" == "1" ]]; then - projStats; quickExit + project_stats; quickExit fi # Chill and wait for user to confirm project From 652820c88aba1c7afbcc46057098dfe8061e5bea Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 4 Mar 2018 13:31:22 -0800 Subject: [PATCH 040/334] Fix for user config creation, resolve #127 --- deploy.sh | 28 ++++++++++---------- etc/deploy.sh | 2 ++ lib/configure.sh | 5 ++-- lib/env-check.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/main.sh | 1 + 5 files changed, 87 insertions(+), 16 deletions(-) create mode 100755 lib/env-check.sh diff --git a/deploy.sh b/deploy.sh index db62afc..ee32015 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.7-beta.1" +VERSION="3.6.7-beta.2" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -57,7 +57,8 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME \ TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO \ - REPORTURL CLIENTCONTACT INCLUDEHOSTING <<< "" + REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION USER_VERSION \ + PROJECT_VERSION <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} @@ -73,7 +74,7 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} - ${INCLUDEHOSTING}" > /dev/null + ${INCLUDEHOSTING} ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \ @@ -388,33 +389,32 @@ if [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh" ]]; then if [[ "${INCOGNITO}" != "TRUE" ]]; then trace "Loading project configuration from ${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh" fi - # shellcheck disable=1090 - source "${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh"; APPRC="1" + project_config="${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh" # Fallback to configuration file in the root directory if it exists elif [[ -f "${WORKPATH}/${APP}/.deploy.sh" ]]; then if [[ "${INCOGNITO}" != "TRUE" ]]; then trace "Loading project configuration from ${WORKPATH}/${APP}/.deploy.sh" fi - # shellcheck disable=1090 - source "${WORKPATH}/${APP}/.deploy.sh"; APPRC="1" - # Zero out the configdir variable + project_config="${WORKPATH}/${APP}/.deploy.sh" + # Zero out the global configdir variable CONFIGDIR="" elif [[ -f "${WORKPATH}/${APP}/deploy.sh" ]]; then if [[ "${INCOGNITO}" != "TRUE" ]]; then trace "Loading project configuration from ${WORKPATH}/${APP}/deploy.sh" fi # shellcheck disable=1090 - source "${WORKPATH}/${APP}/deploy.sh"; APPRC="1" - # Zero out the configdir variable + project_config="${WORKPATH}/${APP}/deploy.sh" + # Zero out the global configdir variable CONFIGDIR="" else trace "No project configuration file found" fi -# Does a project configuration exist? -#if [[ "${APPRC}" != "1" ]]; then -# trace "No project configuration file found" -#fi +if [[ -n "${project_config}" ]]; then + # shellcheck disable=1090 + source "${project_config}" + APPRC="1" +fi # Make sure variables are set up correctly for var in "${REPOHOST} ${CLIENTLOGO}" "${DEVURL}" "${PRODURL}"; do diff --git a/etc/deploy.sh b/etc/deploy.sh index 1773ca7..2bdfbc3 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -1,9 +1,11 @@ #!/usr/bin/env bash # +# # Here are examples of settings you might need to change on a per-project # basis. This file should be placed in either the project's root folder, # or in /config/. Settings configured in this file will override both # system & user settings. +PROJECT_VERSION="3.6.7" ############################################################################### diff --git a/lib/configure.sh b/lib/configure.sh index 07adb89..593ef93 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -21,7 +21,8 @@ function configure_project() { function configure_user() { empty_line - target_file="/home/fdiebel/.deployrc" + #target_file="/tmp/.deployrc" + #cp "${deployPath}"/.deployrc "${target_file}" arg="CLEARSCREEN" if yesno --default yes "Clear screen on startup? [Y/n] "; then set_value TRUE @@ -52,7 +53,7 @@ function configure_global() { function set_value() { value="$1" sed -i -e "s^{{${arg}}}^${value}^g" \ - -e "s^# ${arg}^${arg}^g" + -e "s^# ${arg}^${arg}^g" \ ~/.deployrc } diff --git a/lib/env-check.sh b/lib/env-check.sh new file mode 100755 index 0000000..e5aee28 --- /dev/null +++ b/lib/env-check.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash +# +# config-check.sh +# +############################################################################### +# Check to see if configuration files needs to be updated, and update if so +############################################################################### + +# Initialize variables +read -r update_global update_user update_project env_settings project_config sed_hack <<< "" +echo "${update_global} ${update_user} ${update_project} ${project_config} ${sed_hack}" > /dev/null + +function env_check() { + # Only check when someone is at the console + if [[ "${FORCE}" != "1" ]]; then + + # Compare version numbers + if version_compare "${VERSION}" "${PROJECT_VERSION}"; then + update_project="1" + fi + + if version_compare "${VERSION}" "${USER_VERSION}"; then + update_user="1" + fi + + if version_compare "${VERSION}" "${GLOBAL_VERSION}"; then + update_global="1" + fi + + # User feedback + info "\r\nNew version (${VERSION}) requires configuration updates." + + # Update? + if yesno --default yes "Update now? [Y/n] "; then + [[ "${update_project}" == "1" ]] && update_project + else + info "Skipping update." + fi + fi +} + +function update_project() { + info "Updating ${project_config}..." + env_settings=(PROJNAME PROJCLIENT DEVURL PRODURL) + cp "${deployPath}"/deploy.sh "${trshFile}" + + # Loops through the variables + for i in "${env_settings[@]}" ; do + console "${i}" + current_setting=$(grep "${i}" "${project_config}") + + # Don't bother parsing if we know it's not needed + + # Add a check to make sure the value in the project config is not commented out, if it is + # we should leave that setting controlled by global/user file + + if [[ -n "${current_setting}" ]] && [[ -n "${i}" ]]; then + console "current_setting = ${current_setting}" + sed_hack=$(echo "sed -i -e '/${i}=.*/c ${current_setting}' ${trshFile}") + console "${sed_hack}" + eval "${sed_hack}" + fi + done + + # templorary for testing + cp "${trshFile}" ~/result.txt +} diff --git a/lib/main.sh b/lib/main.sh index facbe9f..31722d4 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -9,6 +9,7 @@ function main() { dependency_check # Check that required commands are available release_check # Check for newer version at Github + # env_check # Check for configuration files that need updating gitStart # Check for a valid git project and get set up lock # Create lock file go # Start a deployment work session From 83de1becf98fa40609ad0eed7d0c8463547a5940 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 5 Mar 2018 21:11:47 -0800 Subject: [PATCH 041/334] Release 3.6.7 --- .gitignore | 3 +- CHANGELOG.md | 8 +- README.md | 14 ++-- deploy.sh | 2 +- etc/.deployrc | 5 ++ etc/deploy-example.conf | 113 +++++++++++++------------- etc/deploy.sh | 126 +++++++++++++++-------------- lib/env-check.sh | 171 ++++++++++++++++++++++++++++++++-------- lib/main.sh | 2 +- lib/release-check.sh | 2 +- 10 files changed, 282 insertions(+), 164 deletions(-) diff --git a/.gitignore b/.gitignore index 92f4d48..9c3bcee 100755 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ /*.sublime-workspace .DS_Store .deploy.sh -theme.conf \ No newline at end of file +theme.conf +*.bak \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e7cd43d..fd7b871 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## ## [3.6.6] - 03-05-2018 ### Added +- Configuration files now upgrade in place if needed when new versions of `deploy` are released - Statistic reports now display server uptime, latency, and a few handy Google analytics stats ### Changed - Configuration files restructured for better readability @@ -13,7 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fixed a crash that could occur when creating statistics for projects with code in approval queue - Reports for the month of January now generate correctly - Fixed a bug that could rarely report an incorrect Wordpress version number -- Google analytics no longer incorrectly display for projects that do not use them +- Google analytics no longer incorrectly display for projects that do not use them +- User configuration files are now created more reliably ## [3.6.6] - 01-13-2018 ### Added @@ -192,7 +194,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Old monolithic script rewritten -[Unreleased]: https://github.com/EMRL/deploy/compare/v3.6.6...HEAD +[Unreleased]: https://github.com/EMRL/deploy/compare/v3.6.7...HEAD [3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...3.6.8 [3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...3.6.7 [3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...3.6.6 diff --git a/README.md b/README.md index adae3e4..ba0a606 100755 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Deploy -[![release](https://img.shields.io/badge/release-v3.6.6-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) +[![release](https://img.shields.io/badge/release-v3.6.7-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy) -`deploy` is a shell script designed to speed up and automate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. +`deploy` is designed to speed up, automate, and integrate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. [Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md) @@ -54,9 +54,9 @@ Other Options: ## How It Works -Basically, this thing is a wrapper that simplifies web app deployment from a development or staging environment to a production server. At the moment is mostly focused on Wordpress projects but in it should work for other stuff too. +Basically, this thing consolidates a boatload of commands into a single command that simplifies web app deployment from a development or staging environment to a production server. -This script requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and [`mina`](http://nadarei.co/mina/) if they are installed. +`deploy` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and [`mina`](http://nadarei.co/mina/) if they are installed. ## Installation @@ -67,15 +67,15 @@ This script requires [`git`](https://git-scm.com/), and will make use of [`wp-cl ## Configuration -Configuration is handled in the `etc/deploy.conf` file. Individual users can also keep their own settings in `~/.deployrc` +Configuration is handled globally in the `etc/deploy.conf` file. Individual users also have their own settings in `~/.deployrc` Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/deploy/blob/master/etc/deploy.sh). -## Integration +## Slack For workgroups and teams that use it, `deploy` is able to integrate with Slack. You'll need to set up an "Incoming Webhook" custom integration on the Slack side to get this ready to roll. See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get going. Once you think you've got Slack configured, run `deploy --slack-test [project]` to test. -## Running on Autopilot +## Autopilot `deploy --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/deploy/blob/master/etc/cron/deploy.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed. diff --git a/deploy.sh b/deploy.sh index ee32015..d28179e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.7-beta.2" +VERSION="3.6.7" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" diff --git a/etc/.deployrc b/etc/.deployrc index 87b31a7..fbd237f 100755 --- a/etc/.deployrc +++ b/etc/.deployrc @@ -8,6 +8,11 @@ # settings will override those settings found here. Anything you leave # commented out or unset in this file will use the global configuration. +# This value indicates the version number when this file was last changed: +# it does not necessarily reflect deploy's current version number. +# DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP +USER_VERSION="3.6.7" + # Clear screen on startup, when not running with --quiet or --verbose switch # CLEARSCREEN="{{CLEARSCREEN}}" diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf index 8f79cda..9e1d8b5 100755 --- a/etc/deploy-example.conf +++ b/etc/deploy-example.conf @@ -4,34 +4,39 @@ # # Global configuration file for deploy +# This value indicates the version number when this file was last changed: +# it does not necessarily reflect deploy's current version number. +# DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP +GLOBAL_VERSION="3.6.7" + ############################################################################### # General Setup ############################################################################### # Clear screen on startup, when not running with --quiet or --verbose switch -CLEARSCREEN="TRUE" +# CLEARSCREEN="{{CLEARSCREEN}}" # Set the work path. This is the directory where all your # repos are stored, with no trailing slash -WORKPATH="/var/www/html" +# WORKPATH="{{WORKPATH}}" # Path to repository configuration files relative to its # root directory, usually ./config -CONFIGDIR="config" +# CONFIGDIR="{{CONFIGDIR}}" # Check to see all servers defined (repo host, staging, production, etc) are # returning a 200OK response -SERVERCHECK="TRUE" +# SERVERCHECK="{{SERVERCHECK}}" # Running deploy as the root user can be dangerous so it is not allowed by # default. Set to TRUE is really must do this. -# ALLOWROOT="FALSE" +# ALLOWROOT="{{ALLOWROOT}}" # When ACTIVECHECK="TRUE", when running as deploy --force --update --quit -# files will be scanned for changes made within the timeframe set in -# ACTIVETiME (in minutes) and if any changes are found, deployment will be halted. -ACTIVECHECK="TRUE" -CHECKTIME="10" +# files will be scanned for changes made within the timeframe set in ACTIVETME +# (in minutes) and if any changes are found, deployment will be halted. +# ACTIVECHECK="{{ACTIVECHECK}}" +# CHECKTIME="{{CHECKTIME}}" ############################################################################### @@ -41,37 +46,37 @@ CHECKTIME="10" # The URL for your repository hosting, with no trailing slash. For example, # if you use Github and your repo URL looks like https://github.com/EMRL/deploy # your REPOHOST should be set to https://github.com/EMRL (with no trailing slash) -# REPOHOST="https://bitbucket.org/teamname" +# REPOHOST="{{REPOHOST}}" # Activate "Smart Commits"; this feature tries to create automatic # commit messages by parsing the log files generated during # Wordpress updates. Set to "TRUE" to activate. -SMARTCOMMIT="TRUE" +# SMARTCOMMIT="{{SMARTCOMMIT}}" # If you want to see statistics about your recent git # commits, set this value to exactly "TRUE" -GITSTATS="TRUE" +# GITSTATS="{{GITSTATS}}" # If dirty (yet to be committed) files exist in the repo, deploy will normally not halt # execution when running with the --automate flag. If you prefer to have the dirty files # stashed and proceed with updates set the below value to TRUE. Files will be unstashed # after the deployment is complete. -# STASH="TRUE" +# STASH="{{STASH}}" # Clean and compress repo before starting up -# GARBAGE="TRUE" +# GARBAGE="{{GARBAGE}}" ############################################################################### # Wordpress ############################################################################### # Path to wp-cli, with no trailing slash -WPCLI="/usr/local/bin" +# WPCLI="{{WPCLI}}" # Wordfence check - Wordfence makes some crappy files that break certain commands # because of permissions garbage. Setting this to TRUE will enable a check that # stops deployment if evidence of these files is detected. -# WFCHECK="FALSE" +# WFCHECK="{{WFCHECK}}" ############################################################################### @@ -81,14 +86,14 @@ WPCLI="/usr/local/bin" # Activate Permission Fix. With multi-user stuff going on, sometimes # permission problems may arise. This function will reset permissions # upon each deploy. Set FIXPERMISSIONS to "TRUE" to activate. -# FIXPERMISSIONS="FALSE" -# DEVUSER="developer" # Lead developer username -# DEVGROUP="users" # Lead developer group -# APACHEUSER="apache" # Apache user -# APACHEGROUP="apache" # Apache group +# FIXPERMISSIONS="{{FIXPERMISSIONS}}" +# DEVUSER="{{DEVUSER}}" # Lead developer username +# DEVGROUP="{{DEVGROUP}}" # Lead developer group +# APACHEUSER="{{APACHEUSER}}" # Apache user +# APACHEGROUP="{{APACHEGROUP}}" # Apache group # If you have issues with the fatal permissions errors on .git/index, set this to TRUE -# FIXINDEX="TRUE" +# FIXINDEX="{{FIXINDEX}}" ############################################################################### @@ -97,36 +102,36 @@ WPCLI="/usr/local/bin" # Define the path to your mail program, with no trailing slash. As of now, deploy # only works with sendmail. -MAILPATH="/usr/sbin" +# MAILPATH="{{MAILPATH}}" # Set the address the logfiles will be sent to -# TO="deploy@domain.com" +# TO="{{TO}}" # Set the address the logfiles will be sent from -# FROM="support@domain.com" +# FROM="{{FROM}}" # Email log subject line "- project name" is appended to this, # creating a subject line such as "Project deployed - Project Name" -# SUBJECT="Deployment" +# SUBJECT="{{SUBJECT}}" # When should email logs be sent? Setting to TRUE to activate. -# EMAILERROR="TRUE" -# EMAILSUCCESS="TRUE" -# EMAILQUIT="FALSE" +# EMAILERROR="{{EMAILERROR}}" +# EMAILSUCCESS="{{EMAILSUCCESS}}" +# EMAILQUIT="{{EMAILQUIT}}" # If you want your emails to be sent "clean" (with no detailed logging) set -# SHORTEMAIL to TRUE. Full logs will still be posted to web logs. Error emails +# this value to TRUE. Full logs will still be posted to web logs. Error emails # will continue to contain full logs. -# SHORTEMAIL="TRUE" +# SHORTEMAIL="{{SHORTEMAIL}}" # Send HTML emails? -# EMAILHTML="TRUE" +# EMAILHTML="{{EMAILHTML}}" # If you're sending HTML emails, define which template you'd like # to use. HTML templates are stored in separate folders in # /etc/deploy/html. The value used below should be the folder name # of your template. -# HTMLTEMPLATE="default" +# HTMLTEMPLATE="{{HTMLTEMPLATE}}" # Integration Emails # ------------------ @@ -140,19 +145,19 @@ MAILPATH="/usr/sbin" # Email from domain. Whatever you're integrating with may need # a different From: address than that of the the machine you're # actually deploying from. -# FROMDOMAIN="domain.com" +# FROMDOMAIN="{{FROMDOMAIN}}" # If you need to specify a user, other than your unix user name # to be the in the From: email, do it here. Otherwise Leave blank. -# FROMUSER="" +# FROMUSER="{{FROMUSER}}" # Post commit logs to this email address. This should probably # be set per-project. For examples, for our task management # system, this email would be task-####@projects.emrl.com, with # the #### being the task identification number for the project # being deployed. -# POSTEMAILHEAD="task-" -# POSTEMAILTAIL="@projects.domain.com" +# POSTEMAILHEAD="{{POSTEMAILHEAD}}" +# POSTEMAILTAIL="{{POSTEMAILTAIL}}" ############################################################################### @@ -166,14 +171,14 @@ MAILPATH="/usr/sbin" # test your configuration. # # Set POSTTOSLACK to "TRUE" to enable Slack integration. -# POSTTOSLACK="TRUE" +# POSTTOSLACK="{{POSTTOSLACK}}" # Add your full Webhook URL below, including https:// -# SLACKURL="https://hooks.slack.com/services/#########/#########/######" +# SLACKURL="{{SLACKURL}}" # Normally only successful deployments are posted to Slack. # Enable the settings below to post on WARNiNG and/or ERROR. -# SLACKERROR="TRUE" +# SLACKERROR="{{SLACKERROR}}" ############################################################################### @@ -181,7 +186,7 @@ MAILPATH="/usr/sbin" ############################################################################### # Webhook POST URL -# POSTURL="" +# POSTURL="{{POSTURL}}" ############################################################################### @@ -190,41 +195,41 @@ MAILPATH="/usr/sbin" # Strips the bulk of nasty PHP debug messages out of the # log files that are emailed upon deployment. -NOPHP="TRUE" +# NOPHP="{{NOPHP}}" # IF INCOGNITO is set to true, log files as well as verbose output to screen # will be stripped of details such as email addresses and system file paths. -# INCOGNITO="TRUE" +# INCOGNITO="{{INCOGNITO}}" # Post HTML logs to remote server. This needs to be set to "TRUE" even you # are only posting to LOCALHOST. -# REMOTELOG="TRUE" +# REMOTELOG="{{REMOTELOG}}" # Define the root url where the deploy log will be accessible with no # trailing slash -# REMOTEURL="http://deploy.domain.com" +# REMOTEURL="{{REMOTEURL}}" # If using HTML logs, define which template you'd like to use. HTML templates # are stored in separate folders in /etc/deploy/html. The value used below # should be the folder name of your template. -# REMOTETEMPLATE="default" +# REMOTETEMPLATE="{{REMOTETEMPLATE}}" # Post logs via SCP -# SCPPOST="TRUE" -# SCPUSER="user" -# SCPHOST="hostname.com" -# SCPHOSTPATH="/full/path/to/file" +# SCPPOST="{{SCPPOST}}" +# SCPUSER="{{SCPUSER}}" +# SCPHOST="{{SCPHOST}}" +# SCPHOSTPATH="{{SCPHOSTPATH}}" # # DANGER DANGER: If for some reason you absolutely can't use an SSH key you # can configure your password here -# SCPPASS="password" +# SCPPASS="{{SCPPASS}}" # If you're posting logs to a place on the same machine you're deploying from, # set POSTTOLOCALHOST to "TRUE" and define the path where you want to store # the HTML logs. -# LOCALHOSTPOST="TRUE" -# LOCALHOSTPATH="/var/www/production/deploy" +# LOCALHOSTPOST="{{LOCALHOSTPOST}}" +# LOCALHOSTPATH="{{LOCALHOSTPATH}}" # Set the number of days before logs should be deleted. Currently this only # works for logs stored on localhost. -# EXPIRELOGS="30" +# EXPIRELOGS="{{EXPIRELOGS}}" diff --git a/etc/deploy.sh b/etc/deploy.sh index 2bdfbc3..ad1bbeb 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -5,6 +5,10 @@ # basis. This file should be placed in either the project's root folder, # or in /config/. Settings configured in this file will override both # system & user settings. + +# This value indicates the version number when this file was last changed: +# it does not necessarily reflect deploy's current version number. +# DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP PROJECT_VERSION="3.6.7" @@ -13,16 +17,16 @@ PROJECT_VERSION="3.6.7" ############################################################################### # A human readable project name -# PROJNAME="Best Webapp Ever" +# PROJNAME="{{PROJNAME}}" # A human readable client name -# PROJCLIENT="Client Name" +# PROJCLIENT="{{PROJCLIENT}}" # Staging URL, including http:// or https:// -# DEVURL="http://devurl.com" +# DEVURL="{{DEVURL}}" # Production, or "Live" project URL, including http:// or https:// -# PRODURL="http://productionurl.com" +# PRODURL="{{PRODURL}}" ############################################################################### @@ -34,43 +38,43 @@ PROJECT_VERSION="3.6.7" # your REPOHOST should be set to https://github.com/EMRL (with no trailing # slash) If most of your repos are all hosted at the same location, you may # want to define this in either the global or user configuration files. -# REPOHOST="" +# REPOHOST="{{REPOHOST}}" # The exact name of the Bitbucket/Github repository -# REPO="name-of-repo" +# REPO="{{REPO}}" # Configure your branches. In most cases the name will be master & production. # If you are only using a master branch, leave production undefined. -# MASTER="master" -# PRODUCTION="production" +# MASTER="{{MASTER}}" +# PRODUCTION="{{PRODUCTION}}" -# Configure merge behavior. If you wish to automatically merge your MASTER and -# PRODUCTION branches when deploying, set AUTOMERGE to TRUE. -# AUTOMERGE="TRUE" +# Configure merge behavior. If you wish to automatically merge your branches +# when deploying, set AUTOMERGE to TRUE. +# AUTOMERGE="{{AUTOMERGE}}" # If dirty (yet to be committed) files exist in the repo, deploy will normally # not halt execution when running with the --automate flag. If you prefer to # have the dirty files stashed and proceed with updates set the below value # to TRUE. Files will be unstashed after the deployment is complete. -# STASH="TRUE" +# STASH="{{STASH}}" # Define CHECKBRANCH if you only want deploy to run when the set branch is # currently checked out; e.g. if CHECKBRANCH="master" and the current branch is # "production", deployment will halt. -# CHECKBRANCH="master" +# CHECKBRANCH="{{CHECKBRANCH}}" # If you have no SSH key or wish to login manually using your account name and # password in the console, set NOKEY to exactly "TRUE" # -# NOKEY="TRUE" +# NOKEY="{{NOKEY}}" # By default deploy will check for valid SSH keys; if you want to override this # behavior, set DISABLESSHCHECK to TRUE -# DISABLESSHCHECK="FALSE" +# DISABLESSHCHECK="{{DISABLESSHCHECK}}" # If for some reason you'd like a default commit message. It will # always be editable before finalizing commit. -# COMMITMSG="This is a default commit message" +# COMMITMSG="{{COMMITMSG}}" ############################################################################### @@ -81,19 +85,19 @@ PROJECT_VERSION="3.6.7" # their application code. If you're using non-standard file paths, define the # root, system, and app (plugin/theme) directories below. Note that the forward # slash is required. Just about everyone on the planet can leave this alone. -# WPROOT="/public" -# WPAPP="/app" -# WPSYSTEM="/system" +# WPROOT="{{WPROOT}}" +# WPAPP="{{WPAPP}}" +# WPSYSTEM="{{WPSYSTEM}}" # If you do not want to allow core updates, set DONOTUPDATEWP to TRUE. -# DONOTUPDATEWP="FALSE" +# DONOTUPDATEWP="{{DONOTUPDATEWP}}" # Advanced Custom Fields Pro License # # Too many issues seem to crop up with the normal method of updating the # Wordpress plugin ACF Pro. Including your license key below will enable # upgrades to happen more reliably. -# ACFKEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" +# ACFKEY="{{ACFKEY}}" ############################################################################### @@ -101,14 +105,14 @@ PROJECT_VERSION="3.6.7" ############################################################################### # The command to finalize deployment of your project(s) -# DEPLOY="mina deploy" +# DEPLOY="{{DEPLOY}}" # To require approval before pushing this project's code to a live production # environment, set REQUIREAPPROVAL="TRUE" -# REQUIREAPPROVAL="TRUE" +# REQUIREAPPROVAL="{{REQUIREAPPROVAL}}" # Disallow deployment; set to TRUE to enable. Double negative, it's tricky. -# DONOTDEPLOY="TRUE" +# DONOTDEPLOY="{{DONOTDEPLOY}}" ############################################################################### @@ -122,15 +126,15 @@ PROJECT_VERSION="3.6.7" # that can accept external email input. For examples, our task management system # accepts emails in the format task-####@projects.emrl.com, with the #### # being the task identification number for the project being deployed. -# TASK="####" +# TASK="{{TASK}}" # If you wish to have automated deployments add tracked time to your project # management system, uncomment and configure the two values below. TASKUSER # should be the email address of the user that the time will be logged as, # and ADDTIME is the amount of time to be added for each deployment. Time # formats can in hh:mm (02:23) or HhMm (2h23m) format. -# TASKUSER="deploy@emrl.com" -# ADDTIME="10m" +# TASKUSER="{{TASKUSER}}" +# ADDTIME="{{ADDTIME}}" # Slack # ----- @@ -142,24 +146,24 @@ PROJECT_VERSION="3.6.7" # test your configuration. # Set POSTTOSLACK to "TRUE" to enable Slack integration. -# POSTTOSLACK="TRUE" +# POSTTOSLACK="{{POSTTOSLACK}}" # Add your full Webhook URL below, including https:// -# SLACKURL="https://hooks.slack.com/services/###################/########################" +# SLACKURL="{{SLACKURL}}" # Normally only successful deployments are posted to Slack. # Enable the settings below to post on WARNiNG and/or ERROR. -# SLACKERROR="FALSE" +# SLACKERROR="{{SLACKERROR}}" # If you'd like to post a Slack notification with a URL to view the weekly digest # set the following to TRUE. If you want to use an incoming webhook other than the # one defined in SLACKURL, enter that here *instead* of TRUE. -# DIGESTSLACK="FALSE" +# DIGESTSLACK="{{DIGESTSLACK}}" # Webhooks # -------- # Post event notifications to this URL. -# POSTURL="" +# POSTURL="{{POSTURL}}" ############################################################################### @@ -168,52 +172,52 @@ PROJECT_VERSION="3.6.7" # If you need to send logfiles and email alerts to address(es) other # than those configured globally, enter them below. -# TO="notify@client.com" +# TO="{{TO}}" # If you want to use an email template unique to this project (instead of the # globally configured template) define it below. HTML templates are stored in # separate folders in /etc/deploy/html. The value used below should be the # folder name of your template. -# HTMLTEMPLATE="default" +# HTMLTEMPLATE="{{HTMLTEMPLATE}}" # If you are using html logfiles, define the full URL to the client's logo -# CLIENTLOGO="http://client.com/assets/img/logo.png" +# CLIENTLOGO="{{CLIENTLOGO}}" # If you are using a digest theme that includes a cover image, at the URL below. -# COVER="http://client.com/assets/img/cover.jpg" +# COVER="{{COVER}}" # IF INCOGNITO is set to true, log files as well as verbose output to screen # will be stripped of details such as email addresses and system file paths. -# INCOGNITO="TRUE" +# INCOGNITO="{{INCOGNITO}}" # Post HTML logs to remote server. This needs to be set to "TRUE" even you # are only posting to LOCALHOST. -# REMOTELOG="TRUE" +# REMOTELOG="{{REMOTELOG}}" # Define the root url where the deploy log will be accessible with no # trailing slash -# REMOTEURL="http://deploy.domain.com" +# REMOTEURL="{{REMOTEURL}}" # If using HTML logs, define which template you'd like to use. HTML templates # are stored in separate folders in /etc/deploy/html. The value used below # should be the folder name of your template. -# REMOTETEMPLATE="default" +# REMOTETEMPLATE="{{REMOTETEMPLATE}}" # Post logs via SCP -# SCPPOST="TRUE" -# SCPUSER="user" -# SCPHOST="hostname.com" -# SCPHOSTPATH="/full/path/to/file" +# SCPPOST="{{SCPPOST}}" +# SCPUSER="{{SCPUSER}}" +# SCPHOST="{{SCPHOST}}" +# SCPHOSTPATH="{{SCPHOSTPATH}}" # DANGER DANGER: If for some reason you absolutely can't use an SSH key you # can configure the path to a text file containing *only* your password. -# SCPPASS="password" +# SCPPASS="{{SCPPASS}}" # If you're posting logs to a place on the same machine you're deploying from, # set POSTTOLOCALHOST to "TRUE" and define the path where you want to store # the HTML logs. -# LOCALHOSTPOST="TRUE" -# LOCALHOSTPATH="/var/www/production/deploy" +# LOCALHOSTPOST="{{LOCALHOSTPOST}}" +# LOCALHOSTPATH="{{LOCALHOSTPATH}}" ############################################################################### @@ -223,7 +227,7 @@ PROJECT_VERSION="3.6.7" # If you'd like to send branded HTML emails using the `deploy --digest [project]` # command, enter the recipient's email address below. Email value can be a comma # separated string of multiple addresses. -# DIGESTEMAIL="digest@email.com" +# DIGESTEMAIL="{{DIGESTEMAIL}}" ############################################################################### @@ -231,12 +235,12 @@ PROJECT_VERSION="3.6.7" ############################################################################### # First and last name of the primary contact for this client -# CLIENTCONTACT="First Last" +# CLIENTCONTACT="{{CLIENTCONTACT}}" # Include hosting as a line item on monthly reports? If set to TRUE, the report # line item will read "Monthly web hosting"; customize the text included in # report by setting it to any other value. -# INCLUDEHOSTING="TRUE" +# INCLUDEHOSTING="{{INCLUDEHOSTING}}" ############################################################################### @@ -244,20 +248,20 @@ PROJECT_VERSION="3.6.7" ############################################################################### # API credentials -# CLIENTID="#############################################.apps.googleusercontent.com" -# CLIENTSECRET="########################" -# REDIRECTURI="http://localhost" +# CLIENTID="{{CLIENTID}}" +# CLIENTSECRET="{{CLIENTSECRET}}" +# REDIRECTURI="{{REDIRECTURI}}" # OAuth authorization will expire after one hour, but will be updated when needed # if the tokens below are configured correctly -# AUTHORIZATIONCODE="##############################################" +# AUTHORIZATIONCODE="{{AUTHORIZATIONCODE}}" # Tokens -# ACCESSTOKEN="#################################################################################################################################" -# REFRESHTOKEN="##################################################################" +# ACCESSTOKEN="{{ACCESSTOKEN}}" +# REFRESHTOKEN="{{REFRESHTOKEN}}" # Google Analytics ID -# PROFILEID="########" +# PROFILEID="{{PROFILEID}}" ############################################################################### @@ -269,14 +273,14 @@ PROJECT_VERSION="3.6.7" # See https://github.com/EMRL/deploy/wiki/Integration for more information. # Full API URL -# MONITORURL="https://your.phpservermonitor.com/api/monitorapi.php" +# MONITORURL="{{MONITORURL}}" # Email/password of the user that will access the API. Password can be stored in # a file outside of the project repo for security reasons -# MONITORUSER="user@domain.com" -# MONITORPASS="/path/to/password/file" +# MONITORUSER="{{MONITORUSER}}" +# MONITORPASS="{{MONITORPASS}}" # Server ID to monitor. When viewing the server on your web console, your URL # will be something like https://monitor.com/?&mod=server&action=view&id=3 - in # this case SERVERID would be "3" (notice the &id=3 at the end of the URL) -# SERVERID="###" +# SERVERID="{{SERVERID}}" diff --git a/lib/env-check.sh b/lib/env-check.sh index e5aee28..784ec19 100755 --- a/lib/env-check.sh +++ b/lib/env-check.sh @@ -7,61 +7,162 @@ ############################################################################### # Initialize variables -read -r update_global update_user update_project env_settings project_config sed_hack <<< "" -echo "${update_global} ${update_user} ${update_project} ${project_config} ${sed_hack}" > /dev/null +read -r update_global update_user update_project env_settings project_config \ + sed_hack short_version global_project_version local_version \ + tmp_workpath <<< "" +echo "${update_global} ${update_user} ${update_project} ${project_config} + ${sed_hack} ${short_version} ${global_project_version} + ${local_version} ${tmp_workpath}" > /dev/null function env_check() { # Only check when someone is at the console if [[ "${FORCE}" != "1" ]]; then - + # Save the workpath to reload after this process; this is to allow a + # deployment using to --current switch to continue properly after a global + # configuration file update + tmp_workpath="${WORKPATH}" + + # Trim alpha/beta part of version number + local_version="${VERSION//-*}" + # Compare version numbers - if version_compare "${VERSION}" "${PROJECT_VERSION}"; then - update_project="1" - fi + local_version="${GLOBAL_VERSION}"; source "${deployPath}"/deploy-example.conf + [[ "${GLOBAL_VERSION}" != "${local_version}" ]] && update_global="1"; + + local_version="${USER_VERSION}"; source "${deployPath}"/.deployrc + [[ "${USER_VERSION}" != "${local_version}" ]] && update_user="1"; + + local_version="${PROJECT_VERSION}"; source "${deployPath}"/deploy.sh + [[ "${PROJECT_VERSION}" != "${local_version}" ]] && update_project="1" - if version_compare "${VERSION}" "${USER_VERSION}"; then - update_user="1" + if [[ "${update_global}" == "1" ]] || [[ "${update_user}" == "1" ]] || [[ "${update_project}" == "1" ]]; then + update_config fi - if version_compare "${VERSION}" "${GLOBAL_VERSION}"; then - update_global="1" - fi + # Reload environment variables, from global > user > project + source "${deployPath}"/deploy.conf + source ~/.deployrc + source "${project_config}" - # User feedback - info "\r\nNew version (${VERSION}) requires configuration updates." + # Restore workpath value + WORKPATH="${tmp_workpath}" - # Update? - if yesno --default yes "Update now? [Y/n] "; then - [[ "${update_project}" == "1" ]] && update_project - else - info "Skipping update." + # Trying to continue if global configuration has been changed is buggy + # if using --current switch + if [[ "${update_global}" == "1" ]]; then + console "Global configuration changed - restart your deployment." + quietExit fi fi } -function update_project() { - info "Updating ${project_config}..." - env_settings=(PROJNAME PROJCLIENT DEVURL PRODURL) - cp "${deployPath}"/deploy.sh "${trshFile}" +function update_config() { + info "\r\nNew version (${VERSION}) requires configuration updates." + if yesno --default yes "Update now? [Y/n] "; then + [[ "${update_global}" == "1" ]] && update_global + [[ "${update_user}" == "1" ]] && update_user + [[ "${update_project}" == "1" ]] && update_project + info "Updates complete."; empty_line + else + info "Skipping update." + fi +} +function update_global() { + info "Updating ${deployPath}/deploy.conf..." + env_settings=(CLEARSCREEN WORKPATH CONFIGDIR SERVERCHECK ACTIVECHECK \ + CHECKTIME REPOHOST SMARTCOMMIT GITSTATS STASH GARBAGE WPCLI WFCHECK \ + FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP FIXINDEX \ + MAILPATH TO FROM SUBJECT EMAILERROR EMAILSUCCESS EMAILQUIT SHORTEMAIL \ + EMAILHTML HTMLTEMPLATE FROMDOMAIN FROMUSER POSTEMAILHEAD POSTEMAILTAIL \ + POSTTOSLACK SLACKURL SLACKERROR POSTURL NOPHP INCOGNITO REMOTELOG \ + REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS \ + LOCALHOSTPOST LOCALHOSTPATH EXPIRELOGS) + + if [[ ! -w "${deployPath}" ]]; then + info "Requesting sudo access..." + sudo cp "${deployPath}"/deploy.conf "${deployPath}"/deploy.conf.bak + else + cp "${deployPath}"/deploy.conf "${deployPath}"/deploy.conf.bak + fi + info "Global configuration backup created at ${deployPath}/deploy.conf.bak" + + cp "${deployPath}"/deploy-example.conf "${trshFile}" + + # Reload global values + source "${deployPath}"/deploy.conf + # Loops through the variables for i in "${env_settings[@]}" ; do - console "${i}" - current_setting=$(grep "${i}" "${project_config}") + current_setting=$(grep "^${i}=" "${deployPath}"/deploy.conf.bak) + insert_values + done - # Don't bother parsing if we know it's not needed + # Install new files + env_cleanup + if [[ ! -w "${deployPath}" ]]; then + sudo cp "${trshFile}" "${deployPath}"/deploy.conf + else + cp "${trshFile}" "${deployPath}"/deploy.conf + fi +} - # Add a check to make sure the value in the project config is not commented out, if it is - # we should leave that setting controlled by global/user file +function update_user() { + info "Updating ~/.deployrc..." + env_settings=(CLEARSCREEN VERBOSE GITSTATS) + + info "User configuration backup created at ~/.deployrc.bak" + cp ~/.deployrc ~/.deployrc.bak + cp "${deployPath}"/.deployrc "${trshFile}" - if [[ -n "${current_setting}" ]] && [[ -n "${i}" ]]; then - console "current_setting = ${current_setting}" - sed_hack=$(echo "sed -i -e '/${i}=.*/c ${current_setting}' ${trshFile}") - console "${sed_hack}" - eval "${sed_hack}" - fi + # Reload user values + source ~/.deployrc + + # Loops through the variables + for i in "${env_settings[@]}" ; do + current_setting=$(grep "^${i}=" ~/.deployrc) + insert_values + done + + # Install new files + env_cleanup + cp "${trshFile}" ~/.deployrc +} + +function update_project() { + info "Updating ${project_config}..." + env_settings=(PROJNAME PROJCLIENT DEVURL PRODURL REPOHOST REPO MASTER \ + PRODUCTION AUTOMERGE STASH CHECKBRANCH NOKEY DISABLESSHCHECK COMMITMSG \ + WPROOT WPAPP WPSYSTEM DONOTUPDATEWP ACFKEY DEPLOY REQUIREAPPROVAL \ + DONOTDEPLOY TASK TASKUSER ADDTIME POSTTOSLACK SLACKURL SLACKERROR \ + DIGESTSLACK POSTURL TO HTMLTEMPLATE CLIENTLOGO COVER INCOGNITO REMOTELOG \ + REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS \ + LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL CLIENTCONTACT INCLUDEHOSTING \ + CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ + REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS SERVERID) + + info "Project configuration backup created at ${project_config}.bak" + cp "${project_config}" "${project_config}.bak" + cp "${deployPath}"/deploy.sh "${trshFile}" + # Loops through the variables + for i in "${env_settings[@]}" ; do + current_setting=$(grep "^${i}=" "${project_config}") + insert_values done - # templorary for testing - cp "${trshFile}" ~/result.txt + # Install new files + env_cleanup + cp "${trshFile}" "${project_config}" +} + +function insert_values() { + if [[ -n "${!i}" ]]; then + sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${trshFile}; sed -i 's^# ${i}^${i}^g' ${trshFile}") + # Kludgy but works. Ugh. + eval "${sed_hack}" + fi +} + +function env_cleanup() { + sed -i "s^{{.*}}^^g" "${trshFile}" } diff --git a/lib/main.sh b/lib/main.sh index 31722d4..9c40e93 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -9,7 +9,7 @@ function main() { dependency_check # Check that required commands are available release_check # Check for newer version at Github - # env_check # Check for configuration files that need updating + env_check # Check for configuration files that need updating gitStart # Check for a valid git project and get set up lock # Create lock file go # Start a deployment work session diff --git a/lib/release-check.sh b/lib/release-check.sh index d466217..dbba475 100755 --- a/lib/release-check.sh +++ b/lib/release-check.sh @@ -46,6 +46,6 @@ function release_check() { fi } -function version_compare() { +function version_compare() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } From 1e4b1075e8e524a91f3562165a69cd44c2240121 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 6 Mar 2018 10:53:52 -0800 Subject: [PATCH 042/334] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd7b871..1f15c88 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## ## [3.6.6] - 03-05-2018 +## [3.6.6] - 03-05-2018 ### Added - Configuration files now upgrade in place if needed when new versions of `deploy` are released - Statistic reports now display server uptime, latency, and a few handy Google analytics stats From 196e0bc6ca9058d95c64c2d4dd5e2acf1f7b76ff Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 6 Mar 2018 10:54:45 -0800 Subject: [PATCH 043/334] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f15c88..d6664e1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Item descriptions are now editable in reports - Cleaned up email output generated using `deploy --email-test` -- Report URLs are now writted as `report/YEAR-MONTH.php` instead of using a hard to remember string +- Report URLs are now formatted `report/YEAR-MONTH.php` instead of using a hard to remember string ### Fixed - Fixed a bug with running a report on dates in the previous calendar year - Added a workaround for Google potentially displaying over 100% of user sessions as new From 4798a17988075cb3a99706b5f44b5ce7b84cbabe Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 6 Mar 2018 13:50:00 -0800 Subject: [PATCH 044/334] Basic invoice creation, close #129 --- CHANGELOG.md | 6 +++++- deploy.sh | 10 ++++++---- etc/deploy.sh | 26 ++++++++++++++++++++++++++ lib/env-check.sh | 3 ++- lib/invoice.sh | 38 ++++++++++++++++++++------------------ lib/main.sh | 2 ++ lib/slack.sh | 11 +++++++++++ 7 files changed, 72 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6664e1..2abb817 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [3.6.6] - 03-05-2018 +## [Unreleased] +### Added +- Invoice creation is now available via [InvoiceNinja](https://www.invoiceninja.org/)'s API using `deploy --invoice` + +## [3.6.7] - 03-05-2018 ### Added - Configuration files now upgrade in place if needed when new versions of `deploy` are released - Statistic reports now display server uptime, latency, and a few handy Google analytics stats diff --git a/deploy.sh b/deploy.sh index d28179e..2628a87 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.6.7" +VERSION="3.7-alpha.1" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -28,12 +28,12 @@ set -uo pipefail read -r APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \ SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \ DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST PROJSTATS UNLOCK \ - SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR <<< "" + SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE <<< "" echo "${APP} ${UPGRADE} ${SKIPUPDATE} ${CURRENT} ${VERBOSE} ${QUIET} ${STRICT} ${DEBUG} ${FORCE} ${SLACKTEST} ${FUNCTIONLIST} ${VARIABLELIST} ${AUTOMATE} ${EMAILTEST} ${APPROVE} ${DENY} ${PUBLISH} ${DIGEST} - ${ANALYTICS} ${ANALYTICSTEST} ${PROJSTATS} ${UNLOCK} - ${SSHTEST} ${TIME} ${UPDATEONLY} ${POSTTEST} ${REPORT} ${REPAIR}" > /dev/null + ${ANALYTICS} ${ANALYTICSTEST} ${PROJSTATS} ${UNLOCK} ${SSHTEST} ${TIME} + ${UPDATEONLY} ${POSTTEST} ${REPORT} ${REPAIR} ${CREATE_INVOICE}" > /dev/null # Temp files read -r logFile wpFile coreFile postFile trshFile statFile urlFile <<< "" @@ -131,6 +131,7 @@ Other Options: --report Create a monthly activity report --no-check Override active file and server checks --stats Generate project statistics pages + --invoice Create an invoice --strict Any error will halt deployment completely --debug Run in debug mode --unlock Delete expired lock files @@ -204,6 +205,7 @@ while [[ ${1:-unset} = -?* ]]; do --analytics-test) ANALYTICSTEST="1" ;; --monitor-test) MONITORTEST="1" ;; --stats) PROJSTATS="1" ;; + --invoice) CREATE_INVOICE="1" ;; --unlock) UNLOCK="1" ;; --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;; --no-check) NOCHECK="1" ;; diff --git a/etc/deploy.sh b/etc/deploy.sh index ad1bbeb..ba91d0f 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -243,6 +243,32 @@ PROJECT_VERSION="3.6.7" # INCLUDEHOSTING="{{INCLUDEHOSTING}}" +############################################################################### +# Invoice Ninja integration +############################################################################### + +# Full url of your Invoice Ninja host, with no trailing slash +# IN_HOST="{{IN_HOST}}" + +# API Token, created at https://yourinvoicehost.com/settings/api_tokens +# IN_TOKEN="{{IN_TOKEN}}" + +# Client ID number +# IN_CLIENT_ID="{{IN_CLIENT_ID}}" + +# Default product code +# IN_PRODUCT="{{IN_PRODUCT}}" + +# Default item cost +# IN_ITEM_COST="{{IN_ITEM_COST}}" + +# Default item quantity +# IN_ITEM_QTY="{{IN_ITEM_QTY}}" + +# Default item notes +# IN_NOTES="{{IN_NOTES}}" + + ############################################################################### # Google Analytics ############################################################################### diff --git a/lib/env-check.sh b/lib/env-check.sh index 784ec19..0897573 100755 --- a/lib/env-check.sh +++ b/lib/env-check.sh @@ -138,7 +138,8 @@ function update_project() { DIGESTSLACK POSTURL TO HTMLTEMPLATE CLIENTLOGO COVER INCOGNITO REMOTELOG \ REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS \ LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL CLIENTCONTACT INCLUDEHOSTING \ - CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ + IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \ + IN_NOTES CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS SERVERID) info "Project configuration backup created at ${project_config}.bak" diff --git a/lib/invoice.sh b/lib/invoice.sh index 5d17c0f..7fbb9d0 100755 --- a/lib/invoice.sh +++ b/lib/invoice.sh @@ -6,28 +6,30 @@ # Handles creating invoices and integration with InvoiceNinja ############################################################################### +# Initialize variables +read -r IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \ + IN_NOTES invoice_hack <<< "" +echo "${IN_HOST} ${IN_TOKEN} ${IN_CLIENT_ID} ${IN_PRODUCT} ${IN_ITEM_COST} + ${IN_ITEM_QTY} ${IN_NOTES} ${invoice_hack}" > /dev/null + function create_invoice() { # Will create the invoice payload + trace "Creating invoice..." + invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\", \"cost\":${IN_ITEM_COST}, \"qty\":1}]}' -H \"X-Ninja-Token: ${IN_TOKEN}\"") + eval "${invoice_hack}" &>> "${logFile}"; error_check + safeExit +} + +function get_current_invoice() { trace "This is an empty function" } function send_invoice() { - # Hit the InvoiceNinja API and create the invoice - # - # Things that need to be defined: - # API URL - # client_id - # - # And then we'll loop through - # product - # notes - # cost - # qty - # - # Example to create an invoice: - # - # curl -X POST https://invoice.com/api/v1/invoices -H "Content-Type:application/json" \ - # -d '{"client_id":"1", "invoice_items":[{"product_key": "ITEM", "notes":"Test", "cost":10, "qty":1}]}' \ - # -H "X-Ninja-Token: ###################################" + # curl -X POST ninja.test/api/v1/email_invoice -d '{"id":1}' -H "Content-Type:application/json" -H "X-Ninja-Token: TOKEN" trace "This is an empty function" -} \ No newline at end of file +} + +function download_invoice() { + # curl -X GET ninja.test/api/v1/download/1 -H "X-Ninja-Token: TOKEN" + trace "This is an empty function" +} diff --git a/lib/main.sh b/lib/main.sh index 9c40e93..59770e7 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -18,6 +18,8 @@ function main() { create_digest elif [[ "${REPORT}" == "1" ]]; then create_report + elif [[ "${CREATE_INVOICE}" == "1" ]]; then + create_invoice else server_check # Check that servers are up and running if [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then diff --git a/lib/slack.sh b/lib/slack.sh index 05a1015..069f69d 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -74,6 +74,17 @@ function slackPost () { slack_message="*${SLACKUSER}* nothing to do for ${APP}\nNOTICE: ${notes}" fi + # Create a payload for invoices + if [[ "${CREATE_INVOICE}" == "1" ]]; then + message_state="NOTICE" + # Does a production URL exit? + if [[ -n "${PRODURL}" ]]; then + slack_message="${IN_NOTES} invoice created for <${PRODURL}|${PROJNAME}>" + else + slack_message="${IN_NOTES} invoice created *${PROJNAME}*" + fi + fi + # Add a details link to online logfiles if they exist if [[ -n "${REMOTEURL}" ]] && [[ -n "${REMOTELOG}" ]]; then slack_message="${slack_message} (<${LOGURL}|Details>)" From 3404a4cafce6c796cebd5c5318b8c001c39104d1 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 6 Mar 2018 13:52:56 -0800 Subject: [PATCH 045/334] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abb817..e6e29fd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -199,10 +199,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). [Unreleased]: https://github.com/EMRL/deploy/compare/v3.6.7...HEAD -[3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...3.6.8 -[3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...3.6.7 -[3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...3.6.6 -[3.6.5]: https://github.com/EMRL/deploy/compare/v3.6.4...3.6.5 +[3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.6.8 +[3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...v3.6.7 +[3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...v3.6.6 +[3.6.5]: https://github.com/EMRL/deploy/compare/v3.6.4...v3.6.5 [3.6.4]: https://github.com/EMRL/deploy/compare/v3.6...v3.6.4 [3.6]: https://github.com/EMRL/deploy/compare/v3.5.7...v3.6 [3.5.7]: https://github.com/EMRL/deploy/compare/v3.5.5...v3.5.7 From 397850cd74e0c84a908f6fb94e4faeafd6e31a57 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 8 Mar 2018 17:44:04 -0800 Subject: [PATCH 046/334] Resolve #130 --- CHANGELOG.md | 2 ++ README.md | 1 + lib/git.sh | 4 ++++ lib/invoice.sh | 30 +++++++++++++++++++++++------- lib/main.sh | 1 + lib/slack.sh | 4 ++-- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abb817..7ad8390 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Invoice creation is now available via [InvoiceNinja](https://www.invoiceninja.org/)'s API using `deploy --invoice` +### Changed +- Running with the `--automate` switch now requires the branch defined as "master" must be currently checked out. The behavior is the equivalent of setting `CHECKBRANCH="${MASTER}"` ## [3.6.7] - 03-05-2018 ### Added diff --git a/README.md b/README.md index ba0a606..bf0a003 100755 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ Other Options: --report Create a monthly activity report --no-check Override active file and server checks --stats Generate project statistics pages + --invoice Create an invoice --strict Any error will halt deployment completely --debug Run in debug mode --unlock Delete expired lock files diff --git a/lib/git.sh b/lib/git.sh index e59a4e1..46179bc 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -33,6 +33,10 @@ function gitStart() { if grep -q "fatal" "${trshFile}"; then error "Unable to start deployment, push your first commit manually and try again." else + # If running --automate, force a branch check + if [[ "${AUTOMATE}" ]]; then + CHECKBRANCH="${MASTER}" + fi # If CHECKBRANCH is set, make sure current branch is correct. start_branch="$(git rev-parse --abbrev-ref HEAD)" if [[ -n "${CHECKBRANCH}" ]] && [[ "${DIGEST}" != "1" ]] && [[ "${PROJSTATS}" != "1" ]] && [[ "${EMAILTEST}" != "1" ]] && [[ "${SLACKTEST}" != "1" ]]; then diff --git a/lib/invoice.sh b/lib/invoice.sh index 7fbb9d0..2ca1024 100755 --- a/lib/invoice.sh +++ b/lib/invoice.sh @@ -8,28 +8,44 @@ # Initialize variables read -r IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \ - IN_NOTES invoice_hack <<< "" + IN_NOTES IN_EMAIL invoice_hack current_invoice <<< "" echo "${IN_HOST} ${IN_TOKEN} ${IN_CLIENT_ID} ${IN_PRODUCT} ${IN_ITEM_COST} - ${IN_ITEM_QTY} ${IN_NOTES} ${invoice_hack}" > /dev/null + ${IN_ITEM_QTY} ${IN_NOTES} ${IN_EMAIL} ${invoice_hack} ${current_invoice}" > /dev/null function create_invoice() { # Will create the invoice payload trace "Creating invoice..." invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\", \"cost\":${IN_ITEM_COST}, \"qty\":1}]}' -H \"X-Ninja-Token: ${IN_TOKEN}\"") eval "${invoice_hack}" &>> "${logFile}"; error_check + + get_current_invoice + + if [[ "${IN_EMAIL}" == "TRUE" ]]; then + send_invoice + fi + + notes="${IN_NOTES} invoice (#${current_invoice}) created" safeExit } function get_current_invoice() { trace "This is an empty function" + curl -X GET "${IN_HOST}/api/v1/clients/${IN_CLIENT_ID}?include=invoices" -H "X-Ninja-Token: ${IN_TOKEN}" > "${trshFile}" + + # Many sedtastic things + sed -i '/"invoice_number"/!d' "${trshFile}" + sed -i 's/ //g' "${trshFile}" + sed -i 's/[^0-9]*//g' "${trshFile}" + + # Store current invoice number + current_invoice=$(tail -1 ${trshFile}) + trace "Invoice: ${current_invoice}" } function send_invoice() { # curl -X POST ninja.test/api/v1/email_invoice -d '{"id":1}' -H "Content-Type:application/json" -H "X-Ninja-Token: TOKEN" trace "This is an empty function" -} - -function download_invoice() { - # curl -X GET ninja.test/api/v1/download/1 -H "X-Ninja-Token: TOKEN" - trace "This is an empty function" + invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/email_invoice\" -d '{\"id\":\"${current_invoice}\"}' -H "Content-Type:application/json" -H \"X-Ninja-Token: ${IN_TOKEN}\"") + trace "Trying ${invoice_hack}" + eval "${invoice_hack}" &>> "${logFile}"; error_check } diff --git a/lib/main.sh b/lib/main.sh index 59770e7..3e9025a 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -19,6 +19,7 @@ function main() { elif [[ "${REPORT}" == "1" ]]; then create_report elif [[ "${CREATE_INVOICE}" == "1" ]]; then + # create_invoice create_invoice else server_check # Check that servers are up and running diff --git a/lib/slack.sh b/lib/slack.sh index 069f69d..94e1e5b 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -79,9 +79,9 @@ function slackPost () { message_state="NOTICE" # Does a production URL exit? if [[ -n "${PRODURL}" ]]; then - slack_message="${IN_NOTES} invoice created for <${PRODURL}|${PROJNAME}>" + slack_message="${IN_NOTES} invoice (#${current_invoice}) created for <${PRODURL}|${PROJNAME}>" else - slack_message="${IN_NOTES} invoice created *${PROJNAME}*" + slack_message="${IN_NOTES} invoice (#${current_invoice}) created *${PROJNAME}*" fi fi From 30f1d81fd90df67a7bf2e358aad2a72e013e8853 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 19 Mar 2018 17:50:34 -0700 Subject: [PATCH 047/334] Malware scanning via Nikto --- CHANGELOG.md | 1 + deploy.sh | 15 ++++++++------ etc/deploy-example.conf | 11 +++++++++- etc/deploy.sh | 12 ++++++++++- lib/env-check.sh | 5 +++-- lib/main.sh | 2 ++ lib/scan.sh | 45 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 81 insertions(+), 10 deletions(-) create mode 100755 lib/scan.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index d5927f8..51c0ea5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Invoice creation is now available via [InvoiceNinja](https://www.invoiceninja.org/)'s API using `deploy --invoice` +- Added malware scanning using (Nikto](https://www.cirt.net/Nikto2) ### Changed - Running with the `--automate` switch now requires the branch defined as "master" must be currently checked out. The behavior is the equivalent of setting `CHECKBRANCH="${MASTER}"` diff --git a/deploy.sh b/deploy.sh index 2628a87..89a0fcd 100755 --- a/deploy.sh +++ b/deploy.sh @@ -28,12 +28,13 @@ set -uo pipefail read -r APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \ SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \ DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST PROJSTATS UNLOCK \ - SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE <<< "" + SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN <<< "" echo "${APP} ${UPGRADE} ${SKIPUPDATE} ${CURRENT} ${VERBOSE} ${QUIET} ${STRICT} ${DEBUG} ${FORCE} ${SLACKTEST} ${FUNCTIONLIST} ${VARIABLELIST} ${AUTOMATE} ${EMAILTEST} ${APPROVE} ${DENY} ${PUBLISH} ${DIGEST} ${ANALYTICS} ${ANALYTICSTEST} ${PROJSTATS} ${UNLOCK} ${SSHTEST} ${TIME} - ${UPDATEONLY} ${POSTTEST} ${REPORT} ${REPAIR} ${CREATE_INVOICE}" > /dev/null + ${UPDATEONLY} ${POSTTEST} ${REPORT} ${REPAIR} ${CREATE_INVOICE} + ${SCAN}" > /dev/null # Temp files read -r logFile wpFile coreFile postFile trshFile statFile urlFile <<< "" @@ -58,7 +59,7 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO \ REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION USER_VERSION \ - PROJECT_VERSION <<< "" + PROJECT_VERSION NIKTO NIKTO_CONFIG <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} @@ -72,9 +73,9 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} - ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} - ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} - ${INCLUDEHOSTING} ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION}" > /dev/null + ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} + ${CLIENTCONTACT} ${INCLUDEHOSTING} ${GLOBAL_VERSION} ${USER_VERSION} + ${PROJECT_VERSION} ${NIKTO} ${NIKTO_CONFIG}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \ @@ -136,6 +137,7 @@ Other Options: --debug Run in debug mode --unlock Delete expired lock files --repair Repair a deployment after key failure + --scan Scan production hosts for malware issues --ssh-test Validate SSH key setup --email-test Test email configuration --slack-test Test Slack integration @@ -208,6 +210,7 @@ while [[ ${1:-unset} = -?* ]]; do --invoice) CREATE_INVOICE="1" ;; --unlock) UNLOCK="1" ;; --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;; + --scan) SCAN="1" ;; --no-check) NOCHECK="1" ;; --function-list) FUNCTIONLIST="1"; CURRENT="1" ;; # Spoofs --current --variable-list) VARIABLELIST="1"; CURRENT="1" ;; # Spoofs --current diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf index 9e1d8b5..b7b49c9 100755 --- a/etc/deploy-example.conf +++ b/etc/deploy-example.conf @@ -7,7 +7,7 @@ # This value indicates the version number when this file was last changed: # it does not necessarily reflect deploy's current version number. # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP -GLOBAL_VERSION="3.6.7" +GLOBAL_VERSION="3.7" ############################################################################### # General Setup @@ -233,3 +233,12 @@ GLOBAL_VERSION="3.6.7" # Set the number of days before logs should be deleted. Currently this only # works for logs stored on localhost. # EXPIRELOGS="{{EXPIRELOGS}}" + +############################################################################### +# Nikto +############################################################################### + +# If you want to make use of nikto for malware/security host scanning, define +# its full path (including command) as well as its configuration file below +# NIKTO="{{NIKTO}}" +# NIKTO_CONFIG="{{NIKTO_CONFIG}}" diff --git a/etc/deploy.sh b/etc/deploy.sh index ba91d0f..ac72a4b 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -9,7 +9,7 @@ # This value indicates the version number when this file was last changed: # it does not necessarily reflect deploy's current version number. # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP -PROJECT_VERSION="3.6.7" +PROJECT_VERSION="3.7" ############################################################################### @@ -310,3 +310,13 @@ PROJECT_VERSION="3.6.7" # will be something like https://monitor.com/?&mod=server&action=view&id=3 - in # this case SERVERID would be "3" (notice the &id=3 at the end of the URL) # SERVERID="{{SERVERID}}" + + +############################################################################### +# Nikto +############################################################################### + +# If you want to make use of nikto for malware/security host scanning, define +# its full path (including command) as well as its configuration file below +# NIKTO="{{NIKTO}}" +# NIKTO_CONFIG="{{NIKTO_CONFIG}}" diff --git a/lib/env-check.sh b/lib/env-check.sh index 0897573..9aec05f 100755 --- a/lib/env-check.sh +++ b/lib/env-check.sh @@ -77,7 +77,7 @@ function update_global() { EMAILHTML HTMLTEMPLATE FROMDOMAIN FROMUSER POSTEMAILHEAD POSTEMAILTAIL \ POSTTOSLACK SLACKURL SLACKERROR POSTURL NOPHP INCOGNITO REMOTELOG \ REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS \ - LOCALHOSTPOST LOCALHOSTPATH EXPIRELOGS) + LOCALHOSTPOST LOCALHOSTPATH EXPIRELOGS NIKTO NIKTO_CONFIG) if [[ ! -w "${deployPath}" ]]; then info "Requesting sudo access..." @@ -140,7 +140,8 @@ function update_project() { LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL CLIENTCONTACT INCLUDEHOSTING \ IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \ IN_NOTES CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ - REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS SERVERID) + REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS SERVERID NIKTO \ + NIKTO_CONFIG) info "Project configuration backup created at ${project_config}.bak" cp "${project_config}" "${project_config}.bak" diff --git a/lib/main.sh b/lib/main.sh index 3e9025a..f9bf9b0 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -21,6 +21,8 @@ function main() { elif [[ "${CREATE_INVOICE}" == "1" ]]; then # create_invoice create_invoice + elif [[ "${SCAN}" == "1" ]]; then + scan_host else server_check # Check that servers are up and running if [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then diff --git a/lib/scan.sh b/lib/scan.sh new file mode 100755 index 0000000..7b15fd0 --- /dev/null +++ b/lib/scan.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash +# +# nikto.sh +# +############################################################################### +# Integrates with nikto to run malware and security scans +############################################################################### + +# Initialize variables +read -r NIKTO_CONFIG <<< "" +echo "${NIKTO_CONFIG}" > /dev/null + +function scan_host() { + if [[ -z "${NIKTO}" ]]; then + return + fi + + # Check for nikto + hash "${NIKTO}" 2>/dev/null || { + error "Can't find scanning command (${NITKO})" + } + + # Get headers + # trace "Header" + # curl -X HEAD -i "${PRODURL}" &>> "${logFile}" + + # Run the scan + trace "Scanning ${PRODURL}..." + "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VP14 -Tuning x12b -host "${PRODURL}" >> "${logFile}" & + spinner $! + message_state="NOTICE" + LOGTITLE="Malware Scan" + notes="Malware scan on ${PRODURL}" + + # Clean up the log + sed -i 's/^.*Running/Running/' "${logFile}" + sed -i 's/^.*Loaded/Loaded/' "${logFile}" + sed -i '/^V\:/d' "${logFile}" + sed -i '/^Running average\: Not enough data/d' "${logFile}" + sed -i "s/: currently in plugin 'Nikto Tests'//" "${logFile}" + + # Strip redirects, can get very spammy on a Wordpress project + sed -i '/Redirects (301) to/d' "${logFile}" + safeExit +} From 496749573a25c3e3614d398778eb9569a6307259 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 19 Mar 2018 19:00:34 -0700 Subject: [PATCH 048/334] Added simple file deployment method using scp --- CHANGELOG.md | 1 + etc/deploy.sh | 23 ++++++++++++++++++++++- lib/deployment.sh | 40 ++++++++++++++++++++++++++++++---------- lib/env-check.sh | 7 ++++--- lib/scp.sh | 25 +++++++++++++++++++++++++ lib/server-check.sh | 2 +- lib/utilities.sh | 2 +- 7 files changed, 84 insertions(+), 16 deletions(-) create mode 100755 lib/scp.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 51c0ea5..4f6cebe 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Invoice creation is now available via [InvoiceNinja](https://www.invoiceninja.org/)'s API using `deploy --invoice` +- Added a very simple built-in web deployment method for instances when using something like `mina` is unavailble - Added malware scanning using (Nikto](https://www.cirt.net/Nikto2) ### Changed - Running with the `--automate` switch now requires the branch defined as "master" must be currently checked out. The behavior is the equivalent of setting `CHECKBRANCH="${MASTER}"` diff --git a/etc/deploy.sh b/etc/deploy.sh index ac72a4b..687c4d9 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -104,7 +104,8 @@ PROJECT_VERSION="3.7" # Deployment Configuration ############################################################################### -# The command to finalize deployment of your project(s) +# The command to finalize deployment of your project(s); set DEPLOY="SCP" to +# use the built-in scp deployment method. # DEPLOY="{{DEPLOY}}" # To require approval before pushing this project's code to a live production @@ -114,6 +115,26 @@ PROJECT_VERSION="3.7" # Disallow deployment; set to TRUE to enable. Double negative, it's tricky. # DONOTDEPLOY="{{DONOTDEPLOY}}" +# SCP Deployment +# -------------- + +# Staging file path to copy to production host, relative to the project's root +# directory (forward slash required) +# STAGING_DEPLOY_PATH="{{STAGING_DEPLOY_PATH}}" + +# Production host info +# PRODUCTION_DEPLOY_HOST="{{PRODUCTION_DEPLOY_HOST}}" + +# Full path path to copy files to on production server +# PRODUCTION_DEPLOY_PATH="{{PRODUCTION_DEPLOY_PATH}}" + +# Deployement user info +# SCP_DEPLOY_USER="{{SCP_DEPLOY_USER}}" + +# DANGER DANGER: If for some reason you absolutely can't use an SSH key you +# can configure the path to a text file containing *only* your password. +# SCP_DEPLOY_PASS="{{SCP_DEPLOY_PASS}}" + ############################################################################### # Notifications diff --git a/lib/deployment.sh b/lib/deployment.sh index 8c2805f..3b5754f 100755 --- a/lib/deployment.sh +++ b/lib/deployment.sh @@ -63,27 +63,47 @@ function pkgDeploy() { fi fix_index - # Make sure the project's deploy command is going to work - deploy_cmd=$(echo "${DEPLOY}" | awk '{print $1;}') - hash "${deploy_cmd}" 2>/dev/null || { - warning "Your deployment command ${deploy_cmd} cannot be found."; - } + if [[ "${DEPLOY}" != "SCP" ]]; then + # Make sure the project's deploy command is going to work + deploy_cmd=$(echo "${DEPLOY}" | awk '{print $1;}') + hash "${deploy_cmd}" 2>/dev/null || { + warning "Your deployment command ${deploy_cmd} cannot be found."; + } + fi if [[ "${REQUIREAPPROVAL}" != "TRUE" ]]; then + # If we don't require approval to push to live, keep going if [[ "${FORCE}" = "1" ]] || yesno --default yes "Deploy to live server? [Y/n] "; then + # Test deployment command before running - deploy_check + if [[ "${DEPLOY}" != "SCP" ]]; then + deploy_check + fi + # Deploy via deployment command specified in configuration if [[ "${VERBOSE}" == "TRUE" ]] && [[ "${INCOGNITO}" != "TRUE" ]]; then - eval "${DEPLOY}" | tee --append "${logFile}" + if [[ "${DEPLOY}" == "SCP" ]]; then + deploy_scp + else + eval "${DEPLOY}" | tee --append "${logFile}" + fi error_check else if [[ "${QUIET}" != "1" ]]; then - eval "${DEPLOY}" &>> "${logFile}" & - spinner $! + if [[ "${DEPLOY}" == "SCP" ]]; then + deploy_scp & + spinner $! + else + eval "${DEPLOY}" &>> "${logFile}" & + spinner $! + fi else - eval "${DEPLOY}" &>> "${logFile}" + if [[ "${DEPLOY}" == "SCP" ]]; then + deploy_scp &>> "${logFile}" + else + eval "${DEPLOY}" &>> "${logFile}" + fi error_check fi fi diff --git a/lib/env-check.sh b/lib/env-check.sh index 9aec05f..65a695f 100755 --- a/lib/env-check.sh +++ b/lib/env-check.sh @@ -3,7 +3,7 @@ # config-check.sh # ############################################################################### -# Check to see if configuration files needs to be updated, and update if so +# Check to see if configuration files need to be updated, and update if so ############################################################################### # Initialize variables @@ -141,8 +141,9 @@ function update_project() { IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \ IN_NOTES CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS SERVERID NIKTO \ - NIKTO_CONFIG) - + NIKTO_CONFIG STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST \ + PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS) + info "Project configuration backup created at ${project_config}.bak" cp "${project_config}" "${project_config}.bak" cp "${deployPath}"/deploy.sh "${trshFile}" diff --git a/lib/scp.sh b/lib/scp.sh new file mode 100755 index 0000000..e3b449f --- /dev/null +++ b/lib/scp.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# +# scp.sh +# +############################################################################### +# Extremely simple deployment via scp +############################################################################### + +# Initialize variables +read -r STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH \ + SCP_DEPLOY_USER SCP_DEPLOY_PASS <<< "" +echo "${STAGING_DEPLOY_PATH} ${PRODUCTION_DEPLOY_HOST} ${PRODUCTION_DEPLOY_PATH} + ${ SCP_DEPLOY_USER} ${SCP_DEPLOY_PASS}" > /dev/null + +function deploy_scp() { + # This is ghetto + if [[ -n "${PRODUCTION_DEPLOY_PATH}" ]]; then + # Todo: Add proper checks/fallbacks here + TMP=$(<$SCP_DEPLOY_PASS) + SCP_DEPLOY_PASS="${TMP}" + sshpass -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/" &>> "${logFile}"; error_check; + else + echo "ERROR: Can not find production server path"; exit 1 + fi +} diff --git a/lib/server-check.sh b/lib/server-check.sh index 0a1d83a..ab9e09e 100755 --- a/lib/server-check.sh +++ b/lib/server-check.sh @@ -8,7 +8,7 @@ trace "Loading server checks" function server_check() { - if [ "${SERVERCHECK}" == "TRUE" ]; then + if [[ "${SERVERCHECK}" == "TRUE" ]]; then notice "Checking servers..." # Set SERVERFAIL to 0 SERVERFAIL="0" diff --git a/lib/utilities.sh b/lib/utilities.sh index d844217..a238c2c 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -178,7 +178,7 @@ function dependency_check() { # This is probably not the best way to do this but for now it works. It # strips everything after the first space that is declared in DEPLOY and # then checks that it's a valid command. - if [[ ! -z "${DEPLOY}" ]]; then + if [[ ! -z "${DEPLOY}" ]] && [[ "${DEPLOY}" != "SCP" ]]; then deploy_cmd=$(echo "$DEPLOY" | head -n1 | awk '{print $1;}') hash "${deploy_cmd}" 2>/dev/null || { error >&2 "Unknown deployment command: ${DEPLOY} (${deploy_cmd} not found)"; From 6d926f05822b59bf0ff38989251dc9bd3dcc008e Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Mon, 19 Mar 2018 19:13:27 -0700 Subject: [PATCH 049/334] Resolve #131 --- deploy.sh | 5 ----- lib/main.sh | 1 + lib/utilities.sh | 6 ++++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy.sh b/deploy.sh index 89a0fcd..f4abe17 100755 --- a/deploy.sh +++ b/deploy.sh @@ -481,11 +481,6 @@ if [[ "${AUTOMERGE}" == "TRUE" ]]; then trace "Automerge is enabled" fi -if [[ "${NOCHECK}" == "1" ]]; then - SERVERCHECK="FALSE"; - ACTIVECHECK="FALSE" -fi - # If using --automate, force branch checking if [[ "${AUTOMATE}" == "1" ]] || [[ "${REPAIR}" == "1" ]]; then CHECKBRANCH="${MASTER}"; diff --git a/lib/main.sh b/lib/main.sh index f9bf9b0..8bb0a9b 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -25,6 +25,7 @@ function main() { scan_host else server_check # Check that servers are up and running + if [[ "${DISABLESSHCHECK}" != "TRUE" ]]; then ssh_check # Check keys fi diff --git a/lib/utilities.sh b/lib/utilities.sh index a238c2c..15d10ae 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -84,6 +84,12 @@ function go() { warning "Can't continue deployment as root."; quickExit fi + # Disallow server check? + if [[ "${NOCHECK}" == "1" ]]; then + SERVERCHECK="FALSE"; + ACTIVECHECK="FALSE" + fi + # Force sudo password input if needed if [[ "${FIXPERMISSIONS}" == "TRUE" ]]; then sudo sleep 1 From b028432c00f7f85e5b5b9047a9d977b3b0cc27dd Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 23 Mar 2018 14:55:52 -0700 Subject: [PATCH 050/334] Resolve #132 --- CHANGELOG.md | 1 + deploy.sh | 8 ++++---- etc/deploy-example.conf | 3 ++- etc/deploy.sh | 4 ++++ lib/env-check.sh | 23 ++++++++++++----------- lib/log-handling.sh | 7 +++++++ lib/post-log.sh | 20 +++++++++++++++----- lib/scan.sh | 4 ++-- lib/scp.sh | 11 ++++++++--- 9 files changed, 55 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f6cebe..0e504ed 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added a very simple built-in web deployment method for instances when using something like `mina` is unavailble - Added malware scanning using (Nikto](https://www.cirt.net/Nikto2) ### Changed +- Ports other than 22 can be used for SSH/SCP functions - Running with the `--automate` switch now requires the branch defined as "master" must be currently checked out. The behavior is the equivalent of setting `CHECKBRANCH="${MASTER}"` ## [3.6.7] - 03-05-2018 diff --git a/deploy.sh b/deploy.sh index f4abe17..b2a7fc6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -56,10 +56,10 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ WFOFF REMOTELOG REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK \ DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD \ SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME \ - TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ + SCPPORT TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO \ REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION USER_VERSION \ - PROJECT_VERSION NIKTO NIKTO_CONFIG <<< "" + PROJECT_VERSION <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} @@ -72,10 +72,10 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER} ${SCPHOST} ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} - ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} + ${SCPPORT} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING} ${GLOBAL_VERSION} ${USER_VERSION} - ${PROJECT_VERSION} ${NIKTO} ${NIKTO_CONFIG}" > /dev/null + ${PROJECT_VERSION}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \ diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf index b7b49c9..eb6502f 100755 --- a/etc/deploy-example.conf +++ b/etc/deploy-example.conf @@ -219,7 +219,8 @@ GLOBAL_VERSION="3.7" # SCPUSER="{{SCPUSER}}" # SCPHOST="{{SCPHOST}}" # SCPHOSTPATH="{{SCPHOSTPATH}}" -# +# SCPPORT="{{SCPPORT}}" + # DANGER DANGER: If for some reason you absolutely can't use an SSH key you # can configure your password here # SCPPASS="{{SCPPASS}}" diff --git a/etc/deploy.sh b/etc/deploy.sh index 687c4d9..8d40184 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -135,6 +135,9 @@ PROJECT_VERSION="3.7" # can configure the path to a text file containing *only* your password. # SCP_DEPLOY_PASS="{{SCP_DEPLOY_PASS}}" +# Set your port number if using a port other than the standard 22 +# SCP_DEPLOY_PORT="{{SCP_DEPLOY_PORT}}" + ############################################################################### # Notifications @@ -229,6 +232,7 @@ PROJECT_VERSION="3.7" # SCPUSER="{{SCPUSER}}" # SCPHOST="{{SCPHOST}}" # SCPHOSTPATH="{{SCPHOSTPATH}}" +# SCPPORT="{{SCPPORT}}" # DANGER DANGER: If for some reason you absolutely can't use an SSH key you # can configure the path to a text file containing *only* your password. diff --git a/lib/env-check.sh b/lib/env-check.sh index 65a695f..635086b 100755 --- a/lib/env-check.sh +++ b/lib/env-check.sh @@ -57,7 +57,7 @@ function env_check() { } function update_config() { - info "\r\nNew version (${VERSION}) requires configuration updates." + empty_line; info "New version (${VERSION}) requires configuration updates." if yesno --default yes "Update now? [Y/n] "; then [[ "${update_global}" == "1" ]] && update_global [[ "${update_user}" == "1" ]] && update_user @@ -76,8 +76,8 @@ function update_global() { MAILPATH TO FROM SUBJECT EMAILERROR EMAILSUCCESS EMAILQUIT SHORTEMAIL \ EMAILHTML HTMLTEMPLATE FROMDOMAIN FROMUSER POSTEMAILHEAD POSTEMAILTAIL \ POSTTOSLACK SLACKURL SLACKERROR POSTURL NOPHP INCOGNITO REMOTELOG \ - REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS \ - LOCALHOSTPOST LOCALHOSTPATH EXPIRELOGS NIKTO NIKTO_CONFIG) + REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPORT \ + SCPPASS LOCALHOSTPOST LOCALHOSTPATH EXPIRELOGS NIKTO NIKTO_CONFIG) if [[ ! -w "${deployPath}" ]]; then info "Requesting sudo access..." @@ -136,13 +136,13 @@ function update_project() { WPROOT WPAPP WPSYSTEM DONOTUPDATEWP ACFKEY DEPLOY REQUIREAPPROVAL \ DONOTDEPLOY TASK TASKUSER ADDTIME POSTTOSLACK SLACKURL SLACKERROR \ DIGESTSLACK POSTURL TO HTMLTEMPLATE CLIENTLOGO COVER INCOGNITO REMOTELOG \ - REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS \ - LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL CLIENTCONTACT INCLUDEHOSTING \ - IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \ - IN_NOTES CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ - REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS SERVERID NIKTO \ - NIKTO_CONFIG STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST \ - PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS) + REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPORT\ + SCPPASS LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL CLIENTCONTACT \ + INCLUDEHOSTING IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST \ + IN_ITEM_QTY IN_NOTES CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE \ + ACCESSTOKEN REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS \ + SERVERID NIKTO NIKTO_CONFIG STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST \ + PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS SCP_DEPLOY_PORT) info "Project configuration backup created at ${project_config}.bak" cp "${project_config}" "${project_config}.bak" @@ -159,7 +159,8 @@ function update_project() { } function insert_values() { - if [[ -n "${!i}" ]]; then + if [[ -n "${!i:-}" ]]; then + [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}" sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${trshFile}; sed -i 's^# ${i}^${i}^g' ${trshFile}") # Kludgy but works. Ugh. eval "${sed_hack}" diff --git a/lib/log-handling.sh b/lib/log-handling.sh index 9439f78..53a0940 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -58,6 +58,13 @@ function makeLog() { # sed -i "/........../d" "${logFile}" fi + # Filter out noise from scp deployment method + if [[ "${DEPLOY}" == "SCP" ]]; then + sed -i "/Sending file modes:/d" "${logFile}" + sed -i "/Sink:/d" "${logFile}" + sed -i "/debug1:/d" "${logFile}" + fi + # Filter raw log output as configured by user if [[ "${NOPHP}" == "TRUE" ]]; then grep -vE "(PHP |Notice:|Warning:|Strict Standards:)" "${logFile}" > "${postFile}" diff --git a/lib/post-log.sh b/lib/post-log.sh index 958b15a..94b2080 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -7,6 +7,10 @@ ############################################################################### trace "Loading post functions" +# Initialize variables +read -r SCPPORT <<< "" +echo "${SCPPORT}" > /dev/null + # Remote log function; this really needs to be rewritten function postLog() { if [[ "${REMOTELOG}" == "TRUE" ]]; then @@ -56,18 +60,23 @@ function postLog() { fi fi - # Send the files through SCP (not yet enabled) + # Send the files through SSH/SCP if [[ "${SCPPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then + # if SCPPORT is empty, set it to 22 + #if [[ -z "${SCPPORT}" ]]; then + # SCPPORT="22" + #fi + # Setup up the proper command, depending on whether we're using key or password if [[ -n "${SCPPASS}" ]]; then TMP=$(<$SCPPASS) SCPPASS="${TMP}" - SCPCMD="sshpass -p \"${SCPPASS}\" scp -o StrictHostKeyChecking=no" - SSHCMD="sshpass -p \"${SCPPASS}\" ssh" + SCPCMD="sshpass -p \"${SCPPASS}\" scp -o StrictHostKeyChecking=no -P \"${SCPPORT}\"" + SSHCMD="sshpass -p \"${SCPPASS}\" ssh -p \"${SCPPORT}\"" else - SCPCMD="scp" - SSHCMD="ssh" + SCPCMD="scp -P \"${SCPPORT}\"" + SSHCMD="ssh -P \"${SCPPORT}\"" fi # Loop through the various scenarios, make directories if needed @@ -96,6 +105,7 @@ function postLog() { if [[ "${REPORT}" == "1" ]]; then REMOTEFILE="${CURYR}-${CURMTH}.php" REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" + trace "Running \"${SSHCMD}\" \"${SCPUSER}\"@\"${SCPHOST}\" \"mkdir -p ${SCPHOSTPATH}/${APP}/report\"" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css" eval "${SCPCMD} -r" "${deployPath}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" diff --git a/lib/scan.sh b/lib/scan.sh index 7b15fd0..39e76b5 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -7,8 +7,8 @@ ############################################################################### # Initialize variables -read -r NIKTO_CONFIG <<< "" -echo "${NIKTO_CONFIG}" > /dev/null +read -r NIKTO NIKTO_CONFIG <<< "" +echo "${NIKTO} ${NIKTO_CONFIG}" > /dev/null function scan_host() { if [[ -z "${NIKTO}" ]]; then diff --git a/lib/scp.sh b/lib/scp.sh index e3b449f..b703eb0 100755 --- a/lib/scp.sh +++ b/lib/scp.sh @@ -10,15 +10,20 @@ read -r STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH \ SCP_DEPLOY_USER SCP_DEPLOY_PASS <<< "" echo "${STAGING_DEPLOY_PATH} ${PRODUCTION_DEPLOY_HOST} ${PRODUCTION_DEPLOY_PATH} - ${ SCP_DEPLOY_USER} ${SCP_DEPLOY_PASS}" > /dev/null + ${SCP_DEPLOY_USER} ${SCP_DEPLOY_PASS}" > /dev/null function deploy_scp() { # This is ghetto if [[ -n "${PRODUCTION_DEPLOY_PATH}" ]]; then + # if SCPPORT is empty, set it to 22 + if [[ -z "${SCP_DEPLOY_PORT}" ]]; then + SCP_DEPLOY_PORT="22" + fi + # Todo: Add proper checks/fallbacks here TMP=$(<$SCP_DEPLOY_PASS) - SCP_DEPLOY_PASS="${TMP}" - sshpass -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/" &>> "${logFile}"; error_check; + SCP_DEPLOY_PASS="${TMP}" + sshpass -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -P "${SCP_DEPLOY_PORT}" -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/" &>> "${logFile}"; error_check; else echo "ERROR: Can not find production server path"; exit 1 fi From f19ce754588773879a7282ceb9eaa244feacf443 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 4 Apr 2018 09:21:02 -0700 Subject: [PATCH 051/334] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e504ed..d879fb1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - Invoice creation is now available via [InvoiceNinja](https://www.invoiceninja.org/)'s API using `deploy --invoice` - Added a very simple built-in web deployment method for instances when using something like `mina` is unavailble -- Added malware scanning using (Nikto](https://www.cirt.net/Nikto2) +- Added malware scanning using [Nikto](https://www.cirt.net/Nikto2) ### Changed - Ports other than 22 can be used for SSH/SCP functions - Running with the `--automate` switch now requires the branch defined as "master" must be currently checked out. The behavior is the equivalent of setting `CHECKBRANCH="${MASTER}"` From b439d57265bb40d659f57260f20915c6f842775c Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 4 Apr 2018 20:06:25 -0700 Subject: [PATCH 052/334] Scan reports --- deploy.sh | 14 +++-- etc/deploy-example.conf | 9 --- etc/html/default/digest/header.html | 8 +++ etc/html/default/scan/footer.html | 20 ++++++ etc/html/default/scan/header.html | 80 ++++++++++++++++++++++++ etc/html/default/stats/index.html | 9 ++- etc/html/default/theme.conf | 2 +- install/doinst.sh | 2 +- lib/log-handling.sh | 19 +++--- lib/main.sh | 2 +- lib/monitor.sh | 2 +- lib/post-log.sh | 5 ++ lib/process-html.sh | 10 ++- lib/scan.sh | 95 ++++++++++++++++++++++++----- lib/utilities.sh | 7 ++- 15 files changed, 233 insertions(+), 51 deletions(-) create mode 100755 etc/html/default/scan/footer.html create mode 100755 etc/html/default/scan/header.html diff --git a/deploy.sh b/deploy.sh index b2a7fc6..fd08072 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.7-alpha.1" +VERSION="3.7-beta.1" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -37,12 +37,13 @@ echo "${APP} ${UPGRADE} ${SKIPUPDATE} ${CURRENT} ${VERBOSE} ${QUIET} ${STRICT} ${SCAN}" > /dev/null # Temp files -read -r logFile wpFile coreFile postFile trshFile statFile urlFile <<< "" +read -r logFile wpFile coreFile postFile trshFile scanFile statFile \ + urlFile <<< "" echo "${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile} - ${urlFile}" > /dev/null + ${scanFile} ${urlFile}" > /dev/null # Console Colors -read -r black red green yellow blue magenta cyan white endColor bold underline \ - reset purple tan <<< "" +read -r black red green yellow blue magenta cyan white endColor bold \ + underline reset purple tan <<< "" echo "${black} ${red} ${green} ${yellow} ${blue} ${magenta} ${cyan} ${white} ${endColor} ${bold} ${underline} ${reset} ${purple} ${tan}" > /dev/null @@ -210,7 +211,7 @@ while [[ ${1:-unset} = -?* ]]; do --invoice) CREATE_INVOICE="1" ;; --unlock) UNLOCK="1" ;; --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;; - --scan) SCAN="1" ;; + --scan) SCAN="1"; FORCE="1" ;; --no-check) NOCHECK="1" ;; --function-list) FUNCTIONLIST="1"; CURRENT="1" ;; # Spoofs --current --variable-list) VARIABLELIST="1"; CURRENT="1" ;; # Spoofs --current @@ -287,6 +288,7 @@ echo -e "Launching deploy${STARTUP}\n" >> "${logFile}" # More crappy tmp files postFile="/tmp/${APP}.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail trshFile="/tmp/${APP}.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail +scanFile="/tmp/${APP}.scan-$RANDOM.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail statFile="/tmp/${APP}.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail urlFile="/tmp/${APP}.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail htmlFile="/tmp/${APP}.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf index eb6502f..7718644 100755 --- a/etc/deploy-example.conf +++ b/etc/deploy-example.conf @@ -234,12 +234,3 @@ GLOBAL_VERSION="3.7" # Set the number of days before logs should be deleted. Currently this only # works for logs stored on localhost. # EXPIRELOGS="{{EXPIRELOGS}}" - -############################################################################### -# Nikto -############################################################################### - -# If you want to make use of nikto for malware/security host scanning, define -# its full path (including command) as well as its configuration file below -# NIKTO="{{NIKTO}}" -# NIKTO_CONFIG="{{NIKTO_CONFIG}}" diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html index 79a8391..edbfd42 100755 --- a/etc/html/default/digest/header.html +++ b/etc/html/default/digest/header.html @@ -79,7 +79,15 @@

{{PROJCLIENT}}
+ +
+ {{SCAN_MSG}} ✔ +
Uptime: {{UPTIME}}%
+
Latency: {{LATENCY}}s
+
+

{{GREETING}}

{{ANALYTICSMSG}}

+

Here's a summary of code updates made to your website last week:

\ No newline at end of file diff --git a/etc/html/default/scan/footer.html b/etc/html/default/scan/footer.html new file mode 100755 index 0000000..c392ea8 --- /dev/null +++ b/etc/html/default/scan/footer.html @@ -0,0 +1,20 @@ +
+ + + + + + + + + + + + + diff --git a/etc/html/default/scan/header.html b/etc/html/default/scan/header.html new file mode 100755 index 0000000..fa20367 --- /dev/null +++ b/etc/html/default/scan/header.html @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + @@ -164,7 +167,7 @@

{{GA_SEARCHES}}

-

vistors from organic searches

+

hits from organic searches

+

Site Scan BETA

+ + +

Report generated {{NOW}}

+

{{PROJNAME}} + ({{PRODURL}}) +

+ +
{{PROJCLIENT}}
+ + +

{{SCAN_RESULT}}

+
{{SCAN_MSG}} ✔
+
Uptime: {{UPTIME}}%
+
Latency: {{LATENCY}}s
+
+
\ No newline at end of file diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index e89adb9..5bce26a 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -68,8 +68,11 @@

-

Weekly overview

Uptime: {{UPTIME}}%
-
Latency: {{LATENCY}}s
+

Weekly overview

+ {{SCAN_MSG}} ✔ +
Uptime: {{UPTIME}}%
+
Latency: {{LATENCY}}s
+
diff --git a/etc/html/default/theme.conf b/etc/html/default/theme.conf index 979de25..65184bf 100755 --- a/etc/html/default/theme.conf +++ b/etc/html/default/theme.conf @@ -7,7 +7,7 @@ # Setup theme colors DEFAULTC="#555555" PRIMARYC="#47ACDF" -SUCCESSC="#47ACDF" +SUCCESSC="#28a745" INFOC="#5D6D7E" WARNINGC="#E37222" DANGERC="#CC2233" diff --git a/install/doinst.sh b/install/doinst.sh index f941615..75c8b14 100755 --- a/install/doinst.sh +++ b/install/doinst.sh @@ -87,7 +87,7 @@ else fi # Declare dependencies -dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sendmail sleep tput) +dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sendmail sleep tee tput) # Declare optional stuff options=(gitchart grunt npm scp ssh sshpass wget wkhtmltopdf wp) diff --git a/lib/log-handling.sh b/lib/log-handling.sh index 53a0940..6c25be0 100755 --- a/lib/log-handling.sh +++ b/lib/log-handling.sh @@ -163,18 +163,19 @@ function build_html() { if [[ "${PUBLISH}" == "1" ]]; then LOGURL="${REMOTEURL}/${APP}/${EPOCH}.${LOGSUFFIX}" REMOTEFILE="${EPOCH}.${LOGSUFFIX}" - else - if [[ "${message_state}" == "APPROVAL NEEDED" ]]; then + elif [[ "${SCAN}" == "1" ]]; then + LOGURL="${REMOTEURL}/${APP}/scan" + REMOTEFILE="index.html" + elif [[ "${message_state}" == "APPROVAL NEEDED" ]]; then LOGURL="${REMOTEURL}/${APP}/APPROVAL-${EPOCH}.${LOGSUFFIX}" REMOTEFILE="APPROVAL-${EPOCH}.${LOGSUFFIX}" + else + if [[ "${message_state}" != "SUCCESS" ]] || [[ -z "${COMMITHASH}" ]]; then + LOGURL="${REMOTEURL}/${APP}/${message_state}-${EPOCH}.${LOGSUFFIX}" + REMOTEFILE="${message_state}-${EPOCH}.${LOGSUFFIX}" else - if [[ "${message_state}" != "SUCCESS" ]] || [[ -z "${COMMITHASH}" ]]; then - LOGURL="${REMOTEURL}/${APP}/${message_state}-${EPOCH}.${LOGSUFFIX}" - REMOTEFILE="${message_state}-${EPOCH}.${LOGSUFFIX}" - else - LOGURL="${REMOTEURL}/${APP}/${COMMITHASH}.${LOGSUFFIX}" - REMOTEFILE="${COMMITHASH}.${LOGSUFFIX}" - fi + LOGURL="${REMOTEURL}/${APP}/${COMMITHASH}.${LOGSUFFIX}" + REMOTEFILE="${COMMITHASH}.${LOGSUFFIX}" fi fi diff --git a/lib/main.sh b/lib/main.sh index 8bb0a9b..9f42631 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -9,7 +9,7 @@ function main() { dependency_check # Check that required commands are available release_check # Check for newer version at Github - env_check # Check for configuration files that need updating + env_check # Check for configuration files that need updating gitStart # Check for a valid git project and get set up lock # Create lock file go # Start a deployment work session diff --git a/lib/monitor.sh b/lib/monitor.sh index 240a6c5..5d6e9ed 100755 --- a/lib/monitor.sh +++ b/lib/monitor.sh @@ -18,7 +18,7 @@ function server_monitor() { # for. The PHP Monitor API has no ability to look up results in that way MONITORHOURS="720" elif [[ "${DIGEST}" == "1" ]] || [[ "${PROJSTATS}" == "1" ]]; then - # Digests and reports should average the 7 days + # Digests and stats should average 7 days MONITORHOURS="168" else # Anything else defaults to 24 hours diff --git a/lib/post-log.sh b/lib/post-log.sh index 94b2080..c0cf047 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -102,6 +102,11 @@ function postLog() { fi fi + if [[ "${SCAN}" == "1" ]]; then + eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/scan" + eval "${SCPCMD} -r" "${scan_html}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/scan/index.html" + fi + if [[ "${REPORT}" == "1" ]]; then REMOTEFILE="${CURYR}-${CURMTH}.php" REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" diff --git a/lib/process-html.sh b/lib/process-html.sh index 8dd5d47..2eca0b1 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -8,9 +8,10 @@ trace "Loading html handling" # Initialize variables -read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID COVER <<< "" +read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID COVER \ + SCANC <<< "" echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} - ${SMOOCHID} ${COVER}" > /dev/null + ${SMOOCHID} ${COVER} ${SCANC}" > /dev/null function process_html() { # Clean out the stuff we don't need @@ -18,6 +19,7 @@ function process_html() { [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${htmlFile}" [[ -z "${UPTIME}" ]] && sed -i '/UPTIME/d' "${htmlFile}" [[ -z "${LATENCY}" ]] && sed -i '/LATENCY/d' "${htmlFile}" + [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_MSG/d' "${htmlFile}" [[ -z "${PROJCLIENT}" ]] && sed -i 's/()//' "${htmlFile}" [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${htmlFile}" [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${htmlFile}" @@ -59,6 +61,10 @@ function process_html() { -e "s^{{INFO}}^${INFOC}^g" \ -e "s^{{WARNING}}^${WARNINGC}^g" \ -e "s^{{DANGER}}^${DANGERC}^g" \ + -e "s^{{SCAN}}^${SCANC}^g" \ + -e "s^{{SCAN_MSG}}^${SCAN_MSG}^g" \ + -e "s^{{SCAN_RESULT}}^${SCAN_RESULT}^g" \ + -e "s^{{SCAN_URL}}^${SCAN_URL}^g" \ -e "s^{{SMOOCHID}}^${SMOOCHID}^g" \ -e "s^{{GRAVATARURL}}^${REMOTEURL}\/${APP}\/avatar^g" \ -e "s^{{DIGESTWRAP}}^${DIGESTWRAP}^g" \ diff --git a/lib/scan.sh b/lib/scan.sh index 39e76b5..5dad033 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -5,14 +5,34 @@ ############################################################################### # Integrates with nikto to run malware and security scans ############################################################################### +trace "Loading malware scanning utilities" # Initialize variables -read -r NIKTO NIKTO_CONFIG <<< "" -echo "${NIKTO} ${NIKTO_CONFIG}" > /dev/null +read -r NIKTO NIKTO_CONFIG scan_html SCAN_RESULT SCAN_MSG SCAN_URL <<< "" +echo "${NIKTO} ${NIKTO_CONFIG} ${scan_html} ${SCAN_RESULT} ${SCAN_MSG} + ${SCAN_URL}" > /dev/null + +function scan_check() { + if [[ -n "${PRODURL}" ]] || [[ -n "${NIKTO}" ]]; then + SCAN_URL="${REMOTEURL}/${APP}/scan/" + + SCAN_RESULT=$(echo "${SCAN_MSG//
}") + if curl -Is "${SCAN_URL}" | grep -q "200"; then + if curl -s "${SCAN_URL}" | grep -q "0 error"; then + SCANC="${SUCCESSC}" + SCAN_MSG="Scan Passed" + elif curl -s "${SCAN_URL}" | grep -q "error"; then + SCANC="${DANGERC}" + SCAN_MSG="Problem Detected" + fi + trace "Malware report: ${SCAN_MSG} (see ${SCAN_URL}" + fi + fi +} function scan_host() { if [[ -z "${NIKTO}" ]]; then - return + warning "Scanning command is not configured, check your setup."; quietExit fi # Check for nikto @@ -20,26 +40,71 @@ function scan_host() { error "Can't find scanning command (${NITKO})" } + # Create temp files + scan_html="/tmp/${APP}.scan-$RANDOM.html"; (umask 077 && touch "${scan_html}" &> /dev/null) || log_fail + # Get headers # trace "Header" # curl -X HEAD -i "${PRODURL}" &>> "${logFile}" # Run the scan trace "Scanning ${PRODURL}..." - "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VP14 -Tuning x12b -host "${PRODURL}" >> "${logFile}" & + "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" & spinner $! - message_state="NOTICE" - LOGTITLE="Malware Scan" - notes="Malware scan on ${PRODURL}" - - # Clean up the log - sed -i 's/^.*Running/Running/' "${logFile}" - sed -i 's/^.*Loaded/Loaded/' "${logFile}" - sed -i '/^V\:/d' "${logFile}" - sed -i '/^Running average\: Not enough data/d' "${logFile}" - sed -i "s/: currently in plugin 'Nikto Tests'//" "${logFile}" + + # For testing only + cp "${scanFile}" ~/verbose_scan.txt + + # Create and clean up the log + sed -i 's/^.*Running/Running/' "${scanFile}" + sed -i 's/^.*Loaded/Loaded/' "${scanFile}" + sed -i '/^V\:/d' "${scanFile}" + sed -i '/^Running average\: Not enough data/d' "${scanFile}" + sed -i "s/: currently in plugin 'Nikto Tests'//" "${scanFile}" # Strip redirects, can get very spammy on a Wordpress project - sed -i '/Redirects (301) to/d' "${logFile}" + sed -i '/Redirects (301) to/d' "${scanFile}" + cat "${scanFile}" >> "${logFile}" + + # Here's what we need to do to get the HTML ready. Ouch. + sed -i '/<\/p>/d' "${scan_html}" + sed -i '/
/d' "${scan_html}" + sed -i '/<\/div>/d' "${scan_html}" + sed -i 's^class=\"dataTable\"^style=\"width: 100%; max-width: 600px;\">
"${htmlFile}" + + SCAN_MSG=$(grep "error" "${htmlFile}") + + # Create scan result text + SCAN_RESULT=$(echo "${SCAN_MSG// diff --git a/etc/html/default/scan/index.html b/etc/html/default/scan/index.html new file mode 100755 index 0000000..e76bfed --- /dev/null +++ b/etc/html/default/scan/index.html @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + +
}") + SCAN_RESULT=$(echo "${SCAN_RESULT//<\/td>}") + trace "${SCAN_RESULT}" + + # Set the scan result label text and color + if [[ "${SCAN_MSG}" == *"0 errors"* ]]; then + SCANC="${SUCCESSC}" + SCAN_MSG="Scan Passed" + else + SCANC="${DANGERC}" + SCAN_MSG="Problem Detected" + fi + + process_html + + cp "${htmlFile}" "${scan_html}" + + message_state="NOTICE" + LOGTITLE="Malware Scan" + notes="Malware scan on ${PRODURL}: ${SCAN_RESULT}" + safeExit } diff --git a/lib/utilities.sh b/lib/utilities.sh index 15d10ae..32c2bf5 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -17,14 +17,15 @@ function go() { tput cnorm; fi + # Weird spot for this stuff I know + server_monitor + scan_check + console "deploy ${VERSION}" if [[ "${INCOGNITO}" != "TRUE" ]]; then console "Current working path is ${WORKPATH}/${APP}" fi - - # Weird spot for this I know - server_monitor # Slack test if [[ "${SLACKTEST}" == "1" ]]; then From 6d804d756621f4f162d6f0904c086a33506ea87f Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 6 Apr 2018 14:21:04 -0700 Subject: [PATCH 053/334] Minor scan refinements --- README.md | 2 ++ deploy.sh | 2 +- etc/deploy.sh | 2 +- lib/scan.sh | 5 +++-- lib/slack.sh | 9 +++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bf0a003..353bcc8 100755 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ Other Options: --strict Any error will halt deployment completely --debug Run in debug mode --unlock Delete expired lock files + --repair Repair a deployment after merge failure + --scan Scan production hosts for malware issues --ssh-test Validate SSH key setup --email-test Test email configuration --slack-test Test Slack integration diff --git a/deploy.sh b/deploy.sh index fd08072..55f93ea 100755 --- a/deploy.sh +++ b/deploy.sh @@ -137,7 +137,7 @@ Other Options: --strict Any error will halt deployment completely --debug Run in debug mode --unlock Delete expired lock files - --repair Repair a deployment after key failure + --repair Repair a deployment after merge failure --scan Scan production hosts for malware issues --ssh-test Validate SSH key setup --email-test Test email configuration diff --git a/etc/deploy.sh b/etc/deploy.sh index 8d40184..d6880f8 100755 --- a/etc/deploy.sh +++ b/etc/deploy.sh @@ -338,7 +338,7 @@ PROJECT_VERSION="3.7" ############################################################################### -# Nikto +# Malware scanning ############################################################################### # If you want to make use of nikto for malware/security host scanning, define diff --git a/lib/scan.sh b/lib/scan.sh index 5dad033..2e15762 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -93,16 +93,17 @@ function scan_host() { if [[ "${SCAN_MSG}" == *"0 errors"* ]]; then SCANC="${SUCCESSC}" SCAN_MSG="Scan Passed" + message_state="PASSED" else SCANC="${DANGERC}" SCAN_MSG="Problem Detected" + message_state="ERROR" fi process_html cp "${htmlFile}" "${scan_html}" - - message_state="NOTICE" + LOGTITLE="Malware Scan" notes="Malware scan on ${PRODURL}: ${SCAN_RESULT}" diff --git a/lib/slack.sh b/lib/slack.sh index 94e1e5b..5ad3331 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -85,6 +85,7 @@ function slackPost () { fi fi + # Add a details link to online logfiles if they exist if [[ -n "${REMOTEURL}" ]] && [[ -n "${REMOTELOG}" ]]; then slack_message="${slack_message} (<${LOGURL}|Details>)" @@ -117,6 +118,11 @@ function slackPost () { fi fi + # Arf I hate this + if [[ "${SCAN}" == "1" ]]; then + slack_message="${notes} (<${LOGURL}|Details>)" + fi + # Set icon for message state case "${message_state}" in ERROR) @@ -125,6 +131,9 @@ function slackPost () { DIGEST) slack_icon=':black_small_square:' ;; + PASSED) + slack_icon=':heavy_check_mark:' + ;; *) slack_icon='' ;; From e58a8b7764beb6e9213c44c1fb1d2df88bb05822 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Fri, 6 Apr 2018 21:11:33 -0700 Subject: [PATCH 054/334] Cleaning up html --- deploy.sh | 2 +- etc/html/default/digest/header.html | 10 +- etc/html/default/digest/mockup.html | 144 ++++++++++++++++++++++++++ etc/html/default/digest/scan-pass.png | Bin 0 -> 2132 bytes etc/html/default/digest/speed.png | Bin 0 -> 3155 bytes etc/html/default/digest/uptime.png | Bin 0 -> 3468 bytes etc/html/default/remote/scan.png | Bin 0 -> 2132 bytes etc/html/default/remote/scan.svg | 9 ++ etc/html/default/remote/speed.png | Bin 0 -> 3155 bytes etc/html/default/remote/speed.svg | 13 +++ etc/html/default/remote/uptime.png | Bin 0 -> 3468 bytes etc/html/default/remote/uptime.svg | 10 ++ etc/html/default/scan/header.html | 13 ++- etc/html/default/scan/index.html | 101 ++++++++++++++++++ etc/html/default/stats/index.html | 17 +-- etc/html/default/theme.conf | 3 +- lib/digest.sh | 2 +- lib/monitor.sh | 25 ++++- lib/process-html.sh | 9 +- lib/scan.sh | 23 ++-- 20 files changed, 344 insertions(+), 37 deletions(-) create mode 100755 etc/html/default/digest/mockup.html create mode 100755 etc/html/default/digest/scan-pass.png create mode 100755 etc/html/default/digest/speed.png create mode 100755 etc/html/default/digest/uptime.png create mode 100755 etc/html/default/remote/scan.png create mode 100755 etc/html/default/remote/scan.svg create mode 100755 etc/html/default/remote/speed.png create mode 100755 etc/html/default/remote/speed.svg create mode 100755 etc/html/default/remote/uptime.png create mode 100755 etc/html/default/remote/uptime.svg create mode 100755 etc/html/default/scan/index.html diff --git a/deploy.sh b/deploy.sh index 55f93ea..ab4cc84 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.7-beta.1" +VERSION="3.7-beta.2" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html index edbfd42..58d6c40 100755 --- a/etc/html/default/digest/header.html +++ b/etc/html/default/digest/header.html @@ -80,10 +80,12 @@

-
- {{SCAN_MSG}} ✔ -
Uptime: {{UPTIME}}%
-
Latency: {{LATENCY}}s
+

{{GREETING}}

diff --git a/etc/html/default/digest/mockup.html b/etc/html/default/digest/mockup.html new file mode 100755 index 0000000..fca5ed0 --- /dev/null +++ b/etc/html/default/digest/mockup.html @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+

Your Weekly Digest

+ +

+ March 30, 2018 – April 06, 2018

+ +
California Apartment Association
+ + + + +

Happy Monday and welcome back!

+

You had traffic from 4275 organic searches last week. Not bad!

+ +

Here's a summary of code updates made to your website last week:

+
+
+commit ecd2340
+Author: Joe Horning
+Date: Thu, 5 Apr 2018 02:01:34 -0700 (2 days ago)

+Updated 6 of 6 plugins (instapage 3.2.3, jetpack 6.0, pardot 1.4.6, relevanssi 4.0.7, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)
+ +
+commit 46a7bbe
+Author: Corey Worrell
+Date: Fri, 30 Mar 2018 18:07:27 -0700 (7 days ago)

+emrl-base update
+ +
+ + + + +
+ Looking for more? Check out your project's stats page. +
+
+ + + + + + +
+
+ + + diff --git a/etc/html/default/digest/scan-pass.png b/etc/html/default/digest/scan-pass.png new file mode 100755 index 0000000000000000000000000000000000000000..4974672a415771b5e3a05a946a1e1870fd2fc1aa GIT binary patch literal 2132 zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf; zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~ zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi- z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9 zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z( z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J zVrAsF0Y(IWSfehi@f10wLt5&!@I literal 0 HcmV?d00001 diff --git a/etc/html/default/digest/speed.png b/etc/html/default/digest/speed.png new file mode 100755 index 0000000000000000000000000000000000000000..551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed GIT binary patch literal 3155 zcmb7G`8U*!7yeAv7iDKGV-2NjAzRF3O|q{k8BG`s2H6b;S;kslN|B`~ipY|kF=H%| ztRed@yRnXSzTQ9Kz31Hfob#M}pXY~r&OH}rW@2!WiJu7ofQyEAbS=)Y`QK!uKd%t25vt=KXw)|^l)-@ws3ZO66F2E`4#{$?-}aewhA0w%NjEm z=;DcaAl---B*ZW#76n!dMu=W8WM?$M;($1q5AADl*ztrl54(tKF3Wzlb19kcS@Cl1 z?ymFV@s}%@O9C!~r=<@ZlR)Rr|24dR#Yz5+DRsnWyH1%fQHMW=Sv#eNLYSx_;ojb5 z1=b2!J5pAH8t)#zX^#rP@qZG;hVUv689%=LLsNOBA-;YgvXBZVmd&hED zimuPJTmJBgTTbo5LF;{Yqq7)YMn0!eI6!7}RQLEi3sq>*TLcYBKyx&ZIRYL#jr?Qk zd$qBKL}Cu>_!ypabGxE=OT}Me-NAjyQkniU!8{UK%kkXsMM7kc03M1#SI%Uj{?mC)ey zy$Uc<;%e`v+DaDRP~z8=aeODq_V@16;EYDs)X}@f9Pmc$&n^EbC15>QgK502<{jmz zeS4=G(tuZOLchJV(cLpMAhJhLeL*Qzp16GinLkq=$PsRPau}4}cWA#FCF0gcs@Re^ z`N~pJ?ZJ)?LVqq;$(PYE%JFkZ&Eo3+5Z$xDjYyg0HKN8)vc7rCllPd7gf=Q}b`6N3 z^Yl1biS4WPOG7sb%?iF&g9dUCeK7rm$>TWs)Z|v^uy#OPOU4+#-eL}=NTey1h*wFL zY${$(*;Y3@Ug(4OEo`qE8W4qvjHY3NI85m9X6%cWU}dQ$pC$ty(3zD$ad(gCfX*&` zZbeLvG2RBXVLffS7~Y;ts%dimGaca1W5A;WjW^FhDS55H^^;qt($ic^wbKWkGl`#A zxmTY}RP|_$by%3*(&zDm);#pl^d12fkt~JSPtuvx{EL4Is0s};Ph;|R%jb_gh71y} zu)s8X@(iC{ZTTc}G^i4#VH}=@M=1Lnf1mokUTtVZE_kz!C!Ljbn=R+Rrz}aIU2X_{dTfQ- zZ>`iT@!WaG%tkEASRnjGjmOd;-@Wn6I0qi1=$*i4o_`j+8oQ`xQqa|gyTVhu6w0TTPCu&47WD#*H zBjQ6WLnRJyEfI|6nN?w5Aw8wF){l6+T@sQyy^Me;pvd(M>E@P@J{tpuRyGq$H&WR` z6l5^+G26Q}Y;Y9ifiY&m_lEkX(4DrlHJbz(I)2*|xM&i*fJl|EtXMU&Q%713ykr;j zy|SJ3Pk`*2yiqFX>8HfI3e4_;=QhD(eg<+Fp^)_qg_L22Qlhid>S{|^OE&MVNl0ZQjV3Wlo z<_~P+@Lar0A3b#%0^i@P>2JCud)7wZ8^Jz*wTC__J=lyl)?i&H?9w_S{c2xb_u?DF zF4l?{tI7{P>7Z=uLpbgtOsHHSnbxNKOR}%Cq0yc+Z=*U!Zx4x1L=XKU5n|mCv)qB(hvt)fqD z@YUpB{X(woi)s%y@QmhwEz;Djt4Dd%3(}oEP5%<6e(3NNaa>2U;c=T%l2B7l^jiL_ zW?ogRs%?xDx(1FINDG>!M2#fET?O5r>_7Bv3b4YwcB-H2dPP`Ac%Z%G{}{GSeRm&@am3YK9ZoTn_6V`ag%P3FGX=hi-BLzO!`8H`E0Ppc z678miF|G|4Pi_CJ`*`+1lWct*8z9337g);R$U*>NB&f>op``Yh&3~Qn2@f9~%|3{) z=$IpsAY-J2tAexk>2w}=yC)_=N`t|IHFFe;c{Z`aKg-mvH`i;r~uU6{TY8%@~evK{6|YV zo5h6}bG`f%ajHyfR(~D&1$TVrW+pJ)&EfGFW|rn8QIZR7xzJ+5p;|>fI%D$fM!F|O z7MscuZgJI&R{z`ZWB)niD%|z_h*W`CL_X)qrhWlk;ERa+`#vfv#5Fr{-;S2Qfs%SX zQj|tf ze(k2UpMBz+Qac<0Ivn9>F<8&O|m6*+18qA_;( z;)$#*amP;!O5gj;w~*X7C$9GmjXVSuz+RT^o-{y=lR>1}Q;E~<(1&vY_Chpq(V0Nc zc>fw0#xgn8o-Ah}!XjdiF~KaX9S7p*=wC=y06nB*1Yn*Iea5-S(IJDEl-h~+y);*LZnK|hu_39F{x!J;G1n>hK!9}{p5KXqxq-NW+0v1X1O*&j=iB};=b-=6P3@Hyvo@9W$j?hp5z*X!PM<4y7UTpZ^)007`J!08bFaL0cE zWBro}(?qsEB;c=Wz`Fe$zJ!}ZAy$7i+yd^I$orgi6E z%lC+Rej<|U^fgpkPcRlL(b#*{e!fChzjMVKfW@vM5&G6d9ddfIej9!c#`+a*n7fxKJWy60JYe$nZ;jRod8jSY)!mw(n~7h&L~YUvtZLpq*iy`)Ugv8I zRrkOw=<&h^vrt^Bp zE&DvzAttiu!_si6={oLl=L?wX5ZHS2=h(eC_6uhak(3BZG{xW%6Thcl^R1biuVZSa zcaqoO38^DiuMGpSPG_+fkwjJ`XMx+a!Uu$A@I!TilU>21J%dl~&%1Z}obnrH&yRTh z+Ssrm{+6=x_FT$7QmWq7`^{)*{?e@4rOF2B8pHVN(S1fT@Lnii*I_D$^Wu((Nffk)7cOUq|ot?olmIf^16$>MI^CD7(%}KPjQ-HE5OyW7yKThR?8b`8+)s zelYndOdIeiQr})2Sdz@+6k2`Un#GFYd_&NR6%0Y!dJ6woR8<^{j$vqi(0#f3&V_4q_T`4D;*R z_0b+z!2UDp`0bK-^i}#5LcaBodF~ZL0V$Hw*Hs54n)2$HL_6z~{r;kd&~clATD|na ztMVfa4rKGf@|Ct?T|liUFmcycDNoIq2lTvn3}-FyjpdNC??mZRzYD>7m*7q-m!;2E z=%qN*r^U~I{Bl{iIqf!(Em_3j(8sORe=Hknb`h&^;R`=+16L*L`9nRxQFmBz>NAJ- znNGMBgxkZy+pNP5s9Zv19{80Am=kAKVaf!Ev*1nhq9i!fSqI2S^IT^5<_aQBv)HEl z>ONDT!2XHcGUIY4TDRc3)(fp=vkql&0blEa?0bq1s?kPi(bNv)o*KP%g8N%b2N5xO z3SMh80B0Y7`GQ-9E}7?-qZL_7wVn;V+2y?PFf!oWy0F>r>zvKAuJ3gx*-vn74UliM zYT~>TP3|OHT_D5xYy>XCZ|?5bE`hQl7+}^sj`TN*i7k6~@%`n|m%puGO_|^#EL1#(Ev{=C4Mv6YxiP{PN8^+2Ie^q0S;qDSDC=pW>W(BS z%kAKy$j3Q`olcAdt>D8_ep)0S&}U)_h-zqpQjT@Fp{8laUyJ&`?ZZHS_Ou!aJvDC6 z1N7y~5dM~X%Y(H|!krM!R=h)^fJyHdu0KWUB%%@8V+b0170Z5jSd@c-AUmpN1xQ>4irK-f;$x*4jvK#%~ z9fW%DT0|ztS(M3b*Eq=dQfmJHl4BLd>F+SfyNqFAJnN4zlYvnqRQMcw-zKXZEr92` zeW63S_kB@Btr_~=R>qRa6HcAZibknC-*quQJ<&tCdX1l#3j_0)Okx6FpRg4Kv~g$t z9H!C~JOaeSvuycLbkb!(%pNG1`Qlx&4f`CzKhHc(!+3@}G>Bdy_n)a0ZeTiIh;rnn z9)Ieif~z(JdXFr<6y}}vff8pE%03i#;_x{s#@&cEnJ|dYy)W?`7)?aol;jN3-O<0u zJoTvUB{^u>JUIbZD?)YzwG5?x5V)AeG+seBDnEE%XlZ8kN~#>ne=Qq{QqVdFz0oUk znchzh3fLas zy35rfUn!`8j!ZnA&eZCovZj*?o?mcH=lJqu4*{Yj2p6q`&P067`FIN!5F6(pxxKRL z(eD<-q)AwY!mwo=sg=)dHW2GRYOB}?DHjKvbh4`6@2;anuF?)8>8fzgI`nVd@>aI9 zIdTKO70nwSy|3(BZtjf7c*;Rn80d+xV)3W90oJ@oadhtu*m92on(FA>yuPjlv^;78 zF{NlM{`U_Qw0IT=K$|0GPe?+5iT9(G^SE{|$vQ+*DV#+2__-J>3Pj>Fx~o*}*=8<9eGdN09bfQ!@aWuybK5p^g_%n~& zKYdr|_ME5)n6gY%Z%?2}_yHIv8d=37&9Yn-Cp=~nM?x&%U$uyl_`z{@72tJv%N#f z5ML64l#`Pd*7V~IsL{l$clT~4|9}+4XmGrVeO0t$Z;;v^`{C2S4WGie8~6|Th{HlZ zIPL@KNQJYn`8wpT+9{zsJ&Puy%Ep7o<{5w6NaP3oGMm_t(o8t|_;BJcTac;|h~j1$ z*K~1h2)%;0{sfg&yb<4WI^8Xi0BjU@8h2=TMgA7Z%Pz#U+!fMe31-;WjLS<_L@d=# z8a?1=wH{zpr&815bGp}3{8uwPKE;}Oq}m4Tu_mfp$#(Ks{VdluDZP`ZZv9jXwH%Y?eReayB+C_e&9v*20Wx)!q8aJRhcvp{r$MKM5u%HGt> zxOnnr$3|mH4koG!O|j$aKI?pLEl}X0PxILP+HuD>IquCvv+od1p8tul-&BAFc$@Vi VCxh58{^z{{40Q22)mn~`{|BIsV&nh- literal 0 HcmV?d00001 diff --git a/etc/html/default/remote/scan.png b/etc/html/default/remote/scan.png new file mode 100755 index 0000000000000000000000000000000000000000..4974672a415771b5e3a05a946a1e1870fd2fc1aa GIT binary patch literal 2132 zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf; zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~ zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi- z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9 zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z( z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J zVrAsF0Y(IWSfehi@f10wLt5&!@I literal 0 HcmV?d00001 diff --git a/etc/html/default/remote/scan.svg b/etc/html/default/remote/scan.svg new file mode 100755 index 0000000..e5aad72 --- /dev/null +++ b/etc/html/default/remote/scan.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/etc/html/default/remote/speed.png b/etc/html/default/remote/speed.png new file mode 100755 index 0000000000000000000000000000000000000000..551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed GIT binary patch literal 3155 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 + + + + + + + diff --git a/etc/html/default/remote/uptime.png b/etc/html/default/remote/uptime.png new file mode 100755 index 0000000000000000000000000000000000000000..158e8a40e23f3ede2c5cb6ff3811007bf99cfaf1 GIT binary patch literal 3468 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 VCxh58{^z{{40Q22)mn~`{|BIsV&nh- literal 0 HcmV?d00001 diff --git a/etc/html/default/remote/uptime.svg b/etc/html/default/remote/uptime.svg new file mode 100755 index 0000000..0a98f23 --- /dev/null +++ b/etc/html/default/remote/uptime.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/etc/html/default/scan/header.html b/etc/html/default/scan/header.html index fa20367..00cab13 100755 --- a/etc/html/default/scan/header.html +++ b/etc/html/default/scan/header.html @@ -68,11 +68,14 @@

-

{{SCAN_RESULT}}

-
{{SCAN_MSG}} ✔
-
Uptime: {{UPTIME}}%
-
Latency: {{LATENCY}}s
-
+

{{SCAN_RESULT}}

+

+ + + +
+
+ + + + + + + + + + +
+

Project Statistics BETA

+ + +

Weekly report generated {{NOW}}

+

{{PROJNAME}} + ({{PRODURL}}) +

+ +
{{PROJCLIENT}}
+ + +

Weekly overview

Malware: 0 errors ✔
+ +
Uptime: {{UPTIME}}%
+
Latency: {{LATENCY}}s
+
+
+ {{SCAN_RESULTS}} +
+ + + + + + +
+
+ + + diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index 5bce26a..010a3b4 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -56,8 +56,8 @@ - diff --git a/etc/html/default/theme.conf b/etc/html/default/theme.conf index 65184bf..ecd4e28 100755 --- a/etc/html/default/theme.conf +++ b/etc/html/default/theme.conf @@ -7,9 +7,10 @@ # Setup theme colors DEFAULTC="#555555" PRIMARYC="#47ACDF" +SECONDARYC="#CCCCCC" SUCCESSC="#28a745" INFOC="#5D6D7E" -WARNINGC="#E37222" +WARNINGC="#FFC107" DANGERC="#CC2233" # If you'd like to add Smooch.io live chat to your digest and statistics pages, diff --git a/lib/digest.sh b/lib/digest.sh index e9fe28c..c1ba25b 100755 --- a/lib/digest.sh +++ b/lib/digest.sh @@ -74,7 +74,7 @@ function create_digest() { # Strip out useless analytics results if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then sed -i '/ANALYTICS/d' "${htmlFile}" - else + # else if [[ "${METRIC}" == "hits" ]] && [[ "${RESULT}" -lt "499" ]]; then sed -i '/ANALYTICS/d' "${htmlFile}" fi diff --git a/lib/monitor.sh b/lib/monitor.sh index 5d6e9ed..9be4ba1 100755 --- a/lib/monitor.sh +++ b/lib/monitor.sh @@ -17,7 +17,7 @@ function server_monitor() { # which is dealing with the last calendar month, but oh well we get what we pay # for. The PHP Monitor API has no ability to look up results in that way MONITORHOURS="720" - elif [[ "${DIGEST}" == "1" ]] || [[ "${PROJSTATS}" == "1" ]]; then + elif [[ "${DIGEST}" == "1" ]] || [[ "${PROJSTATS}" == "1" ]] || [[ "${SCAN}" == "1" ]]; then # Digests and stats should average 7 days MONITORHOURS="168" else @@ -25,7 +25,7 @@ function server_monitor() { MONITORHOURS="24" fi server_monitor_log - trace "Uptime: ${UPTIME} / Latency: ${LATENCY} (avg. over last ${MONITORHOURS} hours)" + trace "Uptime: ${UPTIME}% / Latency: ${LATENCY} (avg. over last ${MONITORHOURS} hours)" fi } @@ -44,7 +44,7 @@ function server_monitor_test() { # Check last 7 days for the sake of the test MONITORHOURS="24" server_monitor_log - console "API: ${MONITORAPI}" + console "API: ${MONITORAPI}" notice "Results (last 24 hours)" console "Uptime: ${UPTIME}%" console "Latency: ${LATENCY}s" @@ -74,4 +74,23 @@ function server_monitor_log() { LATENCY="$(sed 's/^[^:]*://g' <<< "${LATENCY}")" # Round to two decimal places LATENCY="$(printf '%0.2f\n' "${LATENCY}")" + + # Set colors for html reports + if [[ "${UPTIME}" == "100" ]]; then + UPTIMEC="${SUCCESSC}" + elif [[ "${UPTIME}" > "97" || "${UPTIME}" == "97" ]]; then + UPTIMEC="${SUCCESSC}" + elif [[ "${UPTIME}" > "88" && "${UPTIME}" < "97" ]]; then + UPTIMEC="${WARNINGC}" + else + UPTIMEC="${DANGERC}" + fi + + if [[ "${LATENCY}" < "2.2" || "${LATENCY}" == "2.2" ]]; then + LATENCYC="${SUCCESSC}" + elif [[ "${LATENCY}" > "2.2" && "${LATENCY}" < "3.8" ]]; then + LATENCYC="${WARNINGC}" + else + LATENCYC="${DANGERC}" + fi } diff --git a/lib/process-html.sh b/lib/process-html.sh index 2eca0b1..6ced103 100755 --- a/lib/process-html.sh +++ b/lib/process-html.sh @@ -9,9 +9,9 @@ trace "Loading html handling" # Initialize variables read -r DEFAULTC PRIMARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID COVER \ - SCANC <<< "" + SCANC UPTIMEC LATENCYC <<< "" echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} - ${SMOOCHID} ${COVER} ${SCANC}" > /dev/null + ${SMOOCHID} ${COVER} ${SCANC} ${UPTIMEC} ${LATENCYC}" > /dev/null function process_html() { # Clean out the stuff we don't need @@ -57,11 +57,14 @@ function process_html() { -e "s^{{PRODURL}}^${PRODURL}^g" \ -e "s^{{DEFAULT}}^${DEFAULTC}^g" \ -e "s^{{PRIMARY}}^${PRIMARYC}^g" \ + -e "s^{{SECONDARY}}^${SECONDARYC}^g" \ -e "s^{{SUCCESS}}^${SUCCESSC}^g" \ -e "s^{{INFO}}^${INFOC}^g" \ -e "s^{{WARNING}}^${WARNINGC}^g" \ -e "s^{{DANGER}}^${DANGERC}^g" \ - -e "s^{{SCAN}}^${SCANC}^g" \ + -e "s^{{SCAN_STATUS}}^${SCANC}^g" \ + -e "s^{{UPTIME_STATUS}}^${UPTIMEC}^g" \ + -e "s^{{LATENCY_STATUS}}^${LATENCYC}^g" \ -e "s^{{SCAN_MSG}}^${SCAN_MSG}^g" \ -e "s^{{SCAN_RESULT}}^${SCAN_RESULT}^g" \ -e "s^{{SCAN_URL}}^${SCAN_URL}^g" \ diff --git a/lib/scan.sh b/lib/scan.sh index 2e15762..66e8477 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -17,15 +17,18 @@ function scan_check() { SCAN_URL="${REMOTEURL}/${APP}/scan/" SCAN_RESULT=$(echo "${SCAN_MSG// @@ -118,7 +113,7 @@

-

Project Statistics BETA

+ 		+

Site Smart BETA

Weekly report generated {{NOW}}

@@ -68,11 +68,14 @@

-

Weekly overview

- {{SCAN_MSG}} ✔ -
Uptime: {{UPTIME}}%
-
Latency: {{LATENCY}}s
-
+

Weekly overview

+
}") - if curl -Is "${SCAN_URL}" | grep -q "200"; then - if curl -s "${SCAN_URL}" | grep -q "0 error"; then + # Piping through tac is a workaround to solve a timing issue, see + # https://github.com/EMRL/deploy/issues/134 + #if curl -LIs --speed-time 900 "${SCAN_URL}" tac | tac | grep -q "200"; then + if curl -LIs "${SCAN_URL}" | grep -q "200"; then + if curl -Ls --speed-time 900 "${SCAN_URL}" tac | tac | grep -q "0 error"; then SCANC="${SUCCESSC}" - SCAN_MSG="Scan Passed" - elif curl -s "${SCAN_URL}" | grep -q "error"; then + SCAN_MSG="Scan passed" + elif curl -Ls --speed-time 900 "${SCAN_URL}" tac | tac | grep -q "error"; then SCANC="${DANGERC}" - SCAN_MSG="Problem Detected" + SCAN_MSG="Problem found" fi - trace "Malware report: ${SCAN_MSG} (see ${SCAN_URL}" + trace "Malware report: ${SCAN_MSG} (see ${SCAN_URL})" fi fi } @@ -42,10 +45,6 @@ function scan_host() { # Create temp files scan_html="/tmp/${APP}.scan-$RANDOM.html"; (umask 077 && touch "${scan_html}" &> /dev/null) || log_fail - - # Get headers - # trace "Header" - # curl -X HEAD -i "${PRODURL}" &>> "${logFile}" # Run the scan trace "Scanning ${PRODURL}..." @@ -92,11 +91,11 @@ function scan_host() { # Set the scan result label text and color if [[ "${SCAN_MSG}" == *"0 errors"* ]]; then SCANC="${SUCCESSC}" - SCAN_MSG="Scan Passed" + SCAN_MSG="Scan passed" message_state="PASSED" else SCANC="${DANGERC}" - SCAN_MSG="Problem Detected" + SCAN_MSG="Problem found" message_state="ERROR" fi From a894108916918a086b3ff0d28d58d39a3a646cb8 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sat, 7 Apr 2018 14:00:12 -0700 Subject: [PATCH 055/334] Resolve #133, resolve #134 --- etc/html/default/digest/header.html | 15 ++++++++--- etc/html/default/digest/mockup.html | 41 +++++++++++++---------------- etc/html/default/scan/header.html | 15 ++++++++--- etc/html/default/stats/index.html | 13 ++++++--- lib/scan.sh | 12 +++++---- 5 files changed, 57 insertions(+), 39 deletions(-) diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html index 58d6c40..8f35c33 100755 --- a/etc/html/default/digest/header.html +++ b/etc/html/default/digest/header.html @@ -79,14 +79,21 @@

{{PROJCLIENT}}
- + +
- +

{{SCAN_MSG}} ◢
- +

{{UPTIME}}% uptime ◢
- +

{{LATENCY}}s latency ◢
+

{{GREETING}}

{{ANALYTICSMSG}}

diff --git a/etc/html/default/digest/mockup.html b/etc/html/default/digest/mockup.html index fca5ed0..950dd79 100755 --- a/etc/html/default/digest/mockup.html +++ b/etc/html/default/digest/mockup.html @@ -77,38 +77,33 @@

March 30, 2018 – April 06, 2018

- -
California Apartment Association
+ +
EMRL
 +
- -
Scan passed ✔ - -
99.40% uptime - -
2.33s latency - - - +

Scan passed ◢
+

100% uptime ◢
+

1.54s latency ◢
+

Happy Monday and welcome back!

-

You had traffic from 4275 organic searches last week. Not bad!

+

You had 215 hits in the last week.

Here's a summary of code updates made to your website last week:

-
-commit ecd2340
+
+commit 8a8dff7
Author: Joe Horning
-Date: Thu, 5 Apr 2018 02:01:34 -0700 (2 days ago)

-Updated 6 of 6 plugins (instapage 3.2.3, jetpack 6.0, pardot 1.4.6, relevanssi 4.0.7, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)
- -
-commit 46a7bbe
-Author: Corey Worrell
-Date: Fri, 30 Mar 2018 18:07:27 -0700 (7 days ago)

-emrl-base update
+Date: Thu, 5 Apr 2018 02:05:46 -0700 (2 days ago)

+Updated 2 of 2 plugins (advanced-custom-fields-pro 5.6.10, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)
- Looking for more? Check out your project's stats page. + Looking for more? Check out your project's stats page.
diff --git a/etc/html/default/scan/header.html b/etc/html/default/scan/header.html index 00cab13..84080ca 100755 --- a/etc/html/default/scan/header.html +++ b/etc/html/default/scan/header.html @@ -56,7 +56,7 @@ - diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index 010a3b4..068c84d 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -69,13 +69,20 @@

Weekly overview

+
-
{{SCAN_MSG}} ◢ +

{{SCAN_MSG}} ◢
-
{{UPTIME}}% uptime ◢ +

{{UPTIME}}% uptime ◢
-
{{LATENCY}}s latency ◢ +

{{LATENCY}}s latency ◢
+ diff --git a/lib/scan.sh b/lib/scan.sh index 66e8477..a0384f7 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -55,11 +55,12 @@ function scan_host() { cp "${scanFile}" ~/verbose_scan.txt # Create and clean up the log - sed -i 's/^.*Running/Running/' "${scanFile}" - sed -i 's/^.*Loaded/Loaded/' "${scanFile}" - sed -i '/^V\:/d' "${scanFile}" - sed -i '/^Running average\: Not enough data/d' "${scanFile}" - sed -i "s/: currently in plugin 'Nikto Tests'//" "${scanFile}" + sed -i -e 's/^.*Running/Running/' "${scanFile}" \ + -e 's/^.*Loaded/Loaded/' \ + -e '/^V\:/d' \ + -e '/^Running average\: Not enough data/d' \ + -e "s/: currently in plugin 'Nikto Tests'//" \ + "${scanFile}" # Strip redirects, can get very spammy on a Wordpress project sed -i '/Redirects (301) to/d' "${scanFile}" @@ -76,6 +77,7 @@ function scan_host() { sed -i -n '/Scan Summary/q;p' "${scan_html}" sed -i '1,5d' "${scan_html}" sed -i '/OSVDB/d' "${scan_html}" + sed -i 's^ Date: Sun, 8 Apr 2018 11:38:45 -0700 Subject: [PATCH 056/334] Improved digest emails on Windows 10 Mail --- etc/html/default/digest/header.html | 6 +++--- etc/html/default/scan/header.html | 6 +++--- etc/html/default/stats/index.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html index 8f35c33..b74b7ef 100755 --- a/etc/html/default/digest/header.html +++ b/etc/html/default/digest/header.html @@ -85,11 +85,11 @@

-

{{SCAN_MSG}} ◢
+

{{SCAN_MSG}} ◢
-

{{UPTIME}}% uptime ◢
+

{{UPTIME}}% uptime ◢
-

{{LATENCY}}s latency ◢
+

{{LATENCY}}s latency ◢
-

{{SCAN_MSG}} ◢
+

{{SCAN_MSG}} ◢
-

{{UPTIME}}% uptime ◢
+

{{UPTIME}}% uptime ◢
-

{{LATENCY}}s latency ◢
+

{{LATENCY}}s latency ◢
-

{{SCAN_MSG}} ◢
+

{{SCAN_MSG}} ◢
-

{{UPTIME}}% uptime ◢
+

{{UPTIME}}% uptime ◢
-

{{LATENCY}}s latency ◢
+

{{LATENCY}}s latency ◢
+ + + + + + + diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index ae61e9c..40a547f 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -74,11 +74,13 @@

-

{{SCAN_MSG}} ◢
+

{{SCAN_MSG}} ◢
-

{{UPTIME}}% uptime ◢
+

{{UPTIME}}% uptime ◢
-

{{LATENCY}}s latency ◢
+

{{LATENCY}}s latency ◢
+ +

{{LAST_BACKUP}} ◢
- {{PROJCLIENT}} + {{PROJCLIENT}}

Date: {{NOW}}
Project: {{PROJNAME}} ({{PROJCLIENT}})
Staging URL: {{DEVURL}}
Production URL: {{PRODURL}}

-
Uptime: {{UPTIME}}%
-
Latency: {{LATENCY}}s
+
Uptime: {{UPTIME}}% ◢
+
Latency: {{LATENCY}}s ◢
\ No newline at end of file diff --git a/etc/html/default/remote/warning.png b/etc/html/default/remote/warning.png new file mode 100755 index 0000000000000000000000000000000000000000..741aba5532000142c6da9a9e0b09fc65ee8eb879 GIT binary patch literal 1857 zcma)5eK^zW8~<*IO?J(@pO>0cb0l&ozlm*5mY8=crSh`rWh!qWrA(c}*h(zNs>4DZ zZ;?fbDT-O^crBf?Xk=nKF{T&a8r%8m_xJC*&U0PQb3fPp+|PaApU>xca)ScA^^oRB z008uSc6o(Bwqs@Ltb*2%H^;Rh^Pf|s@Kd4jhfk$NC&dDu)cBZKjL(VaBe5Z|(bV)r zQLH-vteWug@(epYJR^~uu<$k#C?=m04;_R{JP%~;zVI^34IK)5mE{|R@X@XAkasvd zxqH5_rNfSA_2iFbPD#E}sc|7nR9H3cv6vw58~kF0=8PK90RRr@02tu^Zk*G<$(ohp zy}s`zq7e6t)rtjqC)nSdlNL#cFh-$sKTghm22&qcYND%^V+Teh=NHRH6ch}7i$r}r zKMT12LA67cSv@kw;$HMmXcQ3IM%6Bl<(avT#m%n8dJ5B80c`)fPfY1tcYle!q4rUp za;;FFsTa>8;fQhW>%X;Q=u*DA;r%(n1bNhgX+R{q%Rg;}oUQ7HY7YnS#RPc20a5<| ztn4lgHDe~xYjAgMRrSdM42`fi%b9bk?XxYvjyFwv*FJ~Qq-6thTJT+?%Q*$I-t4i3 z!%L+YdV++jize=ts2@jc`|_LA7ViVxHdP0KX^6}&3Fu4&NcU1_aKG?uVMZg%IsS9A zD1vWBA&@t#+N`pNcTgACx~WSK?#oEBIe<76xfIv0v=`v4Q9+uOs|D&d>(u>MHK?;H zq5K<%V%LSm5x1>zUj=6jL#g5svg9r-0;8M1Mi=Hat0Ge_SEIR2h|xMQ`I1NF7L!SU zpWx5{^828C4LcUcew^YU6+WmdEbaUPpgdJw_x-|p`g}=|F1q7)2*Rc~s8w)1?D(Fg z9phuW!2tml5oPFWbv7W{-WRA{Ve(NOxEIY`Pk$vDnTNS|xX)N>Ms{hS||L>E^)nWqd6z^iPhIC=95 z(KPDq)1djSI-BT72$GH!cjltWiUc%uc|H2dM7fiBCm%4;BX6Y6c=-L3gQ08YZ=F8bV=O^&MZ&sDr5_%$>F zHjJ;)l%8VH!W#_>2#>CDWNh}gM0g#=G3F*R>-9c^H zDZ^L&GO)UmMA(@EPy(rSS;rygl!~_e`q8Q8&gUs-keCYuhYz39T(k$43m%!=(;@cg z6ACutUmvkmmCZ|f^$F}rIU8r$AvSa@h_!F6g`{wLB3FnWSwWGcSI5vw(!}C<*Js;l$so#9FSZm-u9&>q@U`in} za?E0R6y){B#f8Ei-mo!f{3^jJUl=2A-Qo2@G%-rVF8J5+VbFJG;$j@PF#}Id0^Oxz zc5l6Noe7;|^CQnEBS}{~L15bQ-y_B=jz%|pdU)`X>JH8~>J@iimsJUKZ1XZ=0tO2R*MTPYJ2LT;&Jc0-SFhCPP1OIvx ctMI480Ik2ZH{1{p`2o=IAq9BV{}grMALYMgvH$=8 literal 0 HcmV?d00001 diff --git a/etc/html/default/scan/header.html b/etc/html/default/scan/header.html index 9f5b446..2a8c822 100755 --- a/etc/html/default/scan/header.html +++ b/etc/html/default/scan/header.html @@ -69,20 +69,6 @@

{{SCAN_RESULT}}

- -
-

{{SCAN_MSG}} ◢
- -

{{UPTIME}}% uptime ◢
- -

{{LATENCY}}s latency ◢
-
- diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index 40a547f..93081a1 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -60,7 +60,7 @@

Site Smart BETA

-

Weekly report generated {{NOW}}

+

Report generated {{NOW}}

{{PROJNAME}} ({{PRODURL}})

@@ -68,7 +68,7 @@

-

Weekly overview

+

Overview (last 7 days)

/d" "${logFile}" - sed -i "/0m/d" "${logFile}" - sed -i "/Resolving deltas:/d" "${logFile}" - sed -i "/remote:/d" "${logFile}" - sed -i "/Receiving objects:/d" "${logFile}" - sed -i "/Resolving deltas:/d" "${logFile}" + sed -i -e "/----->/d" "${logFile}" \ + -e "/0m/d" "${logFile}" \ + -e "/Resolving deltas:/d" "${logFile}" \ + -e "/remote:/d" "${logFile}" \ + -e "/Receiving objects:/d" "${logFile}" \ + -e "/Resolving deltas:/d" "${logFile}" \ + -e "/No Kerberos credentials available/d" \ + "${logFile}" # If incognito, remove this stuff for privacy if [[ "${INCOGNITO}" == "TRUE" ]]; then diff --git a/lib/scan.sh b/lib/scan.sh index 409783a..4a205e0 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -79,7 +79,7 @@ function scan_host() { sed -i '/<\/div>/d' "${scan_html}" sed -i 's^class=\"dataTable\"^style=\"width: 100%; max-width: 600px;\">

+

Site Scan BETA

@@ -69,13 +69,20 @@

{{SCAN_RESULT}}

+
-
{{SCAN_MSG}} ◢ +

{{SCAN_MSG}} ◢
-
{{UPTIME}}% uptime ◢ +

{{UPTIME}}% uptime ◢
-
{{LATENCY}}s latency ◢ +

{{LATENCY}}s latency ◢
+
Date: Thu, 3 May 2018 10:20:06 -0700 Subject: [PATCH 062/334] Improved speed of malware scans --- lib/scan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scan.sh b/lib/scan.sh index 4a205e0..c8e12b1 100755 --- a/lib/scan.sh +++ b/lib/scan.sh @@ -50,7 +50,7 @@ function scan_host() { # Run the scan trace "Scanning ${PRODURL}..." if [[ -z "${NIKTO_PROXY}" ]]; then - "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" & + "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" & spinner $! else "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scanFile}" & From 804d0c25032908a61b7f285af1c260b8fac6dac4 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 3 May 2018 10:30:28 -0700 Subject: [PATCH 063/334] Release 3.7 --- CHANGELOG.md | 6 +++--- README.md | 3 ++- deploy.sh | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbacee7..7c9478c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [3.7] - 05-03-2018 ### Added - Digests now include information about recent malware scans, uptime, latency, and backup stats - Invoice creation is now available via [InvoiceNinja](https://www.invoiceninja.org/)'s API using `deploy --invoice` @@ -204,8 +204,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Old monolithic script rewritten -[Unreleased]: https://github.com/EMRL/deploy/compare/v3.6.7...HEAD -[3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.6.8 +[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7...HEAD +[3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7 [3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...v3.6.7 [3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...v3.6.6 [3.6.5]: https://github.com/EMRL/deploy/compare/v3.6.4...v3.6.5 diff --git a/README.md b/README.md index 353bcc8..62d1d71 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Deploy -[![release](https://img.shields.io/badge/release-v3.6.7-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) +[![release](https://img.shields.io/badge/release-v3.7-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest) [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy) `deploy` is designed to speed up, automate, and integrate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. @@ -49,6 +49,7 @@ Other Options: --slack-test Test Slack integration --post-test Test webhook integration --analytics-test Test Google Analytics authentication + --monitor-test Test production server uptime and latency monitoring --function-list Output a list of all functions() --variable-list Output a project's declared variables ``` diff --git a/deploy.sh b/deploy.sh index a40f33d..2a55c88 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.7-beta.3" +VERSION="3.7" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -147,7 +147,7 @@ Other Options: --analytics-test Test Google Analytics authentication --monitor-test Test production server uptime and latency monitoring --function-list Output a list of all functions() - --variable-list Output a project's declared variables + --variable-list Output a project's declared variables More information at https://github.com/EMRL/deploy " From 7da996596f521aa4f750276cbb20c36b726ac07d Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 3 May 2018 10:34:37 -0700 Subject: [PATCH 064/334] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c9478c..c6fbb12 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -205,7 +205,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). [Unreleased]: https://github.com/EMRL/deploy/compare/v3.7...HEAD -[3.6.8]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7 +[3.7]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7 [3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...v3.6.7 [3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...v3.6.6 [3.6.5]: https://github.com/EMRL/deploy/compare/v3.6.4...v3.6.5 From e77d15cbe3edce3cf46da96e0a074eac7a26f34e Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Wed, 16 May 2018 13:43:41 -0700 Subject: [PATCH 065/334] Added --build switch --- CHANGELOG.md | 4 ++++ README.md | 3 ++- deploy.sh | 8 ++++---- lib/git.sh | 5 +++++ lib/package-manager.sh | 2 +- lib/utilities.sh | 5 +++++ 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c9478c..24419a9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Added +- Added `deploy --build [project name]` for quickly building project assets + ## [3.7] - 05-03-2018 ### Added - Digests now include information about recent malware scans, uptime, latency, and backup stats diff --git a/README.md b/README.md index 62d1d71..beb869c 100755 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Other Options: --automate For unattended deployment via cron --approve Approve and deploy queued code changes --deny Deny queued code changes + --build Build project assets --digest Create and send weekly digest --report Create a monthly activity report --no-check Override active file and server checks @@ -51,7 +52,7 @@ Other Options: --analytics-test Test Google Analytics authentication --monitor-test Test production server uptime and latency monitoring --function-list Output a list of all functions() - --variable-list Output a project's declared variables + --variable-list Output a project's declared variables ``` [![asciicast](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP.png)](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP?t=0) diff --git a/deploy.sh b/deploy.sh index 2a55c88..f8c00d2 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,7 +10,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.7" +VERSION="3.7.1-dev" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -27,7 +27,7 @@ set -uo pipefail # Startup switches read -r APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \ SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \ - DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST PROJSTATS UNLOCK \ + DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST BUILD PROJSTATS UNLOCK \ SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN \ CHECK_BACKUP <<< "" echo "${APP} ${UPGRADE} ${SKIPUPDATE} ${CURRENT} ${VERBOSE} ${QUIET} ${STRICT} @@ -130,6 +130,7 @@ Other Options: --automate For unattended deployment via cron --approve Approve and deploy queued code changes --deny Deny queued code changes + --build Build project assets --digest Create and send weekly digest --report Create a monthly activity report --no-check Override active file and server checks @@ -209,6 +210,7 @@ while [[ ${1:-unset} = -?* ]]; do --analytics-test) ANALYTICSTEST="1" ;; --monitor-test) MONITORTEST="1" ;; --stats) PROJSTATS="1" ;; + --build) BUILD="1"; NOCHECK="1"; FORCE="1" ;; --invoice) CREATE_INVOICE="1" ;; --unlock) UNLOCK="1" ;; --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;; @@ -361,8 +363,6 @@ if [[ "${VARIABLELIST}" == "1" ]]; then ( set -o posix ; set ) | cat -v; quickExit fi - - # Spam all the things! trace "Version ${VERSION}" if [[ "${INCOGNITO}" != "TRUE" ]]; then diff --git a/lib/git.sh b/lib/git.sh index e4d5b0c..ee51637 100755 --- a/lib/git.sh +++ b/lib/git.sh @@ -12,6 +12,11 @@ gitLock="${WORKPATH}/${APP}/.git/index.lock" # Make sure we're in a git repository. function gitStart() { + # If this is just a build, we won't require git repo functions + if [[ "${BUILD}" == "1" ]]; then + return 0 + fi + # Directory exists? if [[ ! -d "${WORKPATH}/${APP}" ]]; then info "${WORKPATH}/${APP} is not a valid directory." diff --git a/lib/package-manager.sh b/lib/package-manager.sh index 6ca656b..9ac408b 100755 --- a/lib/package-manager.sh +++ b/lib/package-manager.sh @@ -36,7 +36,7 @@ function pkgMgr() { trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found." notice "Found npm configuration!" - if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then + if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck if [[ "${VERBOSE}" == "TRUE" ]]; then diff --git a/lib/utilities.sh b/lib/utilities.sh index 661c4f9..2b2f7f4 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -24,6 +24,11 @@ function go() { console "deploy ${VERSION}" + # Build only + if [[ "${BUILD}" == "1" ]]; then + pkgMgr; quietExit + fi + if [[ "${INCOGNITO}" != "TRUE" ]]; then console "Current working path is ${WORKPATH}/${APP}" fi From fb9acbcfd2e711636bacdb516b2881f29e06c705 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 29 May 2018 12:44:20 -0700 Subject: [PATCH 066/334] Redundant build steps are now skipped --- CHANGELOG.md | 1 + lib/package-manager.sh | 118 ++++++++++++++++++++++++----------------- 2 files changed, 70 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4e8414..5f342e2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Added `deploy --build [project name]` for quickly building project assets +- If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step. ## [3.7] - 05-03-2018 ### Added diff --git a/lib/package-manager.sh b/lib/package-manager.sh index 9ac408b..b5c72fb 100755 --- a/lib/package-manager.sh +++ b/lib/package-manager.sh @@ -5,55 +5,75 @@ ############################################################################### # Checks if project uses node.js or grunt, and runs package manager if needed. ############################################################################### -trace "Loading package management" +trace "Loading build management" + +# Initialize variables +read -r deploy_config SKIP_BUILD <<< "" +echo "${deploy_config} ${SKIP_BUILD}" > /dev/null function pkgMgr() { - if [[ "${FORCE}" != "1" ]]; then - if [[ "${UPGRADE}" != "1" ]]; then - - # Checking for app/lib, which assumes we're using Grunt - if [[ -f "${WORKPATH}/${APP}/Gruntfile.coffee" ]]; then - notice "Found grunt configuration!" - - if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then - cd "${WORKPATH}"/"${APP}" || errorCheck - - if [[ "${VERBOSE}" == "TRUE" ]]; then - /usr/local/bin/grunt build --force 2>&1 | tee --append "${trshFile}" - else - /usr/local/bin/grunt build --force &>> "${trshFile}" & - spinner $! - info "Packages successfully compiled." - fi - else - info "Skipping Grunt..." - fi - else - sleep 1 - - # node.js check - if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then - trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found." - notice "Found npm configuration!" - - if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then - cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck - - if [[ "${VERBOSE}" == "TRUE" ]]; then - npm run build | tee --append "${trshFile}" - else - npm run build &>> "${trshFile}" & - spinner $! - info "Packages successfully compiled." - fi - else - info "Skipping Node Package Manager..." - fi - else - # info "No package management needed." - trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/$APP/package.json not found, skipping." - fi - fi - fi - fi + if [[ "${FORCE}" != "1" ]] || [[ "${BUILD}" == "1" ]]; then + if [[ "${UPGRADE}" != "1" ]]; then + + # Checking for app/lib, which assumes we're using Grunt + if [[ -f "${WORKPATH}/${APP}/Gruntfile.coffee" ]]; then + notice "Found grunt configuration!" + + if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then + cd "${WORKPATH}"/"${APP}" || errorCheck + + if [[ "${VERBOSE}" == "TRUE" ]]; then + /usr/local/bin/grunt build --force 2>&1 | tee --append "${trshFile}" + else + /usr/local/bin/grunt build --force &>> "${trshFile}" & + spinner $! + info "Packages successfully compiled." + fi + else + info "Skipping Grunt..." + fi + else + sleep 1 + + # node.js check + if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then + trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found." + notice "Found npm configuration!" + + check_build_method + if [[ "${SKIP_BUILD}" == "1" ]]; then + return + fi + + if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then + cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck + + if [[ "${VERBOSE}" == "TRUE" ]]; then + npm run build | tee --append "${trshFile}" + else + npm run build &>> "${trshFile}" & + spinner $! + info "Packages successfully compiled." + fi + else + info "Skipping Node Package Manager..." + fi + else + # info "No package management needed." + trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/$APP/package.json not found, skipping." + fi + fi + fi + fi +} + +# Check deployment method, and determine if it includes a build upon each +# deployment. +function check_build_method() { + if [[ "${DEPLOY}" == *"mina"* ]]; then + deploy_config="$(cat ${WORKPATH}/${APP}/Minafile)" + if [[ "${deploy_config}" =~ "npm run build" ]] && [[ "${BUILD}" != "1" ]]; then + SKIP_BUILD="1" + fi + fi } From 8f1527fe53d92982c1f8ea5a475e0c23e41efd5f Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Tue, 29 May 2018 12:46:13 -0700 Subject: [PATCH 067/334] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f342e2..d58163a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Added `deploy --build [project name]` for quickly building project assets -- If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step. +- If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step ## [3.7] - 05-03-2018 ### Added From bec5963f72489c347e6613009b25b7fa86661832 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 31 May 2018 11:16:46 -0700 Subject: [PATCH 068/334] Test email improvements --- CHANGELOG.md | 2 + deploy.sh | 32 ++-- lib/mail-log.sh | 368 +++++++++++++++++++++++++++-------------- lib/package-manager.sh | 111 +++++++------ 4 files changed, 319 insertions(+), 194 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d58163a..2f7443f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Added - Added `deploy --build [project name]` for quickly building project assets +### Changed - If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step +- Test emails now contain more project information ## [3.7] - 05-03-2018 ### Added diff --git a/deploy.sh b/deploy.sh index f8c00d2..c50d2f6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -55,13 +55,13 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \ POSTEMAILHEAD POSTEMAILTAIL POSTTOSLACK SLACKURL SLACKERROR POSTURL NOKEY \ PROJNAME PROJCLIENT DEVURL PRODURL REPO MASTER PRODUCTION COMMITMSG DEPLOY \ DONOTDEPLOY TASK CHECKBRANCH ACTIVECHECK CHECKTIME GARBAGE WFCHECK ACFKEY \ - WFOFF REMOTELOG REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK \ - DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPASS SCPCMD \ - SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME \ - SCPPORT TASKUSER CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \ - REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO \ - REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION USER_VERSION \ - PROJECT_VERSION <<< "" + WFOFF REMOTELOG REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL \ + DIGESTSLACK DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST \ + SCPHOSTPATH SCPHOSTPORT SCPPASS SCPCMD SSHCMD LOGMSG EXPIRELOGS SERVERCHECK \ + STASH MAILPATH REQUIREAPPROVAL ADDTIME SCPPORT TASKUSER CLIENTID \ + CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \ + PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \ + INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION <<< "" echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} @@ -69,15 +69,15 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} ${POSTEMAILTAIL} ${POSTTOSLACK} ${SLACKURL} ${SLACKERROR} ${POSTURL} ${NOKEY} ${PROJNAME} ${PROJCLIENT} ${DEVURL} ${PRODURL} ${REPO} ${MASTER} ${PRODUCTION} ${COMMITMSG} ${DEPLOY} ${DONOTDEPLOY} ${TASK} ${CHECKBRANCH} ${ACTIVECHECK} - ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} ${REMOTETEMPLATE} - ${LOCALHOSTPOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} ${DIGESTSLACK} ${DIGESTURL} - ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER} ${SCPHOST} - ${SCPHOSTPATH} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} ${EXPIRELOGS} - ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} ${ADDTIME} ${TASKUSER} - ${SCPPORT} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} ${AUTHORIZATIONCODE} ${ACCESSTOKEN} - ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} - ${CLIENTCONTACT} ${INCLUDEHOSTING} ${GLOBAL_VERSION} ${USER_VERSION} - ${PROJECT_VERSION}" > /dev/null + ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} + ${REMOTETEMPLATE} ${LOCALHOSTPOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} + ${DIGESTSLACK} ${DIGESTURL} ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER} + ${SCPHOST} ${SCPHOSTPATH} ${SCPPORT} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG} + ${EXPIRELOGS} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} + ${ADDTIME} ${TASKUSER} ${SCPPORT} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI} + ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} + ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING} + ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION}" > /dev/null # Internal variables read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \ urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \ diff --git a/lib/mail-log.sh b/lib/mail-log.sh index 295022d..b81032e 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -79,76 +79,133 @@ function email_test() { echo "Current user is ${DEV}

"; echo echo "Project Information
" - [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}
" + [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}
" [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}
" - [[ -n "${CLIENTLOGO}" ]] && echo "Logo: ${CLIENTLOGO}
" - [[ -n "${DIGESTEMAIL}" ]] && echo "Digest email(s): ${DIGESTEMAIL}
" - [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}
" - [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}
" + [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}
" + [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}
" echo "
" # Git if [[ -n "${REPO}" ]] || [[ -n "${MASTER}" ]] || [[ -n "${PRODUCTION}" ]] || [[ -n "${AUTOMERGE}" ]] || [[ -n "${STASH}" ]] || [[ -n "${CHECKBRANCH}" ]]; then - echo "Git Configuration
" - [[ -n "${REPO}" ]] && echo "Repo: ${REPOHOST}/${REPO}
" - [[ -n "${MASTER}" ]] && echo "Master branch: ${MASTER}
" - [[ -n "${PRODUCTION}" ]] && echo "Production branch: ${PRODUCTION}
" - [[ -n "${AUTOMERGE}" ]] && echo "Auto merge: ${AUTOMERGE}
" - [[ -n "${STASH}" ]] && echo "File Stashing: ${STASH}
" - [[ -n "${CHECKBRANCH}" ]] && echo "Force branch checking: ${CHECKBRANCH}
" - echo "
" - fi - # Wordpress - if [[ -n "${WPROOT}" ]] || [[ -n "${WPAPP}" ]] || [[ -n "${WPSYSTEM}" ]]; then - echo "Wordpress Setup
" - [[ -n "${WPROOT}" ]] && echo "Wordpress root: ${WPROOT}
" - [[ -n "${WPAPP}" ]] && echo "Wordpress application: ${WPAPP}
" - [[ -n "${WPSYSTEM}" ]] && echo "Wordpress system: ${WPSYSTEM}
" - echo "
" - fi - # Deployment - if [[ -n "${DEPLOY}" ]] || [[ -n "${DONOTDEPLOY}" ]]; then - echo "Deployment Configuration
" - [[ -n "${DEPLOY}" ]] && echo "Deploy command: ${DEPLOY}
" - [[ -n "${DONOTDEPLOY}" ]] && echo "Disallow deployment: ${DONOTDEPLOY}
" - echo "
" - fi - # Integration - if [[ -n "${TASK}" ]] || [[ -n "${TASKUSER}" ]] || [[ -n "${ADDTIME}" ]] || [[ -n "${POSTTOSLACK}" ]] || [[ -n "${SLACKERROR}" ]] || [[ -n "${PROFILEID}" ]] || [[ -n "${POSTURL}" ]]; then - echo "Integration
" - [[ -n "${TASK}" ]] && echo "Task #: ${TASK}
" - [[ -n "${TASKUSER}" ]] && echo "Task user: ${TASKUSER}
" - [[ -n "${ADDTIME}" ]] && echo "Task time: ${ADDTIME}
" - [[ -n "${POSTTOSLACK}" ]] && echo "Post to Slack: ${POSTTOSLACK}
" - [[ -n "${SLACKERROR}" ]] && echo "Post errors to Slack: ${SLACKERROR}
" - [[ -n "${POSTURL}" ]] && echo "Webhook URL: ${POSTURL}
" - [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}
" - echo "
" - fi + echo "Git Configuration
" + [[ -n "${REPO}" ]] && echo "Repo: ${REPOHOST}/${REPO}
" + [[ -n "${MASTER}" ]] && echo "Master branch: ${MASTER}
" + [[ -n "${PRODUCTION}" ]] && echo "Production branch: ${PRODUCTION}
" + [[ -n "${AUTOMERGE}" ]] && echo "Auto merge: ${AUTOMERGE}
" + [[ -n "${STASH}" ]] && echo "File Stashing: ${STASH}
" + [[ -n "${CHECKBRANCH}" ]] && echo "Force branch checking: ${CHECKBRANCH}
" + echo "
" + fi + # Wordpress + if [[ -n "${WPROOT}" ]] || [[ -n "${WPAPP}" ]] || [[ -n "${WPSYSTEM}" ]]; then + echo "Wordpress Setup
" + [[ -n "${WPROOT}" ]] && echo "Wordpress root: ${WPROOT}
" + [[ -n "${WPAPP}" ]] && echo "Wordpress application: ${WPAPP}
" + [[ -n "${WPSYSTEM}" ]] && echo "Wordpress system: ${WPSYSTEM}
" + echo "
" + fi + # Deployment + if [[ -n "${DEPLOY}" ]] || [[ -n "${DONOTDEPLOY}" ]]; then + echo "Deployment Configuration
" + [[ -n "${DEPLOY}" ]] && echo "Deploy command: ${DEPLOY}
" + [[ -n "${DONOTDEPLOY}" ]] && echo "Disallow deployment: ${DONOTDEPLOY}
" + echo "
" + fi + # Notifications + if [[ -n "${TASK}" ]] || [[ -n "${TASKUSER}" ]] || [[ -n "${ADDTIME}" ]] || [[ -n "${POSTTOSLACK}" ]] || [[ -n "${SLACKERROR}" ]] || [[ -n "${PROFILEID}" ]] || [[ -n "${POSTURL}" ]]; then + echo "Notifications
" + [[ -n "${TASK}" ]] && echo "Task #: ${TASK}
" + [[ -n "${TASKUSER}" ]] && echo "Task user: ${TASKUSER}
" + [[ -n "${ADDTIME}" ]] && echo "Task time: ${ADDTIME}
" + [[ -n "${POSTTOSLACK}" ]] && echo "Post to Slack: ${POSTTOSLACK}
" + [[ -n "${SLACKERROR}" ]] && echo "Post errors to Slack: ${SLACKERROR}
" + [[ -n "${POSTURL}" ]] && echo "Webhook URL: ${POSTURL}
" + [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}
" + echo "
" + fi + # Logging + if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then + echo "Logging
" + [[ -n "${TO}" ]] && echo "Send to: ${TO}
" + [[ -n "${HTMLTEMPLATE}" ]] && echo "Email template: ${HTMLTEMPLATE}
" + [[ -n "${CLIENTLOGO}" ]] && echo "Logo: ${CLIENTLOGO}
" + [[ -n "${COVER}" ]] && echo "Cover image: ${COVER}
" + [[ -n "${INCOGNITO}" ]] && echo "Logo: ${INCOGNITO}
" + [[ -n "${REMOTELOG}" ]] && echo "Web logs: ${REMOTELOG}
" + [[ -n "${REMOTEURL}" ]] && echo "Address: ${REMOTEURL}
" + [[ -n "${EXPIRELOGS}" ]] && echo "Log expiration: ${EXPIRELOGS} days
" + [[ -n "${REMOTETEMPLATE}" ]] && echo "Log template: ${REMOTETEMPLATE}
" + [[ -n "${SCPPOST}" ]] && echo "Post with SCP/SSH: ${SCPPOST}
" + [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}
" + [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}
" + [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}
" + [[ -n "${SCPHOSTPORT}" ]] && echo "Remote log path: ${SCPHOSTPORT}
" + [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}
" + [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH
" + echo "
" + fi + # Weekly Digests + if [[ -n "${DIGESTEMAIL}" ]]; then + echo "Weekly Digests
" + [[ -n "${DIGESTEMAIL}" ]] && echo "Send to: ${DIGESTEMAIL}
" + echo "
" + fi + # Monthly Reporting + if [[ -n "${CLIENTCONTACT}" ]] || [[ -n "${INCLUDEHOSTING}" ]]; then + echo "Monthly Reporting
" + [[ -n "${CLIENTCONTACT}" ]] && echo "Client contact: ${CLIENTCONTACT}
" + [[ -n "${INCLUDEHOSTING}" ]] && echo "Hosting notes: ${INCLUDEHOSTING}
" + echo "
" + fi + # Invoice Ninja integration + if [[ -n "${IN_HOST}" ]] || [[ -n "${IN_TOKEN}" ]] || [[ -n "${IN_CLIENT_ID}" ]] || [[ -n "${IN_PRODUCT}" ]] || [[ -n "${IN_ITEM_COST}" ]] || [[ -n "${IN_ITEM_QTY}" ]] || [[ -n "${IN_NOTES}" ]] || [[ -n "${IN_NOTES}" ]]; then + echo "Invoice Ninja Integration
" + [[ -n "${IN_HOST}" ]] && echo "Host: ${IN_HOST}
" + [[ -n "${IN_TOKEN}" ]] && echo "Token: ${IN_TOKEN}
" + [[ -n "${IN_CLIENT_ID}" ]] && echo "Client ID: ${IN_CLIENT_ID}
" + [[ -n "${IN_PRODUCT}" ]] && echo "Product: ${IN_PRODUCT}
" + [[ -n "${IN_ITEM_COST}" ]] && echo "Item cost: ${IN_ITEM_COST}
" + [[ -n "${IN_ITEM_QTY}" ]] && echo "Item quantity: ${IN_ITEM_QTY}
" + [[ -n "${IN_NOTES}" ]] && echo "Notes: ${IN_NOTES}
" + echo "
" + fi + # Google Analytics + if [[ -n "${CLIENTID}" ]] || [[ -n "${CLIENTSECRET}" ]] || [[ -n "${REDIRECTURI}" ]] || [[ -n "${AUTHORIZATIONCODE}" ]] || [[ -n "${ACCESSTOKEN}" ]] || [[ -n "${REFRESHTOKEN}" ]] || [[ -n "${PROFILEID}" ]]; then + echo "Google Analytics
" + [[ -n "${CLIENTID}" ]] && echo "Client ID: ${CLIENTID}
" + [[ -n "${CLIENTSECRET}" ]] && echo "Client secret: ${CLIENTSECRET}
" + [[ -n "${REDIRECTURI}" ]] && echo "Redirect URI: ${REDIRECTURI}
" + [[ -n "${AUTHORIZATIONCODE}" ]] && echo "Authorization code: ${AUTHORIZATIONCODE}
" + [[ -n "${ACCESSTOKEN}" ]] && echo "Access token: ${ACCESSTOKEN}
" + [[ -n "${REFRESHTOKEN}" ]] && echo "Refresh token: ${REFRESHTOKEN}
" + [[ -n "${PROFILEID}" ]] && echo "Profile ID: ${PROFILEID}
" + echo "
" + fi # Server monitoring if [[ -n "${MONITORURL}" ]] || [[ -n "${MONITORUSER}" ]] || [[ -n "${SERVERID}" ]]; then echo "Server Monitoring
" - [[ -n "${TASK}" ]] && echo "Monitor URL: ${MONITORURL}
" - [[ -n "${TASK}" ]] && echo "User: ${MONITORUSER}
" - [[ -n "${TASK}" ]] && echo "Server ID: ${SERVERID}
" + [[ -n "${MONITORURL}" ]] && echo "Monitor URL: ${MONITORURL}
" + [[ -n "${MONITORUSER}" ]] && echo "User: ${MONITORUSER}
" + [[ -n "${SERVERID}" ]] && echo "Server ID: ${SERVERID}
" + echo "
" + fi + # Dropbox integration + if [[ -n "${DB_API_TOKEN}" ]] || [[ -n "${DB_BACKUP_PATH}" ]]; then + echo "Dropbox Integration
" + [[ -n "${DB_API_TOKEN}" ]] && echo "Token: ${DB_API_TOKEN}
" + [[ -n "${DB_BACKUP_PATH}" ]] && echo "Backup path: ${DB_BACKUP_PATH}
" + echo "
" + fi + # Malware scanning + if [[ -n "${NIKTO}" ]] || [[ -n "${NIKTO_CONFIG}" ]] || [[ -n "${NIKTO_PROXY}" ]]; then + echo "Malware Scanning
" + [[ -n "${NIKTO}" ]] && echo "Scanner: ${NIKTO}
" + [[ -n "${NIKTO_CONFIG}" ]] && echo "Configuration path: ${NIKTO_CONFIG}
" + [[ -n "${NIKTO_PROXY}" ]] && echo "Proxy: ${NIKTO_PROXY}
" echo "
" fi - # Logging - if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then - echo "Logging
" - [[ -n "${REMOTELOG}" ]] && echo "Web logs: ${REMOTELOG}
" - [[ -n "${REMOTEURL}" ]] && echo "Address: ${REMOTEURL}
" - [[ -n "${EXPIRELOGS}" ]] && echo "Log expiration: ${EXPIRELOGS} days
" - [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}
" - [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH
" - [[ -n "${SCPPOST}" ]] && echo "Post with SCP/SSH: ${SCPPOST}
" - [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}
" - [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}
" - [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}
" - [[ -n "${REMOTETEMPLATE}" ]] && echo "Log template: ${REMOTETEMPLATE}
" - echo "
" - fi ) | "${MAILPATH}"/sendmail -t - # Send Text mail + + # Send text mail ( echo "Sender: ${FROM}" echo "From: ${FROM} <${FROM}>" @@ -162,81 +219,141 @@ function email_test() { echo echo "Project Information" echo "-------------------" - [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}" + [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}" [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}" - [[ -n "${CLIENTLOGO}" ]] && echo "Logo: ${CLIENTLOGO}" - [[ -n "${DIGESTEMAIL}" ]] && echo "Digest email(s): ${DIGESTEMAIL}" [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}" [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}" echo # Git if [[ -n "${REPO}" ]] || [[ -n "${MASTER}" ]] || [[ -n "${PRODUCTION}" ]] || [[ -n "${AUTOMERGE}" ]] || [[ -n "${STASH}" ]] || [[ -n "${CHECKBRANCH}" ]]; then - echo "Git Configuration" - echo "-----------------" - [[ -n "${REPO}" ]] && echo "Repo: ${REPOHOST}/${REPO}" - [[ -n "${MASTER}" ]] && echo "Master branch: ${MASTER}" - [[ -n "${PRODUCTION}" ]] && echo "Production branch: ${PRODUCTION}" - [[ -n "${AUTOMERGE}" ]] && echo "Auto merge: ${AUTOMERGE}" - [[ -n "${STASH}" ]] && echo "File Stashing: ${STASH}" - [[ -n "${CHECKBRANCH}" ]] && echo "Force branch checking: ${CHECKBRANCH}" - echo - fi - # Wordpress - if [[ -n "${WPROOT}" ]] || [[ -n "${WPAPP}" ]] || [[ -n "${WPSYSTEM}" ]]; then - echo "Wordpress Setup" - echo "---------------" - [[ -n "${WPROOT}" ]] && echo "Wordpress root: ${WPROOT}" - [[ -n "${WPAPP}" ]] && echo "Wordpress application: ${WPAPP}" - [[ -n "${WPSYSTEM}" ]] && echo "Wordpress system: ${WPSYSTEM}" - echo - fi - # Deployment - if [[ -n "${DEPLOY}" ]] || [[ -n "${DONOTDEPLOY}" ]]; then - echo "Deployment Configuration" - echo "------------------------" - [[ -n "${DEPLOY}" ]] && echo "Deploy command: ${DEPLOY}" - [[ -n "${DONOTDEPLOY}" ]] && echo "Disallow deployment: ${DONOTDEPLOY}" - echo - fi - # Integration - if [[ -n "${TASK}" ]] || [[ -n "${TASKUSER}" ]] || [[ -n "${ADDTIME}" ]] || [[ -n "${POSTTOSLACK}" ]] || [[ -n "${SLACKERROR}" ]] || [[ -n "${PROFILEID}" ]] || [[ -n "${POSTURL}" ]]; then - echo "Integration" - echo "-----------" - [[ -n "${TASK}" ]] && echo "Task #: ${TASK}" - [[ -n "${TASKUSER}" ]] && echo "Task user: ${TASKUSER}" - [[ -n "${ADDTIME}" ]] && echo "Task time: ${ADDTIME}" - [[ -n "${POSTTOSLACK}" ]] && echo "Post to Slack: ${POSTTOSLACK}" - [[ -n "${SLACKERROR}" ]] && echo "Post errors to Slack: ${SLACKERROR}" - [[ -n "${POSTURL}" ]] && echo "Webhook URL: ${POSTURL}" - [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}" - echo - fi + echo "Git Configuration" + echo "-----------------" + [[ -n "${REPO}" ]] && echo "Repo: ${REPOHOST}/${REPO}" + [[ -n "${MASTER}" ]] && echo "Master branch: ${MASTER}" + [[ -n "${PRODUCTION}" ]] && echo "Production branch: ${PRODUCTION}" + [[ -n "${AUTOMERGE}" ]] && echo "Auto merge: ${AUTOMERGE}" + [[ -n "${STASH}" ]] && echo "File Stashing: ${STASH}" + [[ -n "${CHECKBRANCH}" ]] && echo "Force branch checking: ${CHECKBRANCH}" + echo + fi + # Wordpress + if [[ -n "${WPROOT}" ]] || [[ -n "${WPAPP}" ]] || [[ -n "${WPSYSTEM}" ]]; then + echo "Wordpress Setup" + echo "---------------" + [[ -n "${WPROOT}" ]] && echo "Wordpress root: ${WPROOT}" + [[ -n "${WPAPP}" ]] && echo "Wordpress application: ${WPAPP}" + [[ -n "${WPSYSTEM}" ]] && echo "Wordpress system: ${WPSYSTEM}" + echo + fi + # Deployment + if [[ -n "${DEPLOY}" ]] || [[ -n "${DONOTDEPLOY}" ]]; then + echo "Deployment Configuration" + echo "------------------------" + [[ -n "${DEPLOY}" ]] && echo "Deploy command: ${DEPLOY}" + [[ -n "${DONOTDEPLOY}" ]] && echo "Disallow deployment: ${DONOTDEPLOY}" + echo + fi + # Notifications + if [[ -n "${TASK}" ]] || [[ -n "${TASKUSER}" ]] || [[ -n "${ADDTIME}" ]] || [[ -n "${POSTTOSLACK}" ]] || [[ -n "${SLACKERROR}" ]] || [[ -n "${PROFILEID}" ]] || [[ -n "${POSTURL}" ]]; then + echo "Notifications" + echo "-------------" + [[ -n "${TASK}" ]] && echo "Task #: ${TASK}" + [[ -n "${TASKUSER}" ]] && echo "Task user: ${TASKUSER}" + [[ -n "${ADDTIME}" ]] && echo "Task time: ${ADDTIME}" + [[ -n "${POSTTOSLACK}" ]] && echo "Post to Slack: ${POSTTOSLACK}" + [[ -n "${SLACKERROR}" ]] && echo "Post errors to Slack: ${SLACKERROR}" + [[ -n "${POSTURL}" ]] && echo "Webhook URL: ${POSTURL}" + [[ -n "${PROFILEID}" ]] && echo "Google Analytics ID: ${PROFILEID}" + echo + fi + # Logging + if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then + echo "Logging" + echo "-------" + [[ -n "${TO}" ]] && echo "Send to: ${TO}" + [[ -n "${HTMLTEMPLATE}" ]] && echo "Email template: ${HTMLTEMPLATE}" + [[ -n "${CLIENTLOGO}" ]] && echo "Logo: ${CLIENTLOGO}" + [[ -n "${COVER}" ]] && echo "Cover image: ${COVER}" + [[ -n "${INCOGNITO}" ]] && echo "Logo: ${INCOGNITO}" + [[ -n "${REMOTELOG}" ]] && echo "Web logs: ${REMOTELOG}" + [[ -n "${REMOTEURL}" ]] && echo "Address: ${REMOTEURL}" + [[ -n "${EXPIRELOGS}" ]] && echo "Log expiration: ${EXPIRELOGS} days" + [[ -n "${REMOTETEMPLATE}" ]] && echo "Log template: ${REMOTETEMPLATE}" + [[ -n "${SCPPOST}" ]] && echo "Post with SCP/SSH: ${SCPPOST}" + [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}" + [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}" + [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}" + [[ -n "${SCPHOSTPORT}" ]] && echo "Remote log path: ${SCPHOSTPORT}" + [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}" + [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH" + echo + fi + # Weekly Digests + if [[ -n "${DIGESTEMAIL}" ]]; then + echo "Weekly Digests" + echo "--------------" + [[ -n "${DIGESTEMAIL}" ]] && echo "Send to: ${DIGESTEMAIL}" + echo + fi + # Monthly Reporting + if [[ -n "${CLIENTCONTACT}" ]] || [[ -n "${INCLUDEHOSTING}" ]]; then + echo "Monthly Reporting" + echo "-----------------" + [[ -n "${CLIENTCONTACT}" ]] && echo "Client contact: ${CLIENTCONTACT}" + [[ -n "${INCLUDEHOSTING}" ]] && echo "Hosting notes: ${INCLUDEHOSTING}" + echo + fi + # Invoice Ninja integration + if [[ -n "${IN_HOST}" ]] || [[ -n "${IN_TOKEN}" ]] || [[ -n "${IN_CLIENT_ID}" ]] || [[ -n "${IN_PRODUCT}" ]] || [[ -n "${IN_ITEM_COST}" ]] || [[ -n "${IN_ITEM_QTY}" ]] || [[ -n "${IN_NOTES}" ]] || [[ -n "${IN_NOTES}" ]]; then + echo "Invoice Ninja Integration" + [[ -n "${IN_HOST}" ]] && echo "Host: ${IN_HOST}" + [[ -n "${IN_TOKEN}" ]] && echo "Token: ${IN_TOKEN}" + [[ -n "${IN_CLIENT_ID}" ]] && echo "Client ID: ${IN_CLIENT_ID}" + [[ -n "${IN_PRODUCT}" ]] && echo "Product: ${IN_PRODUCT}" + [[ -n "${IN_ITEM_COST}" ]] && echo "Item cost: ${IN_ITEM_COST}" + [[ -n "${IN_ITEM_QTY}" ]] && echo "Item quantity: ${IN_ITEM_QTY}" + [[ -n "${IN_NOTES}" ]] && echo "Notes: ${IN_NOTES}" + echo + fi + # Google Analytics + if [[ -n "${CLIENTID}" ]] || [[ -n "${CLIENTSECRET}" ]] || [[ -n "${REDIRECTURI}" ]] || [[ -n "${AUTHORIZATIONCODE}" ]] || [[ -n "${ACCESSTOKEN}" ]] || [[ -n "${REFRESHTOKEN}" ]] || [[ -n "${PROFILEID}" ]]; then + echo "Google Analytics" + echo "----------------" + [[ -n "${CLIENTID}" ]] && echo "Client ID: ${CLIENTID}" + [[ -n "${CLIENTSECRET}" ]] && echo "Client secret: ${CLIENTSECRET}" + [[ -n "${REDIRECTURI}" ]] && echo "Redirect URI: ${REDIRECTURI}" + [[ -n "${AUTHORIZATIONCODE}" ]] && echo "Authorization code: ${AUTHORIZATIONCODE}" + [[ -n "${ACCESSTOKEN}" ]] && echo "Access token: ${ACCESSTOKEN}" + [[ -n "${REFRESHTOKEN}" ]] && echo "Refresh token: ${REFRESHTOKEN}" + [[ -n "${PROFILEID}" ]] && echo "Profile ID: ${PROFILEID}" + echo + fi # Server monitoring if [[ -n "${MONITORURL}" ]] || [[ -n "${MONITORUSER}" ]] || [[ -n "${SERVERID}" ]]; then echo "Server Monitoring" echo "-----------------" - [[ -n "${TASK}" ]] && echo "Monitor URL: ${MONITORURL}" - [[ -n "${TASK}" ]] && echo "User: ${MONITORUSER}" - [[ -n "${TASK}" ]] && echo "Server ID: ${SERVERID}" + [[ -n "${MONITORURL}" ]] && echo "Monitor URL: ${MONITORURL}" + [[ -n "${MONITORUSER}" ]] && echo "User: ${MONITORUSER}" + [[ -n "${SERVERID}" ]] && echo "Server ID: ${SERVERID}" + echo + fi + # Dropbox integration + if [[ -n "${DB_API_TOKEN}" ]] || [[ -n "${DB_BACKUP_PATH}" ]]; then + echo "Dropbox Integration" + echo "-------------------" + [[ -n "${DB_API_TOKEN}" ]] && echo "Token: ${DB_API_TOKEN}" + [[ -n "${DB_BACKUP_PATH}" ]] && echo "Backup path: ${DB_BACKUP_PATH}" + echo + fi + # Malware scanning + if [[ -n "${NIKTO}" ]] || [[ -n "${NIKTO_CONFIG}" ]] || [[ -n "${NIKTO_PROXY}" ]]; then + echo "Malware Scanning" + echo "----------------" + [[ -n "${NIKTO}" ]] && echo "Scanner: ${NIKTO}" + [[ -n "${NIKTO_CONFIG}" ]] && echo "Configuration path: ${NIKTO_CONFIG}" + [[ -n "${NIKTO_PROXY}" ]] && echo "Proxy: ${NIKTO_PROXY}" echo fi - # Logging - if [[ -n "${REMOTELOG}" ]] || [[ -n "${REMOTEURL}" ]] || [[ -n "${EXPIRELOGS}" ]] || [[ -n "${LOCALHOSTPOST}" ]] || [[ -n "${LOCALHOSTPATH}" ]] || [[ -n "${SCPPOST}" ]] || [[ -n "${SCPUSER}" ]] || [[ -n "${SCPHOST}" ]] || [[ -n "${SCPHOSTPATH}" ]] || [[ -n "${SCPPASS}" ]] || [[ -n "${REMOTETEMPLATE}" ]] || [[ -n "${REMOTETEMPLATE}" ]]; then - echo "Logging" - echo "-------" - [[ -n "${REMOTELOG}" ]] && echo "Web logs: ${REMOTELOG}" - [[ -n "${REMOTEURL}" ]] && echo "Address: ${REMOTEURL}" - [[ -n "${EXPIRELOGS}" ]] && echo "Log expiration: ${EXPIRELOGS} days" - [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}" - [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH" - [[ -n "${SCPPOST}" ]] && echo "Post with SCP/SSH: ${SCPPOST}" - [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}" - [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}" - [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}" - [[ -n "${REMOTETEMPLATE}" ]] && echo "Log template: ${REMOTETEMPLATE}s" - echo - fi - ) | "${MAILPATH}"/sendmail -t fi @@ -258,6 +375,11 @@ function email_test() { echo echo "This is a test email integration from deploy ${VERSION}" echo "(https://github.com/EMRL/deploy/)" + echo + [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}" + [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}" + [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}" + [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}" ) | "${MAILPATH}"/sendmail -t quietExit else diff --git a/lib/package-manager.sh b/lib/package-manager.sh index b5c72fb..d33dc0b 100755 --- a/lib/package-manager.sh +++ b/lib/package-manager.sh @@ -3,7 +3,7 @@ # package-manager # ############################################################################### -# Checks if project uses node.js or grunt, and runs package manager if needed. +# Checks if project uses node.js or grunt, and builds assets if needed. ############################################################################### trace "Loading build management" @@ -12,68 +12,69 @@ read -r deploy_config SKIP_BUILD <<< "" echo "${deploy_config} ${SKIP_BUILD}" > /dev/null function pkgMgr() { - if [[ "${FORCE}" != "1" ]] || [[ "${BUILD}" == "1" ]]; then - if [[ "${UPGRADE}" != "1" ]]; then + if [[ "${FORCE}" != "1" ]] || [[ "${BUILD}" == "1" ]]; then + if [[ "${UPGRADE}" != "1" ]]; then - # Checking for app/lib, which assumes we're using Grunt - if [[ -f "${WORKPATH}/${APP}/Gruntfile.coffee" ]]; then - notice "Found grunt configuration!" + # Checking for app/lib, which assumes we're using Grunt + if [[ -f "${WORKPATH}/${APP}/Gruntfile.coffee" ]]; then + notice "Found grunt configuration!" - if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then - cd "${WORKPATH}"/"${APP}" || errorCheck - - if [[ "${VERBOSE}" == "TRUE" ]]; then - /usr/local/bin/grunt build --force 2>&1 | tee --append "${trshFile}" - else - /usr/local/bin/grunt build --force &>> "${trshFile}" & - spinner $! - info "Packages successfully compiled." - fi - else - info "Skipping Grunt..." - fi - else - sleep 1 + if [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then + cd "${WORKPATH}"/"${APP}" || errorCheck + + if [[ "${VERBOSE}" == "TRUE" ]]; then + /usr/local/bin/grunt build --force 2>&1 | tee --append "${trshFile}" + else + /usr/local/bin/grunt build --force &>> "${trshFile}" & + spinner $! + info "Packages successfully compiled." + fi + else + info "Skipping Grunt..." + fi + else + sleep 1 - # node.js check - if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then - trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found." - notice "Found npm configuration!" + # node.js check + if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then + trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found." - check_build_method - if [[ "${SKIP_BUILD}" == "1" ]]; then - return - fi + check_build_method + if [[ "${SKIP_BUILD}" == "1" ]]; then + return + fi + + notice "Found npm configuration!" + if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then + cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck - if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then - cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck - - if [[ "${VERBOSE}" == "TRUE" ]]; then - npm run build | tee --append "${trshFile}" - else - npm run build &>> "${trshFile}" & - spinner $! - info "Packages successfully compiled." - fi - else - info "Skipping Node Package Manager..." - fi - else - # info "No package management needed." - trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/$APP/package.json not found, skipping." - fi - fi - fi - fi + if [[ "${VERBOSE}" == "TRUE" ]]; then + npm run build | tee --append "${trshFile}" + else + npm run build &>> "${trshFile}" & + spinner $! + info "Packages successfully compiled." + fi + else + info "Skipping Node Package Manager..." + fi + else + # info "No package management needed." + trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/$APP/package.json not found, skipping." + fi + fi + fi + fi } # Check deployment method, and determine if it includes a build upon each # deployment. function check_build_method() { - if [[ "${DEPLOY}" == *"mina"* ]]; then - deploy_config="$(cat ${WORKPATH}/${APP}/Minafile)" - if [[ "${deploy_config}" =~ "npm run build" ]] && [[ "${BUILD}" != "1" ]]; then - SKIP_BUILD="1" - fi - fi + if [[ "${DEPLOY}" == *"mina"* ]]; then + # Trying this a weirdo way, turn it into a loop or something later + [[ -f "${WORKPATH}/${APP}/Minafile" ]] && deploy_config="$(cat ${WORKPATH}/${APP}/Minafile)" + if [[ "${deploy_config}" =~ "npm run build" ]] && [[ "${BUILD}" != "1" ]]; then + SKIP_BUILD="1" + fi + fi } From 5b7efde60c9048873c4e3b95ca64c63720ccae97 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 31 May 2018 11:44:04 -0700 Subject: [PATCH 069/334] Fixed bug with server monitor test --- CHANGELOG.md | 2 ++ lib/utilities.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f7443f..9628166 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step - Test emails now contain more project information +### Fixed +- Trapped an error that prevented `deploy --monitor-test [project]` from working ## [3.7] - 05-03-2018 ### Added diff --git a/lib/utilities.sh b/lib/utilities.sh index 2b2f7f4..cb0dc40 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -17,8 +17,12 @@ function go() { tput cnorm; fi - # Weird spot for this stuff I know - server_monitor + # Get some project data for the logs; we only want to get server monitor + # info if we're not running a monitor test since we already loaded the + # password file contents into a variable + if [[ "${MONITORTEST}" != "1" ]]; then + server_monitor + fi scan_check check_backup From acbbf80cbee7be6630730cee236ce6a536f2888b Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 31 May 2018 13:14:34 -0700 Subject: [PATCH 070/334] Email log improvements --- etc/html/default/approval.php | 2 +- etc/html/default/approve.html | 2 +- etc/html/default/error.html | 2 +- etc/html/default/success.html | 2 +- lib/process-html.sh | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/etc/html/default/approval.php b/etc/html/default/approval.php index 7820028..bc57500 100755 --- a/etc/html/default/approval.php +++ b/etc/html/default/approval.php @@ -133,4 +133,4 @@ function approved()
- 

+							  				

diff --git a/etc/html/default/approve.html b/etc/html/default/approve.html
index 3016d05..f75aacf 100755
--- a/etc/html/default/approve.html
+++ b/etc/html/default/approve.html
@@ -20,4 +20,4 @@
- 

+			  		

diff --git a/etc/html/default/error.html b/etc/html/default/error.html
index 5288396..73087db 100755
--- a/etc/html/default/error.html
+++ b/etc/html/default/error.html
@@ -16,4 +16,4 @@
- 

+							

diff --git a/etc/html/default/success.html b/etc/html/default/success.html
index 787a54e..3664460 100755
--- a/etc/html/default/success.html
+++ b/etc/html/default/success.html
@@ -17,4 +17,4 @@
- 

\ No newline at end of file
+				  			

\ No newline at end of file
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 11cd70e..6c84afc 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -32,6 +32,15 @@ function process_html() {
     sed -i '/ANALYTICS/d' "${htmlFile}"
   fi
 
+  # Prettify errors, warning, and successes
+  sed -i -e '/ERROR/s/$/<\/span>/' \
+    -e '/^ERROR/s/^//' \
+    -e '/WARNING/s/$/<\/span>/' \
+    -e '/^WARNING/s/^//' \
+    -e '/SUCCESS/s/$/<\/span>/' \
+    -e '/^SUCCESS/s/^//' \
+    "${htmlFile}"
+
   # Get to work
   sed -i -e "s^{{VIEWPORT}}^${VIEWPORT}^g" \
     -e "s^{{NOW}}^${NOW}^g" \

From a13b0460cd32aeaa01aac77eaed0a57591087eda Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 31 May 2018 13:26:43 -0700
Subject: [PATCH 071/334] A few more tweaks

---
 CHANGELOG.md                  | 1 +
 etc/html/default/success.html | 2 +-
 etc/html/default/theme.conf   | 2 ++
 lib/process-html.sh           | 8 +++++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9628166..d23c859 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step
 - Test emails now contain more project information
+- Improved readability of HTML log files
 ### Fixed
 - Trapped an error that prevented `deploy --monitor-test [project]` from working
 
diff --git a/etc/html/default/success.html b/etc/html/default/success.html
index 3664460..53fc33b 100755
--- a/etc/html/default/success.html
+++ b/etc/html/default/success.html
@@ -17,4 +17,4 @@
- + + 

\ No newline at end of file
+				  			

diff --git a/etc/html/default/theme.conf b/etc/html/default/theme.conf
index ecd4e28..d4affdb 100755
--- a/etc/html/default/theme.conf
+++ b/etc/html/default/theme.conf
@@ -12,6 +12,8 @@ SUCCESSC="#28a745"
 INFOC="#5D6D7E"
 WARNINGC="#FFC107"
 DANGERC="#CC2233"
+LOGC="#ffffff"
+LOGB="#33403a"
 
 # If you'd like to add Smooch.io live chat to your digest and statistics pages, 
 # enter your App ID below
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 6c84afc..d6e37a5 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -9,7 +9,7 @@ trace "Loading html handling"
 
 # Initialize variables 
 read -r DEFAULTC PRIMARYC SECONDARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID \
-  COVER SCANC UPTIMEC LATENCYC <<< ""
+  COVER SCANC UPTIMEC LATENCYC LOGC LOGBC <<< ""
 echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} 
   ${SMOOCHID} ${COVER} ${SCANC} ${UPTIMEC} ${LATENCYC}" > /dev/null
 
@@ -36,9 +36,9 @@ function process_html() {
   sed -i -e '/ERROR/s/$/<\/span>/' \
     -e '/^ERROR/s/^//' \
     -e '/WARNING/s/$/<\/span>/' \
-    -e '/^WARNING/s/^//' \
+    -e '/^WARNING/s/^//' \
     -e '/SUCCESS/s/$/<\/span>/' \
-    -e '/^SUCCESS/s/^//' \
+    -e '/^SUCCESS/s/^//' \
     "${htmlFile}"
 
   # Get to work
@@ -72,6 +72,8 @@ function process_html() {
     -e "s^{{INFO}}^${INFOC}^g" \
     -e "s^{{WARNING}}^${WARNINGC}^g" \
     -e "s^{{DANGER}}^${DANGERC}^g" \
+    -e "s^{{LOG}}^${LOGC}^g" \
+    -e "s^{{LOGBACKGROUND}}^${LOGBC}^g" \
     -e "s^{{SCAN_STATUS}}^${SCANC}^g" \
     -e "s^{{UPTIME_STATUS}}^${UPTIMEC}^g" \
     -e "s^{{LATENCY_STATUS}}^${LATENCYC}^g" \

From 0810fb3f02f13f3e814776535b373bfe5bfe8a51 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:38:54 -0700
Subject: [PATCH 072/334] Update test.sh

---
 test/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.sh b/test/test.sh
index 789fb46..d0f197a 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -4,6 +4,6 @@ testEquality() {
 	assertEquals 1 1
 }
 
-. shunit2-2.0.3/src/shell/shunit2
+. shunit2/shunit2
 
 

From 331b43c176e52c2417b347ed96c72283610290d2 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:39:43 -0700
Subject: [PATCH 073/334] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0858cf4..e0e880e 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: bash
 
 before_script:
-    - curl -L "http://downloads.sourceforge.net/shunit2/shunit2-2.0.3.tgz" | tar zx
+    - git clone git@github.com:kward/shunit2.git
     - wget https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh
 
 script:

From de18872dfdb73e62f5a752a9b3919b45a8683587 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:42:37 -0700
Subject: [PATCH 074/334] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e0e880e..ce370bf 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: bash
 
 before_script:
-    - git clone git@github.com:kward/shunit2.git
+    - git clone https://github.com/kward/shunit2.git
     - wget https://raw.github.com/lehmannro/assert.sh/v1.1/assert.sh
 
 script:

From d999b375d872029de186de432445a1d5f2baf60f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:46:32 -0700
Subject: [PATCH 075/334] Update .travis.yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ce370bf..12d4cca 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,5 @@ before_script:
 script:
     - bash test/test.sh
     - bash test/extended.sh
+    - bash install/doinst.sh
+    - bash /usr/local/bin/deploy --version

From d550c2301d1ecf479eaa238a4e7f8b5772f61e98 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:48:38 -0700
Subject: [PATCH 076/334] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 12d4cca..393000e 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,5 @@ before_script:
 script:
     - bash test/test.sh
     - bash test/extended.sh
-    - bash install/doinst.sh
+    - bash sudo install/doinst.sh
     - bash /usr/local/bin/deploy --version

From 965b7e8233f47dc22e9ff6adf556b54dfb31fae0 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:55:39 -0700
Subject: [PATCH 077/334] Update .travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 393000e..df3afd3 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: bash
+sudo: required
 
 before_script:
     - git clone https://github.com/kward/shunit2.git

From 204bf8f5931028f1841c92684c1d209b52268643 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:55:51 -0700
Subject: [PATCH 078/334] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index df3afd3..210b5ad 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: bash
-sudo: required
+sudo: enabled
 
 before_script:
     - git clone https://github.com/kward/shunit2.git

From b64b71aab0271439b89cde2d978b18ddb75b8f2b Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 12:57:29 -0700
Subject: [PATCH 079/334] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 210b5ad..717c107 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,5 @@ before_script:
 script:
     - bash test/test.sh
     - bash test/extended.sh
-    - bash sudo install/doinst.sh
+    - sudo bash install/doinst.sh
     - bash /usr/local/bin/deploy --version

From 75c2be75e8669bb8c70082a96797472a312beef4 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 13:03:28 -0700
Subject: [PATCH 080/334] Touchup default HTML theme

---
 CHANGELOG.md                | 1 +
 etc/html/default/theme.conf | 2 +-
 install/doinst.sh           | 4 ++--
 lib/deployment.sh           | 3 ++-
 lib/process-html.sh         | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d23c859..b7e3129 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step
 - Test emails now contain more project information
 - Improved readability of HTML log files
+- Improved unit testing
 ### Fixed
 - Trapped an error that prevented `deploy --monitor-test [project]` from working
 
diff --git a/etc/html/default/theme.conf b/etc/html/default/theme.conf
index d4affdb..13d06da 100755
--- a/etc/html/default/theme.conf
+++ b/etc/html/default/theme.conf
@@ -13,7 +13,7 @@ INFOC="#5D6D7E"
 WARNINGC="#FFC107"
 DANGERC="#CC2233"
 LOGC="#ffffff"
-LOGB="#33403a"
+LOGBC="#272727"
 
 # If you'd like to add Smooch.io live chat to your digest and statistics pages, 
 # enter your App ID below
diff --git a/install/doinst.sh b/install/doinst.sh
index 75c8b14..dd70576 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -87,10 +87,10 @@ else
 fi
 
 # Declare dependencies
-dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sendmail sleep tee tput)
+dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sleep tee tput)
 
 # Declare optional stuff
-options=(gitchart grunt npm scp ssh sshpass wget wkhtmltopdf wp)
+options=(gitchart grunt npm scp sendmail ssh sshpass wget wkhtmltopdf wp)
 
 message=''
 fg_red="$(tput setaf 1)"
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 3b5754f..51c9fc4 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -151,7 +151,8 @@ function postDeploy() {
       # info "Deployment Success."
     else
       info ""
-      if yesno --default yes "Deployment succeeded, but something unexpected happened. View status? [Y/n] "; then
+      warning "Deployment succeeded, but something unexpected happened."
+      if yesno --default yes "View status? [Y/n] "; then
         git status
       fi
     fi
diff --git a/lib/process-html.sh b/lib/process-html.sh
index d6e37a5..8c87f8c 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -39,6 +39,8 @@ function process_html() {
     -e '/^WARNING/s/^//' \
     -e '/SUCCESS/s/$/<\/span>/' \
     -e '/^SUCCESS/s/^//' \
+    -e '/Deployed to/s/$/<\/span>/' \
+    -e '/^Deployed to/s/^//' \
     "${htmlFile}"
 
   # Get to work

From 99a0fb105d8570945ec568ba6cb95e92a534bcb5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 21 Jun 2018 13:51:04 -0700
Subject: [PATCH 081/334] Better sendmail checking

---
 lib/mail-log.sh | 16 ++++++++++++++--
 lib/main.sh     |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index b81032e..fd68197 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -11,6 +11,12 @@ function mailLog() {
   # Only send email if a commit has been made, an approval is required, or there has been an error
   if [[ -n "${COMMITHASH}" ]] || [[ "${message_state}" == "ERROR" ]] || [[ "${message_state}" == "APPROVAL NEEDED" ]] || [[ "${AUTOMATE}" == "1" ]]; then
 
+    # Make sure sendmail exists and is configured 
+    if [[ ! -f "${MAILPATH}/sendmail" ]]; then
+      empty_line; warning "Sendmail misconfigured or not found."
+      quietExit
+    fi
+
     # If using --current, use the REPO value instead of the APP (current directory)
     if [[ "${CURRENT}" == "1" ]]; then
       APP="${REPO}"
@@ -62,9 +68,15 @@ function mailLog() {
 
 function email_test() {
   console "Testing email..."
+
+  # Confirm we have a recipient address
   if [[ -z "${TO}" ]]; then
-    warning "No recipient address found."; empty_line
-    clean_up; exit 1
+    empty_line; warning "No recipient address found."
+    quietExit
+  # Make sure sendmail exists and is configured 
+  elif [[ ! -f "${MAILPATH}/sendmail" ]]; then
+    empty_line; warning "Sendmail misconfigured or not found."
+    quietExit
   else
     # Send HTML mail
     (
diff --git a/lib/main.sh b/lib/main.sh
index 9f42631..6ada921 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -6,7 +6,7 @@
 # The main application
 ###############################################################################
 
-function main() {
+function main() { 
   dependency_check  # Check that required commands are available
   release_check     # Check for newer version at Github
   env_check         # Check for configuration files that need updating

From ab9673d651f1c69b037a05c88c93b6913048168a Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 22 Jun 2018 10:50:27 -0700
Subject: [PATCH 082/334] Improved success messages

---
 CHANGELOG.md            |  1 +
 lib/deployment.sh       | 11 ++++++-----
 lib/post-integration.sh |  1 -
 lib/quit.sh             |  1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7e3129..509fddb 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Test emails now contain more project information
 - Improved readability of HTML log files
 - Improved unit testing
+- Cleaned up language for more consistency
 ### Fixed
 - Trapped an error that prevented `deploy --monitor-test [project]` from working
 
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 51c9fc4..78d19f0 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -74,7 +74,7 @@ function pkgDeploy() {
     if [[ "${REQUIREAPPROVAL}" != "TRUE" ]]; then
 
       # If we don't require approval to push to live, keep going
-      if [[ "${FORCE}" = "1" ]] || yesno --default yes "Deploy to live server? [Y/n] "; then
+      if [[ "${FORCE}" == "1" ]] || yesno --default yes "Deploy to live server? [Y/n] "; then
 
         # Test deployment command before running
         if [[ "${DEPLOY}" != "SCP" ]]; then
@@ -160,13 +160,14 @@ function postDeploy() {
     # Run integration hooks
     postCommit
     # This needs a check.
-    if [[ "${APPROVE}" == "1" ]] || [[ "${REQUIREAPPROVAL}" != "TRUE" ]]; then
+    if [[ "${APPROVE}" == "1" ]]; then
+    	info "Deployment queued for approval."
+    else
       if [[ -z "${PRODURL}" ]]; then
-        warning "No production URL configured."
-        info "Successfully deployed."
+        warning "No production URL configured, but deployment command ran successfully."
       else
         info "Deployed to ${PRODURL}"
       fi
     fi
   fi
-} 
+}
diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index 2fb4593..a2ebd40 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -76,7 +76,6 @@ function postCommit() {
   # Check for a Wordpress core update, update production database if needed
   if [[ "${UPDCORE}" == "1" ]] && [[ -n "${PRODUCTION}" ]] && [[ -n "${PRODURL}" ]] && [[ -n "${DEPLOY}" ]]; then
     info "Upgrading production database..."; curl --silent "${PRODURL}${WPSYSTEM}"/wp-admin/upgrade.php?step=1 >/dev/null 2>&1
-
   fi
 
   # Just for yuks, display git stats for this user (user can override this if it annoys them)
diff --git a/lib/quit.sh b/lib/quit.sh
index 3aceb9a..2a58588 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -59,7 +59,6 @@ function safeExit() {
     slackPost
   else
     if [[ "${POSTTOSLACK}" == "TRUE" ]]; then
-      trace "Posting to Slack"
       build_log; slackPost > /dev/null 2>&1
     fi
   fi

From 80442f45f47c18346c0f5e79d7810405902e0bf6 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 22 Jun 2018 12:11:17 -0700
Subject: [PATCH 083/334] Added TERSE logging

---
 CHANGELOG.md            |  1 +
 deploy.sh               |  4 ++--
 etc/deploy-example.conf |  4 ++++
 lib/env-check.sh        |  2 +-
 lib/error-check.sh      |  4 +---
 lib/log-handling.sh     | 27 ++++++++++++++++++++++++++-
 lib/ssh-check.sh        |  2 +-
 7 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 509fddb..4c502c8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 - Added `deploy --build [project name]` for quickly building project assets
+- Option to set `TERSE="TRUE"` in `deploy.conf` for slightly cleaner log files 
 ### Changed
 - If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step
 - Test emails now contain more project information
diff --git a/deploy.sh b/deploy.sh
index c50d2f6..6991e6f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -61,7 +61,7 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \
   STASH MAILPATH REQUIREAPPROVAL ADDTIME SCPPORT TASKUSER CLIENTID \
   CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \
   PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \
-  INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION <<< ""
+  INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE <<< ""
 echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} 
   ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} 
   ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} 
@@ -77,7 +77,7 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI}
   ${ADDTIME} ${TASKUSER} ${SCPPORT} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI}
   ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} 
   ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING} 
-  ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION}" > /dev/null
+  ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION} ${TERSE}" > /dev/null
 # Internal variables
 read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \
   urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \
diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf
index 7718644..d3afc39 100755
--- a/etc/deploy-example.conf
+++ b/etc/deploy-example.conf
@@ -197,6 +197,10 @@ GLOBAL_VERSION="3.7"
 # log files that are emailed upon deployment.
 # NOPHP="{{NOPHP}}" 
 
+# If you are not debugging your deploy install, you should probably set TERSE 
+# to "TRUE", which will keep your log files from including debug information.
+# TERSE="{{TERSE}}"
+  
 # IF INCOGNITO is set to true, log files as well as verbose output to screen 
 # will be stripped of details such as email addresses and system file paths.
 # INCOGNITO="{{INCOGNITO}}"
diff --git a/lib/env-check.sh b/lib/env-check.sh
index 8667fd8..ff4f2db 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -75,7 +75,7 @@ function update_global() {
     FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP FIXINDEX \
     MAILPATH TO FROM SUBJECT EMAILERROR EMAILSUCCESS EMAILQUIT SHORTEMAIL \
     EMAILHTML HTMLTEMPLATE FROMDOMAIN FROMUSER POSTEMAILHEAD POSTEMAILTAIL \
-    POSTTOSLACK SLACKURL SLACKERROR POSTURL NOPHP INCOGNITO REMOTELOG \
+    POSTTOSLACK SLACKURL SLACKERROR POSTURL NOPHP TERSE INCOGNITO REMOTELOG \
     REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST SCPHOSTPATH SCPPORT \
     SCPPASS LOCALHOSTPOST LOCALHOSTPATH EXPIRELOGS)
 
diff --git a/lib/error-check.sh b/lib/error-check.sh
index bc86554..6be1200 100755
--- a/lib/error-check.sh
+++ b/lib/error-check.sh
@@ -24,8 +24,6 @@ function error_status() {
   if [[ "${EXITCODE}" != 0 ]]; then 
     error_msg="WARNING: Error code ${EXITCODE}"
     trace "${error_msg}"
-  else
-    trace "OK"
   fi
 }
 
@@ -71,7 +69,7 @@ function deploy_check() {
 
     if [[ "${SSHSTATUS}" == *"ok"* ]] ; then
       # Continue deploying
-      trace "OK"
+      trace "${SSHTARGET}: OK"
     elif [[ "${SSHSTATUS}" == *"Permission denied"* ]] ; then
       # Not authorized, no key etc.
       error "Connection refused for ${SSHTARGET}"
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index cf23fcb..8895077 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -67,12 +67,37 @@ function makeLog() {
     sed -i "/debug1:/d" "${logFile}"
   fi
 
-  # Filter raw log output as configured by user
+  # Filter PHP log output as configured by user
   if [[ "${NOPHP}" == "TRUE" ]]; then
     grep -vE "(PHP |Notice:|Warning:|Strict Standards:)" "${logFile}" > "${postFile}"
     cat "${postFile}" > "${logFile}"
   fi
 
+  # If logs should be terse, remove some more stuff
+  if [[ "${TERSE}" == "TRUE" ]]; then
+    sed -i -e '/Loading/d'  \
+      -e "/Enabled/d" "${logFile}" \
+      -e "/enabled/d" "${logFile}" \
+      -e "/Current user/d" "${logFile}" \
+      -e "/Current project/d" "${logFile}" \
+      -e "/Project workpath/d" "${logFile}" \
+      -e "/Locking process/d" "${logFile}" \
+      -e "/Running from/d" "${logFile}" \
+      -e "/lock/d" "${logFile}" \
+      -e "/Checking for deploy updates/d" "${logFile}" \
+      -e "/Log file is/d" "${logFile}" \
+      -e "/lock/d" "${logFile}" \
+      "${logFile}"
+  fi
+
+  # Remove double line breaks
+  sed -i '/^$/d' "${logFile}"
+
+  # Replace empty lines where we want
+  sed -i -e '/Checking servers/s/^/\n/' \
+    -e '/Launching deployment/s/^/\n/' \
+    "${logFile}"
+
   # Is this a publish only?
   if [[ "${PUBLISH}" == "1" ]] && [[ -z "${notes}" ]]; then   
     notes="Published to production and marked as deployed"
diff --git a/lib/ssh-check.sh b/lib/ssh-check.sh
index cb44293..1ac5598 100755
--- a/lib/ssh-check.sh
+++ b/lib/ssh-check.sh
@@ -24,7 +24,7 @@ function ssh_check() {
       if [[ "${EXITCODE}" != "0" ]]; then
         error "git@github.org: SSH check failed (Error code ${EXITCODE})"
       else
-        [[ "${SSHTEST}" == "1" ]] && console "git@bitbucket.org: OK"
+        [[ "${SSHTEST}" == "1" ]] && console "git@github.org: OK"
         trace "git@github.org: OK"
       fi
     fi

From a70cb8028b65a2a3478f27fdb5a701e092ff737e Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 22 Jun 2018 12:33:43 -0700
Subject: [PATCH 084/334] Logfile cleanup

---
 CHANGELOG.md            |  2 +-
 deploy.sh               |  2 +-
 etc/.deployrc           |  2 +-
 etc/deploy-example.conf |  2 +-
 etc/deploy.sh           |  2 +-
 lib/log-handling.sh     | 32 ++++++++++++++++++++------------
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c502c8..ece9514 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - If a project is using `mina` and configured to build assets on every deployment, `deploy` will skip the redunant build step
 - Test emails now contain more project information
-- Improved readability of HTML log files
+- Improved readability of log files
 - Improved unit testing
 - Cleaned up language for more consistency
 ### Fixed
diff --git a/deploy.sh b/deploy.sh
index 6991e6f..c328754 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -10,7 +10,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.7.1-dev"
+VERSION="3.7.1-rc"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"
diff --git a/etc/.deployrc b/etc/.deployrc
index fbd237f..2b68b04 100755
--- a/etc/.deployrc
+++ b/etc/.deployrc
@@ -11,7 +11,7 @@
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-USER_VERSION="3.6.7"
+USER_VERSION="3.7.1"
 
 # Clear screen on startup, when not running with --quiet or --verbose switch
 # CLEARSCREEN="{{CLEARSCREEN}}"
diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf
index d3afc39..8dda96b 100755
--- a/etc/deploy-example.conf
+++ b/etc/deploy-example.conf
@@ -7,7 +7,7 @@
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-GLOBAL_VERSION="3.7"
+GLOBAL_VERSION="3.7.1"
 
 ###############################################################################
 # General Setup
diff --git a/etc/deploy.sh b/etc/deploy.sh
index 0be1259..e8423b0 100755
--- a/etc/deploy.sh
+++ b/etc/deploy.sh
@@ -9,7 +9,7 @@
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-PROJECT_VERSION="3.7"
+PROJECT_VERSION="3.7.1"
 
 
 ###############################################################################
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index 8895077..c6890bc 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -75,18 +75,19 @@ function makeLog() {
 
   # If logs should be terse, remove some more stuff
   if [[ "${TERSE}" == "TRUE" ]]; then
-    sed -i -e '/Loading/d'  \
-      -e "/Enabled/d" "${logFile}" \
-      -e "/enabled/d" "${logFile}" \
-      -e "/Current user/d" "${logFile}" \
-      -e "/Current project/d" "${logFile}" \
-      -e "/Project workpath/d" "${logFile}" \
-      -e "/Locking process/d" "${logFile}" \
-      -e "/Running from/d" "${logFile}" \
-      -e "/lock/d" "${logFile}" \
-      -e "/Checking for deploy updates/d" "${logFile}" \
-      -e "/Log file is/d" "${logFile}" \
-      -e "/lock/d" "${logFile}" \
+    sed -i -e '/Loading/d' \
+      -e "/Enabled/d" \
+      -e "/enabled/d" \
+      -e "/Current user/d" \
+      -e "/Current project/d" \
+      -e "/Project workpath/d" \
+      -e "/Locking process/d" \
+      -e "/Running from/d" \
+      -e "/lock/d" \
+      -e "/Checking for deploy updates/d" \
+      -e "/Log file is/d" \
+      -e "/lock/d" \
+      -e "/not found/d" \
       "${logFile}"
   fi
 
@@ -96,6 +97,13 @@ function makeLog() {
   # Replace empty lines where we want
   sed -i -e '/Checking servers/s/^/\n/' \
     -e '/Launching deployment/s/^/\n/' \
+    -e '/Staging files/s/^/\n/' \
+    -e '/Commit message/s/^/\n/' \
+    -e '/Preparing repository/s/^/\n/' \
+    -e '/Checking for updates/s/^/\n/' \
+    -e '/The following updates/s/^/\n/' \
+    -e '/Building commit message/s/^/\n/' \
+    -e '/installed plugins/s/^/\n/' \
     "${logFile}"
 
   # Is this a publish only?

From f3c3846717f8a2d1895e3424eb0822452a7eeb9f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 6 Jul 2018 13:49:00 -0700
Subject: [PATCH 085/334] SSH error check, resolve #136

---
 lib/error-check.sh  | 8 ++++----
 lib/log-handling.sh | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/error-check.sh b/lib/error-check.sh
index 6be1200..14213ff 100755
--- a/lib/error-check.sh
+++ b/lib/error-check.sh
@@ -32,11 +32,11 @@ function deploy_check() {
     DEPLOYTEST="mina --simulate deploy"
     # Get variables organized
     if [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/deploy.rb" ]]; then
-      grep -n "set :user" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
+      grep -n -w "set :user" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
       MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile})
       echo -n "${MINAUSER}" > "${statFile}"
       echo -n "@" >> ${statFile}
-      grep -n "set :domain" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
+      grep -n -w "set :domain" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
       MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile})
       echo -n "${MINADOMAIN}" >> "${statFile}"
       SSHTARGET=$(sed -r 's/\s+//g' ${statFile})
@@ -50,11 +50,11 @@ function deploy_check() {
 
     elif [[ -f "${WORKPATH}/${APP}/.deploy.yml" ]]; then
       DEPLOYTEST="bundle exec mina --simulate deploy -f Minafile"
-      grep -n "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
+      grep -n -w "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
       MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile})
       echo -n "${MINAUSER}" > "${statFile}"
       echo -n "@" >> ${statFile}
-      grep -n "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
+      grep -n -w "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
       MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile})
       echo -n "${MINADOMAIN}" >> "${statFile}"
       SSHTARGET=$(sed -r 's/\s+//g' ${statFile})  
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index c6890bc..4a12163 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -88,6 +88,8 @@ function makeLog() {
       -e "/Log file is/d" \
       -e "/lock/d" \
       -e "/not found/d" \
+      -e "/Checking for/d" \
+      -e "/Continuing deploy/d" \
       "${logFile}"
   fi
 
@@ -102,7 +104,6 @@ function makeLog() {
     -e '/Preparing repository/s/^/\n/' \
     -e '/Checking for updates/s/^/\n/' \
     -e '/The following updates/s/^/\n/' \
-    -e '/Building commit message/s/^/\n/' \
     -e '/installed plugins/s/^/\n/' \
     "${logFile}"
 

From d9b815a27f8465d89f2b5c0ec82dd3d02acbdbf6 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 13 Jul 2018 19:53:35 -0700
Subject: [PATCH 086/334] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ece9514..bc021d2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [3.7.1] - 07-13-2018
 ### Added
 - Added `deploy --build [project name]` for quickly building project assets
 - Option to set `TERSE="TRUE"` in `deploy.conf` for slightly cleaner log files 
@@ -217,7 +217,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Old monolithic script rewritten
 
 
-[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7...HEAD
+[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.1...HEAD
+[3.7.1]: https://github.com/EMRL/deploy/compare/v3.7...v3.7.1
 [3.7]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7
 [3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...v3.6.7
 [3.6.6]: https://github.com/EMRL/deploy/compare/v3.6.5...v3.6.6

From e81109f7b3fcc31186bec815af927422a804aaea Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 13 Jul 2018 19:55:24 -0700
Subject: [PATCH 087/334] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index beb869c..437bb81 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Deploy
 
-[![release](https://img.shields.io/badge/release-v3.7-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
+[![release](https://img.shields.io/badge/release-v3.7.1-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
 
 `deploy` is designed to speed up, automate, and integrate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 

From 53be646b6ffb8e724930cd5b58788a748cda28a2 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 13 Jul 2018 20:01:38 -0700
Subject: [PATCH 088/334] Roughing in project dashboard

---
 CHANGELOG.md                                  |   4 +
 deploy.sh                                     |   2 +-
 etc/html/active/stats/css/bootstrap.min.css   |   5 +
 etc/html/active/stats/css/styles.css          |  58 +++
 .../fonts/glyphicons-halflings-regular.eot    | Bin 0 -> 20290 bytes
 .../fonts/glyphicons-halflings-regular.svg    | 229 ++++++++++++
 .../fonts/glyphicons-halflings-regular.ttf    | Bin 0 -> 41236 bytes
 .../fonts/glyphicons-halflings-regular.woff   | Bin 0 -> 23292 bytes
 etc/html/active/stats/index.html              | 348 ++++++++++++++++++
 etc/html/active/stats/js/bootstrap.min.js     |   7 +
 etc/html/active/stats/js/scripts.js           |   9 +
 etc/html/default/scan/index.html              | 101 -----
 lib/git.sh                                    |   4 +
 lib/monitor.sh                                |  14 +-
 lib/process-html.sh                           |  18 +-
 lib/scan.sh                                   |   4 +-
 lib/statistics.sh                             | 155 +++++---
 17 files changed, 788 insertions(+), 170 deletions(-)
 create mode 100755 etc/html/active/stats/css/bootstrap.min.css
 create mode 100755 etc/html/active/stats/css/styles.css
 create mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.eot
 create mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.svg
 create mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.ttf
 create mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.woff
 create mode 100755 etc/html/active/stats/index.html
 create mode 100755 etc/html/active/stats/js/bootstrap.min.js
 create mode 100755 etc/html/active/stats/js/scripts.js
 delete mode 100755 etc/html/default/scan/index.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc021d2..b6e9b01 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Changed 
+- Improved HTML post-processing
+
 ## [3.7.1] - 07-13-2018
 ### Added
 - Added `deploy --build [project name]` for quickly building project assets
diff --git a/deploy.sh b/deploy.sh
index c328754..8ec44b0 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -10,7 +10,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.7.1-rc"
+VERSION="3.7.2-dev"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"
diff --git a/etc/html/active/stats/css/bootstrap.min.css b/etc/html/active/stats/css/bootstrap.min.css
new file mode 100755
index 0000000..28f154d
--- /dev/null
+++ b/etc/html/active/stats/css/bootstrap.min.css
@@ -0,0 +1,5 @@
+/*!
+ * Bootstrap v3.3.2 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none;visibility:hidden}.collapse.in{display:block;visibility:visible}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none;visibility:hidden}.tab-content>.active{display:block;visibility:visible}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:absolute;top:0;right:0;left:0;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/etc/html/active/stats/css/styles.css b/etc/html/active/stats/css/styles.css
new file mode 100755
index 0000000..c458b64
--- /dev/null
+++ b/etc/html/active/stats/css/styles.css
@@ -0,0 +1,58 @@
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700');
+
+body {
+  font-family: 'Roboto', sans-serif !important;
+}
+
+p, td {
+  font-weight: 400;
+}
+
+.navbar-static-top {
+  margin-bottom:20px;
+}
+
+i {
+  font-size:16px;
+}
+
+.nav > li > a {
+  color:#787878;
+}
+  
+footer {
+  margin-top:20px;
+  padding-top:20px;
+  padding-bottom:20px;
+  background-color:#efefef;
+}
+
+/* count indicator near icons */
+.nav>li .count {
+  position: absolute;
+  bottom: 12px;
+  right: 6px;
+  font-size: 9px;
+  background: rgba(51,200,51,0.55);
+  color: rgba(255,255,255,0.9);
+  line-height: 1em;
+  padding: 2px 4px;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  -ms-border-radius: 10px;
+  -o-border-radius: 10px;
+  border-radius: 10px;
+}
+
+textarea.form-control {
+    height: 8.0em !important;
+}
+
+.stat-label {
+  font-weight: 700;
+  font-size: 0.8em;
+}
+
+.nav > li > a > span {
+    padding: 0 10px;
+}
\ No newline at end of file
diff --git a/etc/html/active/stats/fonts/glyphicons-halflings-regular.eot b/etc/html/active/stats/fonts/glyphicons-halflings-regular.eot
new file mode 100755
index 0000000000000000000000000000000000000000..423bd5d3a20b804f596e04e5cd02fb4f16cfcbc1
GIT binary patch
literal 20290
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
\ No newline at end of file
diff --git a/etc/html/active/stats/fonts/glyphicons-halflings-regular.ttf b/etc/html/active/stats/fonts/glyphicons-halflings-regular.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a498ef4e7c8b556fc36f580c5ff524025bb11c84
GIT binary patch
literal 41236
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
+
+
+	
+	
+	{{PROJNAME}} • {{PROJCLIENT}}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+
+	

+		

+			

+				
+				 Reports
+				

+				
+					

+				
+				
 

+			

+
+			

+
+				
    
+					
  • Updated {{NOW}}
    • 
+				

+
+				 My Dashboard
+				

+
+				

+					
+					

+						

+							
+								
+								
{{SCAN_MSG}}

+							
+							
+								
+								
{{UPTIME}}% uptime

+							
+							
+								
+								
{{LATENCY}}s latency

+							
+							
+								
+								
{{LAST_BACKUP}}

+							
+						

+
+						
+						

+						

+							

+								

+									
+									
Engagement (Last 7 days)

+								

+							

+							

+								

+									
{{GA_HITS}}

+									
hits from visitors

+								

+								

+								
{{GA_PERCENT}}%

+									
traffic from new users

+								

+								

+								
{{GA_SEARCHES}}

+									
organic searches

+								

+							

+						

+						
+
+						

+
+						

+							

+								

+									
+									
Recent Activity

+								

+							

+
+							

+								{{COMMITS_RECENT}}
+								

+									View all
+								

+							

+						

+					

+					

+						

+							

+								

+									
+									
Project Stats

+								

+							

+							

+								

+									

+										Project: {{PROJNAME}}

+										Development: {{DEVURL}}

+										Production: {{PRODURL}}
+									

+									
{{CODE_STATS}}

+								

+								

+									{{PROJCLIENT}}
+								

+							

+							
+							

+								
+								
Commits by day of week

+							

+						

+
+						

+
+						 

+							

+								

+									
+									
Support Request

+								

+							

+							

+								

+									

+										
+										

+											

+										

+									

+									

+										
+										

+											

+										

+									

+									

+										
+										

+											
+										

+									

+									

+										
+										

+											
+										

+									

+								

+							

+							
+						

+						
+
+					

+					
+
+				

+				
+
+
+
+				
+			

+			
+		

+	

+	
+
+	

+
+	
+	
@@ -38,18 +38,17 @@
 	

 		

 			

-				
-				 Reports
+				Reports
 				

 				
-					

+				

 				

 
 			

-
 				
    
 					
  • Updated {{NOW}}
    • 
 				

-
-				 My Dashboard
+				My Dashboard
 				

-
 				

-					
 					

 						

-							
-								
-								
{{SCAN_MSG}}

-							
-							
-								
-								
{{UPTIME}}% uptime

-							
-							
-								
-								
{{LATENCY}}s latency

-							
-							
-								
-								
{{LAST_BACKUP}}

-							
+							
+							
{{SCAN_MSG}}

+							
{{UPTIME}}% uptime

+							
{{LATENCY}}s latency

+							
{{LAST_BACKUP}}

 						

 
 						
@@ -99,7 +83,6 @@
 						

 							

 								

-									
 									
Engagement (Last 7 days)

 								

 							

@@ -121,19 +104,17 @@ 
{{GA_SEARCHES}}

 						
 
 						

-
 						

 							

 								

-									
+									
 									
Recent Activity

 								

 							

-
 							

 								{{COMMITS_RECENT}}
 								

-									View all
+									View all
 								

 							

 						

@@ -142,7 +123,7 @@ 
Recent Activity

 						

 							

 								

-									
+									
 									
Project Stats

 								

 							

@@ -162,16 +143,17 @@ 
Project Stats

 							
 							

 								
-								
Commits by day of week

+								

+								

+									View all
+								

 							

 						

-
 						

-
-						 

+						

 							

 								

-									
+									
 									
Support Request

 								

 							

@@ -209,140 +191,17 @@ 
Support Request

 									

 								
 							

-							
 						

-						
-
 					

-					
-
 				

-				
-
-
-
-				
 			

-			
 		

 	

-	
 
 	

 
-	
-	
     
 
@@ -53,10 +67,9 @@
                 
@@ -70,7 +83,7 @@
                 My Dashboard > Activity
                 

                 

-                    

+                    

                         

                             

                                 

@@ -82,6 +95,14 @@ 
Activity history ({{TOTAL_COMMITS}} entries)

                             

                         

                     

+                    

+                        

+                            

+                                
Every time we update your code, it is "committed" to a development system where it is stored, tracked with a uniqe ID, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong.
+                                

+                            

+                        

+                    
 
                 
  
             

         

diff --git a/etc/html/active/stats/backup.html b/etc/html/active/stats/backup.html
index 2cbb6d2..6bdca64 100755
--- a/etc/html/active/stats/backup.html
+++ b/etc/html/active/stats/backup.html
@@ -32,6 +32,20 @@
 				
 				{{PROJNAME}}
 			
+	        

+	            
+	        

 		
 	
 
@@ -52,10 +66,9 @@
 				
@@ -69,20 +82,26 @@
 				My Dashboard > System Backup
 				

  				

-                    

+                    

                         

                             

                                 

-                                    
Current Backups

+                                    
{{BACKUP_MSG}}

                                 

                             

                             

-	                            
{{BACKUP_MSG}}

-	                            

 	                            
{{BACKUP_FILES}}

                             

                         

                     

+                    

+                        

+                            

+                                
About the backup
+                                

+                            

+                        

+                    
 
                 
	
 			

 		
diff --git a/etc/html/active/stats/css/styles.css b/etc/html/active/stats/css/styles.css
index c458b64..2dbf4b1 100755
--- a/etc/html/active/stats/css/styles.css
+++ b/etc/html/active/stats/css/styles.css
@@ -54,5 +54,24 @@ textarea.form-control {
 }
 
 .nav > li > a > span {
-    padding: 0 10px;
+  padding: 0 10px;
+}
+
+.caret {
+  padding: 0 !important;
+}
+
+.mauticform-post-success .mauticform-message {
+    color: white;
+    background-color: green;
+    padding: 20px;
+    text-align: center;
+    margin-bottom: 20px;
+    margin-top: 5px;
+    font-weight: 700;
+    font-size: 20px;
+}
+
+.mauticform-post-success .mauticform-innerform {
+    display: none;
 }
\ No newline at end of file
diff --git a/etc/html/active/stats/firewall.html b/etc/html/active/stats/firewall.html
index 3ce0d0e..a2ecdf6 100755
--- a/etc/html/active/stats/firewall.html
+++ b/etc/html/active/stats/firewall.html
@@ -32,6 +32,20 @@
 				
 				{{PROJNAME}}
 			
+	        

+	            
+	        

 		
 	
 
@@ -52,10 +66,9 @@
 				
@@ -69,7 +82,7 @@
 				My Dashboard > Firewall & Security
 				

  				

-                    

+                    

                         

                             

                                 

@@ -80,6 +93,13 @@ 
Not yet functional

                             

                         

                     

+                    

+                        

+                            

+                                
About the firewall

+                            

+                        

+                    
 
                 
	
 			

 		

diff --git a/etc/html/active/stats/fonts/glyphicons-halflings-regular.woff2 b/etc/html/active/stats/fonts/glyphicons-halflings-regular.woff2
new file mode 100755
index 0000000000000000000000000000000000000000..64539b54c3751a6d9adb44c8e3a45ba5a73b77f0
GIT binary patch
literal 18028
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

literal 0
HcmV?d00001

diff --git a/etc/html/active/stats/index.html b/etc/html/active/stats/index.html
index 7482b65..4d317d9 100755
--- a/etc/html/active/stats/index.html
+++ b/etc/html/active/stats/index.html
@@ -32,6 +32,20 @@
 				
 				{{PROJNAME}}
 			
+	        

+	            
+	        

 		
 	
 
@@ -52,10 +66,9 @@
 				
@@ -137,7 +150,7 @@ 
Project Stats

 									
{{CODE_STATS}}

 								
 								

-									{{PROJCLIENT}}
+									{{PROJCLIENT}}
 								

 							
 							
@@ -158,38 +171,7 @@ 
Support Request

 								
 							
 							

-								

-									

-										
-										

-											

-										

-									

-									

-										
-										

-											

-										

-									

-									

-										
-										

-											
-										

-									

-									

-										
-										

-											
-										

-									

-								

+								
 							

 						
 					
diff --git a/etc/html/active/stats/scan.html b/etc/html/active/stats/scan.html
index 93f6a06..531ffcc 100755
--- a/etc/html/active/stats/scan.html
+++ b/etc/html/active/stats/scan.html
@@ -32,6 +32,20 @@
                 
                 {{PROJNAME}}
             
+            

+                
+            

         
     
 
@@ -53,10 +67,9 @@
                 
@@ -70,7 +83,7 @@
                 My Dashboard > Malware Scan
                 

                 

-                    

+                    

                         

                             

                                 

@@ -83,6 +96,14 @@ 
Scan results

                             

                         

                     

+                    

+                        

+                            

+                                
About the scan
+                                

+                            

+                        

+                    
 
                 
  
             

         

diff --git a/etc/html/active/stats/stats.html b/etc/html/active/stats/stats.html
index 04273cf..92eb41e 100755
--- a/etc/html/active/stats/stats.html
+++ b/etc/html/active/stats/stats.html
@@ -32,6 +32,20 @@
 				
 				{{PROJNAME}}
 			
+	        

+	            
+	        

 		
 	
 
@@ -52,10 +66,9 @@
 				
diff --git a/lib/scan.sh b/lib/scan.sh
index 672926f..3482dfe 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -88,7 +88,8 @@ function scan_host() {
   sed -i -e :a -e '$d;N;2,3ba' -e 'P;D' "${scan_html}"
 
   # Create the scan report in the new dashboard format, this is kinda
-  # maybe termporary, it's getting pretty tangled
+  # maybe temporary, it's getting pretty tangled
+  assign_nav
   project_scan
 
   cat "${deployPath}/html/${HTMLTEMPLATE}/scan/header.html" "${scan_html}" "${deployPath}/html/${HTMLTEMPLATE}/scan/footer.html" > "${htmlFile}"
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 2ff505d..16cc54d 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -40,12 +40,8 @@ function project_stats() {
 
     notice "Generating files..."
 
-    # Assign URLs - this will change later on
-    ACTIVITY_NAV="activity.html"
-    STATISTICS_NAV="stats.html"
-    [[ -n "${SCAN_MSG}" ]] && SCAN_NAV="scan.html"
-    [[ -n "${FIREWALL_NAV}" ]] && FIREWALL_NAV="firewall.html"
-    [[ -n "${BACKUP_STATUS}" ]] && BACKUP_NAV="backup.html"
+    # Define dashboard navigation
+    assign_nav
 
     # Collect gravatars for all the authors in this repo
     get_avatars
@@ -213,3 +209,12 @@ function validate_urls() {
     fi
   done < "${trshFile}"
 }
+
+function assign_nav() {
+  # Assign URLs - this will change later on
+  ACTIVITY_NAV="activity.html"
+  STATISTICS_NAV="stats.html"
+  [[ -n "${SCAN_MSG}" ]] && SCAN_NAV="scan.html"
+  [[ -n "${FIREWALL_NAV}" ]] && FIREWALL_NAV="firewall.html"
+  [[ -n "${BACKUP_STATUS}" ]] && BACKUP_NAV="backup.html"
+}
\ No newline at end of file

From 3523138d1cc6c69a22762d99d5b319589c14f1fb Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 3 Aug 2018 11:16:20 -0700
Subject: [PATCH 091/334] Dashboard progress

---
 etc/deploy.sh                        | 12 +++++++++
 etc/html/active/stats/activity.html  |  8 +++++-
 etc/html/active/stats/css/styles.css | 37 +++++++++++++++++++++-------
 etc/html/active/stats/index.html     | 23 ++++++++++++++++-
 etc/html/active/stats/scan.html      | 16 +++++++++---
 lib/process-html.sh                  |  9 +++++++
 lib/statistics.sh                    |  4 +--
 7 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/etc/deploy.sh b/etc/deploy.sh
index e8423b0..09222b2 100755
--- a/etc/deploy.sh
+++ b/etc/deploy.sh
@@ -268,6 +268,18 @@ PROJECT_VERSION="3.7.1"
 # INCLUDEHOSTING="{{INCLUDEHOSTING}}"
 
 
+###############################################################################
+# Work Logs
+###############################################################################
+
+# EXPERIMENTAL - Ingest work logs from Chrono (or any RSS feed) for display in
+# the statistics dashboard
+
+# Set the URL of your RSS work log. Feed will be parsed and formatted into html 
+# via feed.emrl.co
+# RSS_URL="{{RSS_URL}}"
+
+
 ###############################################################################
 # Invoice Ninja integration
 ###############################################################################
diff --git a/etc/html/active/stats/activity.html b/etc/html/active/stats/activity.html
index eba374b..5797017 100755
--- a/etc/html/active/stats/activity.html
+++ b/etc/html/active/stats/activity.html
@@ -97,8 +97,14 @@ 
Activity history ({{TOTAL_COMMITS}} entries)

                     
                     

                         

+                            

+                                

+                                    
About activity

+                                

+                            

                             

-                                
Every time we update your code, it is "committed" to a development system where it is stored, tracked with a uniqe ID, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong.
+                                

+                                    Every time we update your code, it is "committed" to a development system where it is stored, tracked with a uniqe ID, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong.
                                 

                             

                         

diff --git a/etc/html/active/stats/css/styles.css b/etc/html/active/stats/css/styles.css
index 2dbf4b1..bb43cce 100755
--- a/etc/html/active/stats/css/styles.css
+++ b/etc/html/active/stats/css/styles.css
@@ -62,16 +62,35 @@ textarea.form-control {
 }
 
 .mauticform-post-success .mauticform-message {
-    color: white;
-    background-color: green;
-    padding: 20px;
-    text-align: center;
-    margin-bottom: 20px;
-    margin-top: 5px;
-    font-weight: 700;
-    font-size: 20px;
+  color: white;
+  background-color: green;
+  padding: 20px;
+  text-align: center;
+  margin-bottom: 20px;
+  margin-top: 5px;
+  font-weight: 700;
+  font-size: 20px;
 }
 
 .mauticform-post-success .mauticform-innerform {
     display: none;
-}
\ No newline at end of file
+}
+
+@media (min-width: 768px) {
+  .modal-dialog {
+    width: 800px !important;
+  }
+}
+
+.rss-items {
+  list-style-type: none;
+  -webkit-padding-start: 0px;
+}
+
+.rss-item {
+  .margin-bottom: 1.4em;
+}
+
+.text-white {
+  color: #ffffff;
+}
diff --git a/etc/html/active/stats/index.html b/etc/html/active/stats/index.html
index 4d317d9..6dfa9dd 100755
--- a/etc/html/active/stats/index.html
+++ b/etc/html/active/stats/index.html
@@ -38,7 +38,7 @@
 	                    
 	                    	My EMRL Stuff 
 	                    

 	
 
+	
+	
+	
+
 	

 
 	
diff --git a/etc/html/active/stats/scan.html b/etc/html/active/stats/scan.html
index 531ffcc..d27c97f 100755
--- a/etc/html/active/stats/scan.html
+++ b/etc/html/active/stats/scan.html
@@ -85,21 +85,29 @@
                 

                     

                         

-                            

+                            

                                 

-                                    
Scan results

+                                    
Malware scan: {{SCAN_MSG}}

                                 

                             

                             

-                                
{{SCAN_RESULT}}

                                 {{SCAN_STATS}}
                             

                         

                     

                     

                         

+                            

+                                

+                                    
About the scan

+                                

+                            

                             

-                                
About the scan
+                                

+                                	Our system performs comprehensive tests against your web server for multiple items, including over 6700 potentially dangerous files and programs, checks for outdated versions of over 1250 servers, and version specific problems on over 270 servers.
+                            	

+                            	

+                            		It also checks for server configuration items such as the presence of multiple index files, HTTP server options, and will attempt to identify installed web servers and software. Scan items and plugins are frequently updated and are automatically updated.
                                 

                             

                         

diff --git a/lib/process-html.sh b/lib/process-html.sh
index 8c32080..803e044 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -39,6 +39,14 @@ function process_html() {
     sed -i '/ANALYTICS/d' "${htmlFile}"
   fi
 
+  if [[ -z "${RSS_URL}" ]]; then
+    sed -i -e '/BEGIN WORK RSS/,/END WORK RSS/d' \
+      -e '/RSS_URL/d' "${htmlFile}" \
+    "${htmlFile}"
+  else
+    sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${htmlFile}"
+  fi
+
   # Prettify errors, warning, and successes
   sed -i -e '/ERROR/s/$/<\/span>/' \
     -e '/^ERROR/s/^//' \
@@ -132,5 +140,6 @@ function process_html() {
     -e "s^{{BACKUP_NAV}}^${BACKUP_NAV}^g" \
     -e "s^{{BACKUP_MSG}}^${BACKUP_MSG}^g" \
     -e "s^{{TOTAL_COMMITS}}^${TOTAL_COMMITS}^g" \
+    -e "s^{{RSS_URL}}^${RSS_URL}^g" \
     "${htmlFile}"
   }
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 16cc54d..78e2e40 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -12,12 +12,12 @@ read -r DB_API_TOKEN DB_BACKUP_PATH LAST_BACKUP BACKUP_STATUS CODE_STATS \
   BACKUP_BTN LATENCY_BTN UPTIME_BTN SCAN_BTN COMMITS_RECENT  \
   repo_charts ACTIVITY_NAV STATISTICS_NAV SCAN_NAV FIREWALL_NAV \
   BACKUP_NAV SCAN_STATS FIREWALL_STATUS BACKUP_MSG BACKUP_FILES \
-  TOTAL_COMMITS <<< ""
+  TOTAL_COMMITS RSS_URL <<< ""
 echo "${DB_API_TOKEN} ${DB_BACKUP_PATH} ${LAST_BACKUP} ${BACKUP_STATUS} 
   ${CODE_STATS} ${BACKUP_BTN} ${LATENCY_BTN} ${UPTIME_BTN} ${SCAN_BTN}
   ${COMMITS_RECENT} ${repo_charts} ${ACTIVITY_NAV} ${STATISTICS_NAV} 
   ${SCAN_NAV} ${FIREWALL_NAV} ${BACKUP_NAV} ${FIREWALL_STATUS}
-  ${BACKUP_MSG} ${BACKUP_FILES} ${TOTAL_COMMITS}" > /dev/null
+  ${BACKUP_MSG} ${BACKUP_FILES} ${TOTAL_COMMITS} ${RSS_URL}" > /dev/null
 
 function project_stats() {
   hash gitchart 2>/dev/null || {

From 18528710991fb417199c6a126090b1841f09b1eb Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 3 Aug 2018 16:02:50 -0700
Subject: [PATCH 092/334] Resolve #137

---
 lib/active-check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active-check.sh b/lib/active-check.sh
index db5d06f..2742e75 100755
--- a/lib/active-check.sh
+++ b/lib/active-check.sh
@@ -14,7 +14,7 @@ echo "${active_files}" > /dev/null
 function active_check() { 
   if [[ "${FORCE}" == "1" ]] && [[ "${UPGRADE}" == "1" ]] && [[ "${QUIET}" == "1" ]] && [[ "${ACTIVECHECK}" = "TRUE" ]]; then
     trace "Checking for active files"
-    active_files=$(find "${WORKPATH}/${APP}" -mmin -"${CHECKTIME}" ! -path "${WORKPATH}/${APP}/public/app/wflogs/*" ! -path "${WORKPATH}/${APP}/.git/*" ! -path "${WORKPATH}/${APP}/.git")
+    active_files=$(find "${WORKPATH}/${APP}" -mmin -"${CHECKTIME}" ! -path "${WORKPATH}/${APP}/public/app/wflogs" ! -path "${WORKPATH}/${APP}/.git/*" ! -path "${WORKPATH}/${APP}/.git")
 
     # Check for changed files and make sure they are actually waiting to be committed
     if [[ ! -z "${active_files}" ]] && [[ ! -z "$(git status --porcelain)" ]]; then

From 0d50dcacf29400d2bd9ed689a6ce896b9b9b412e Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 19 Aug 2018 13:36:17 -0700
Subject: [PATCH 093/334] process_html() cleanup

---
 etc/html/active/stats/backup.html    |  2 +-
 etc/html/active/stats/css/styles.css |  2 +-
 etc/html/active/stats/stats.html     | 30 +++++-----
 lib/analytics.sh                     |  6 ++
 lib/loader.sh                        | 27 +++++++--
 lib/process-html.sh                  | 89 +++++++++-------------------
 lib/wp.sh                            |  7 ++-
 7 files changed, 80 insertions(+), 83 deletions(-)

diff --git a/etc/html/active/stats/backup.html b/etc/html/active/stats/backup.html
index 6bdca64..1948ddc 100755
--- a/etc/html/active/stats/backup.html
+++ b/etc/html/active/stats/backup.html
@@ -85,7 +85,7 @@
                     

                         

                             

-                                

+                                

                                     
{{BACKUP_MSG}}

                                 

                             

diff --git a/etc/html/active/stats/css/styles.css b/etc/html/active/stats/css/styles.css
index bb43cce..4661481 100755
--- a/etc/html/active/stats/css/styles.css
+++ b/etc/html/active/stats/css/styles.css
@@ -88,7 +88,7 @@ textarea.form-control {
 }
 
 .rss-item {
-  .margin-bottom: 1.4em;
+  margin-bottom: 1.4em;
 }
 
 .text-white {
diff --git a/etc/html/active/stats/stats.html b/etc/html/active/stats/stats.html
index 92eb41e..e798238 100755
--- a/etc/html/active/stats/stats.html
+++ b/etc/html/active/stats/stats.html
@@ -84,48 +84,48 @@
 				

 					

 						

-							

-								
+							

+								
 							

 						

 						

 						

-							

-								
+							

+								
 							

 						

 						

 						

-							

-								
+							

+								
 							

 						

 						

 						

-							

-								
+							

+								
 							

 						

 						

 						

-							

-								
+							

+								
 							

 						

 						

 						

-							

-								
+							

+								
 							

 						

 						

 						

-							

+							

 								

-									
+									
 								

 								

-								
+								
 								

 							

 						

diff --git a/lib/analytics.sh b/lib/analytics.sh
index c398d2c..37eaeb0 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -4,6 +4,11 @@
 #
 ###############################################################################
 # Handles functions related to retrieving and parsing Google Analytics
+#
+# Thanks to https://jacobsalmela.com/2014/08/18/oauth-2-0-google-analytics-desktop-using-geektool-bash-curl/
+# for breaking this down and helping us get started
+# 
+# https://developers.google.com/analytics/devguides/reporting/core/dimsmets for all the metrics
 ###############################################################################
 trace "Loading analytics functions"   
 
@@ -88,6 +93,7 @@ function ga_data() {
   RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
   SIZE="$(printf "%.0f\n" "${RESULT}")"
 
+  # Make this a proper loop
   if [[ "${PROJSTATS}" == "1" ]]; then 
     GA_HITS=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:hits&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
     GA_PERCENT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:percentNewSessions&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
diff --git a/lib/loader.sh b/lib/loader.sh
index 2dacf16..c510b3e 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -17,15 +17,34 @@ if [[ "${FORCE}" != "1" ]] && [[ "${QUIET}" = "1" ]]; then
   echo "To deploy using the --quiet flag, you must also use --force."; exit 1
 fi
 
-# Creating this function first, so verbose output option is usable early
+###############################################################################
+# trace()
+# Outputs timestamped, verbose info to both console and log files
+#
+# Arguments:
+#   status      Will place the next trace output on the same line, e.g.
+#               [trace 1]Checking database... [trace 2]OK will render 
+#               Checking database... OK in the logs
+# Returns:  
+#   None
+###############################################################################      
 function trace() {
   if [[ "${VERBOSE}" == "TRUE" ]]; then
     TIMESTAMP="$(date '+%H:%M:%S')"
-    echo -e "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) $*"
-    echo "${TIMESTAMP} $*" >> "${logFile}"
+    if [[ "${1}" == "status" ]]; then
+      echo -e -n "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) ${2}"
+      echo "${TIMESTAMP} ${2}" >> "${logFile}"
+    else
+      echo -e "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) $*"
+      echo "${TIMESTAMP} $*" >> "${logFile}"
+    fi
   else
     TIMESTAMP="$(date '+%H:%M:%S')"
-    echo "${TIMESTAMP} $*" >> "${logFile}"
+    if [[ "${1}" == "status" ]]; then
+      echo -n "${TIMESTAMP} ${2}" >> "${logFile}"
+    else
+      echo "${TIMESTAMP} $*" >> "${logFile}"
+    fi
   fi
 }
 
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 803e044..4d4b251 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -9,10 +9,11 @@ trace "Loading html handling"
 
 # Initialize variables 
 read -r DEFAULTC PRIMARYC SECONDARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID \
-  COVER SCANC UPTIMEC LATENCYC LOGC LOGBC sed_commits sed_scan sed_backup <<< ""
+  COVER SCANC UPTIMEC LATENCYC LOGC LOGBC sed_commits sed_scan sed_backup \
+  process_var v i <<< ""
 echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} 
-  ${SMOOCHID} ${COVER} ${SCANC} ${UPTIMEC} ${LATENCYC} 
-  ${sed_commits} ${sed_scan} ${sed_backup}" > /dev/null
+  ${SMOOCHID} ${COVER} ${SCANC} ${UPTIMEC} ${LATENCYC} ${sed_commits} 
+  ${sed_scan} ${sed_backup} ${process_var} ${v} ${i}" > /dev/null
 
 function process_html() {
   # Clean out the stuff we don't need
@@ -43,8 +44,8 @@ function process_html() {
     sed -i -e '/BEGIN WORK RSS/,/END WORK RSS/d' \
       -e '/RSS_URL/d' "${htmlFile}" \
     "${htmlFile}"
-  else
-    sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${htmlFile}"
+  #else
+  #  sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${htmlFile}"
   fi
 
   # Prettify errors, warning, and successes
@@ -70,30 +71,30 @@ function process_html() {
   sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trshFile}' -e 'd' -e '}' -i \"${htmlFile}\"")
   eval "${sed_backup}"
 
-  # Get to work
+  # Setup variables to process
+  process_var=(VIEWPORT NOW DEV LOGTITLE USER PROJNAME PROJCLIENT CLIENTLOGO \
+    DEVURL PRODURL COMMITURL EXITCODE COMMITHASH USER LOGURL REMOTEURL \
+    VIEWPORTPRE PATHTOREPO PROJNAME CLIENTCONTACT DEVURL PRODURL SCAN_MSG \
+    SCAN_RESULT SCAN_URL BACKUP_STATUS LAST_BACKUP SMOOCHID DIGESTWRAP \
+    GREETING REMOTEURL ANALYTICSMSG COVER WEEKOF UPTIME LATENCY GA_HITS \
+    GA_PERCENT GA_SEARCHES GA_DURATION GA_SOCIAL CODE_STATS SCAN_BTN \
+    UPTIME_BTN LATENCY_BTN BACKUP_BTN ACTIVITY_NAV STATISTICS_NAV SCAN_NAV \
+    FIREWALL_NAV BACKUP_NAV BACKUP_MSG TOTAL_COMMITS RSS_URL)
+
+  # Start the loop
+  for i in "${process_var[@]}" ; do
+    # This is essentially the same as insert_values, should consolidate
+    if [[ -n "${!i:-}" ]]; then
+      [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
+      sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${htmlFile}")
+      # Kludgy but works. Ugh.
+      eval "${sed_hack}"
+    fi
+  done
+
+  # Special snowflakes; for some silly reason the variables don't match
   sed -i -e "s^{{VIEWPORT}}^${VIEWPORT}^g" \
-    -e "s^{{NOW}}^${NOW}^g" \
-    -e "s^{{DEV}}^${DEV}^g" \
-    -e "s^{{LOGTITLE}}^${LOGTITLE}^g" \
-    -e "s^{{USER}}^${USER}^g" \
-    -e "s^{{PROJNAME}}^${PROJNAME}^g" \
-    -e "s^{{PROJCLIENT}}^${PROJCLIENT}^g" \
-    -e "s^{{CLIENTLOGO}}^${CLIENTLOGO}^g" \
-    -e "s^{{DEVURL}}^${DEVURL}^g" \
-    -e "s^{{PRODURL}}^${PRODURL}^g" \
-    -e "s^{{COMMITURL}}^${COMMITURL}^g" \
-    -e "s^{{EXITCODE}}^${EXITCODE}^g" \
-    -e "s^{{COMMITHASH}}^${COMMITHASH}^g" \
-    -e "s^{{NOTES}}^${notes}^g" \
-    -e "s^{{USER}}^${USER}^g" \
-    -e "s^{{LOGURL}}^${LOGURL}^g" \
-    -e "s^{{REMOTEURL}}^${REMOTEURL}^g" \
-    -e "s^{{VIEWPORTPRE}}^${VIEWPORTPRE}^g" \
-    -e "s^{{PATHTOREPO}}^${WORKPATH}/${APP}^g" \
-    -e "s^{{PROJNAME}}^${PROJNAME}^g" \
-    -e "s^{{CLIENTCONTACT}}^${CLIENTCONTACT}^g" \
-    -e "s^{{DEVURL}}^${DEVURL}^g" \
-    -e "s^{{PRODURL}}^${PRODURL}^g" \
+    -e "s^{{NOTEs}}^${notes}^g" \
     -e "s^{{DEFAULT}}^${DEFAULTC}^g" \
     -e "s^{{PRIMARY}}^${PRIMARYC}^g" \
     -e "s^{{SECONDARY}}^${SECONDARYC}^g" \
@@ -106,40 +107,8 @@ function process_html() {
     -e "s^{{SCAN_STATUS}}^${SCANC}^g" \
     -e "s^{{UPTIME_STATUS}}^${UPTIMEC}^g" \
     -e "s^{{LATENCY_STATUS}}^${LATENCYC}^g" \
-    -e "s^{{SCAN_MSG}}^${SCAN_MSG}^g" \
-    -e "s^{{SCAN_RESULT}}^${SCAN_RESULT}^g" \
-    -e "s^{{SCAN_URL}}^${SCAN_URL}^g" \
-    -e "s^{{BACKUP_STATUS}}^${BACKUP_STATUS}^g" \
-    -e "s^{{LAST_BACKUP}}^${LAST_BACKUP}^g" \
-    -e "s^{{SMOOCHID}}^${SMOOCHID}^g" \
     -e "s^{{GRAVATARURL}}^${REMOTEURL}\/${APP}\/avatar^g" \
-    -e "s^{{DIGESTWRAP}}^${DIGESTWRAP}^g" \
-    -e "s^{{GREETING}}^${GREETING}^g" \
-    -e "s^{{REMOTEURL}}^${REMOTEURL}^g" \
-    -e "s^{{ANALYTICSMSG}}^${ANALYTICSMSG}^g" \
     -e "s^{{STATURL}}^${REMOTEURL}\/${APP}\/stats^g" \
-    -e "s^{{COVER}}^${COVER}^g" \
-    -e "s^{{WEEKOF}}^${WEEKOF}^g" \
     -e "s^{{LASTMONTH}}^${LAST_MONTH}^g" \
-    -e "s^{{UPTIME}}^${UPTIME}^g" \
-    -e "s^{{LATENCY}}^${LATENCY}^g" \
-    -e "s^{{GA_HITS}}^${GA_HITS}^g" \
-    -e "s^{{GA_PERCENT}}^${GA_PERCENT}^g" \
-    -e "s^{{GA_SEARCHES}}^${GA_SEARCHES}^g" \
-    -e "s^{{GA_DURATION}}^${GA_DURATION}^g" \
-    -e "s^{{GA_SOCIAL}}^${GA_SOCIAL}^g" \
-    -e "s^{{CODE_STATS}}^${CODE_STATS}^g" \
-    -e "s^{{SCAN_BTN}}^${SCAN_BTN}^g" \
-    -e "s^{{UPTIME_BTN}}^${UPTIME_BTN}^g" \
-    -e "s^{{LATENCY_BTN}}^${LATENCY_BTN}^g" \
-    -e "s^{{BACKUP_BTN}}^${BACKUP_BTN}^g" \
-    -e "s^{{ACTIVITY_NAV}}^${ACTIVITY_NAV}^g" \
-    -e "s^{{STATISTICS_NAV}}^${STATISTICS_NAV}^g" \
-    -e "s^{{SCAN_NAV}}^${SCAN_NAV}^g" \
-    -e "s^{{FIREWALL_NAV}}^${FIREWALL_NAV}^g" \
-    -e "s^{{BACKUP_NAV}}^${BACKUP_NAV}^g" \
-    -e "s^{{BACKUP_MSG}}^${BACKUP_MSG}^g" \
-    -e "s^{{TOTAL_COMMITS}}^${TOTAL_COMMITS}^g" \
-    -e "s^{{RSS_URL}}^${RSS_URL}^g" \
     "${htmlFile}"
   }
diff --git a/lib/wp.sh b/lib/wp.sh
index 622be03..cb2d1dd 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -21,7 +21,7 @@ function wpPkg() {
         cd "${WORKPATH}"/"${APP}${WPROOT}${WPAPP}"; \
 
         # Database check
-        trace "Checking database..."
+        trace status "Checking database: "
         "${WPCLI}"/wp db check &>> /dev/null; EXITCODE=$?; 
         if [[ "${EXITCODE}" != "0" ]]; then 
           "${WPCLI}"/wp db check &>> "${logFile}"; 
@@ -32,7 +32,10 @@ function wpPkg() {
             info "There is a problem with your Wordpress installation, check your configuration."
           fi
         else
-          trace "OK"
+        	# Get info
+        	info "OK"
+          wp core version --extra  &>> "${logFile}";
+
           # Check for Wordfence
           wfCheck
           

From 454171319bf21c44015c6b65756d8995861d7245 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 20 Aug 2018 10:50:21 -0700
Subject: [PATCH 094/334] Escaping special characters in text strings, resolve
 #141

---
 deploy.sh           | 13 ++++++-------
 lib/analytics.sh    | 10 ++++++----
 lib/digest.sh       | 10 ++++++----
 lib/process-html.sh |  5 +++--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 8ec44b0..ceccd4a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -86,8 +86,8 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile
   COMMITURL COMMITHASH UPD1 UPD2 UPDATE gitLock AUTOMERGE MERGE EXITCODE \
   currentStash deploy_cmd deps start_branch postSendmail SLACKUSER NOCHECK \
   VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \
-  WPAPP WPSYSTEM DONOTUPDATEWP gitHistory ANALYTICSMSG digestSendmail MINAUSER \
-  MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE GREETING LOGSUFFIX \
+  WPAPP WPSYSTEM DONOTUPDATEWP gitHistory digestSendmail MINAUSER \
+  MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE  LOGSUFFIX \
   DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile \
   TMP MONITORURL MONITORUSER MONITORPASS SERVERID \
   MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI <<< ""
@@ -100,11 +100,10 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile
   ${AUTOMERGE} ${MERGE} ${EXITCODE} ${currentStash} ${deploy_cmd} ${deps} 
   ${start_branch} ${postSendmail} ${SLACKUSER} ${NOCHECK} ${VIEWPORT} 
   ${VIEWPORTPRE} ${LOGTITLE} ${LOGURL} ${TIMESTAMP} ${STARTUP} ${WPROOT} ${WPAPP} 
-  ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${ANALYTICSMSG} 
-  ${digestSendmail} ${MINAUSER} ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} 
-  ${REMOTEFILE} ${GREETING} ${LOGSUFFIX} ${DISABLESSHCHECK}
-  ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} ${reportFile} 
-  ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} 
+  ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${digestSendmail} ${MINAUSER} 
+  ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} ${REMOTEFILE} ${LOGSUFFIX} 
+  ${DISABLESSHCHECK} ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} 
+  ${reportFile} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} 
   ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} 
   ${MONITORAPI}" > /dev/null
 
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 37eaeb0..9a4600f 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -13,8 +13,10 @@
 trace "Loading analytics functions"   
 
 # Initialize variables
-read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION GA_SOCIAL <<< ""
-echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL}" > /dev/null
+read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
+  GA_SOCIAL ANALYTICSMSG <<< ""
+echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} ${GA_SEARCHES} 
+  ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG}" > /dev/null
 
 function ga_metrics() {
   array[0]="hits"
@@ -55,10 +57,10 @@ function analytics() {
       if [[ "${SIZE}" -gt "100" ]]; then
         ga_fail
       elif [[ "${SIZE}" -gt "50" ]]; then
-        ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That's great!"
+        ANALYTICSMSG="Last week ${SIZE} percent of your users were first time visitors. That\'s great!"
       else
         RESULT="$((100 - ${SIZE}))"
-        ANALYTICSMSG="Last week ${RESULT} percent of your users were return visitors. That's great!"
+        ANALYTICSMSG="Last week ${RESULT} percent of your users were return visitors. That\'s great!"
       fi
     fi
 
diff --git a/lib/digest.sh b/lib/digest.sh
index 7b3ede8..a5430aa 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -8,9 +8,10 @@
 trace "Loading digest handling"
 
 # Initializa needed variables
-read -r AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP <<< ""
+read -r AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP \
+  GREETING <<< ""
 echo "${AUTHOR} ${AUTHOREMAIL} ${AUTHORNAME} ${GRAVATAR} ${IMGFILE} 
-  ${DIGESTWRAP}" > /dev/null
+  ${DIGESTWRAP} ${GREETING}" > /dev/null
 
 function get_avatars() {
   for AUTHOR in $(git log --pretty=format:"%ae|%an" | sort | uniq); do
@@ -60,9 +61,10 @@ function create_digest() {
 
     cat "${deployPath}/html/${HTMLTEMPLATE}/digest/header.html" "${statFile}" "${deployPath}/html/${HTMLTEMPLATE}/digest/footer.html" > "${htmlFile}"
 
-    # Randomize a positive Monday thought
+    # Randomize a positive Monday thought. Special characters must be escaped 
+    # and use character codes
     array[0]="Hope you had a good weekend!"
-    array[1]="Alright Monday, let's do this."
+    array[1]="Alright Monday, let\'s do this."
     array[2]="Oh, hello Monday."
     array[3]="Welcome back, how was your weekend?"
     array[4]="Happy Monday and welcome back!"
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 4d4b251..9f81a9c 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -83,7 +83,8 @@ function process_html() {
 
   # Start the loop
   for i in "${process_var[@]}" ; do
-    # This is essentially the same as insert_values, should consolidate
+    # This is essentially the same as insert_values() [see env-check.sh], we
+    #  should consolidate them into one function
     if [[ -n "${!i:-}" ]]; then
       [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
       sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${htmlFile}")
@@ -94,7 +95,7 @@ function process_html() {
 
   # Special snowflakes; for some silly reason the variables don't match
   sed -i -e "s^{{VIEWPORT}}^${VIEWPORT}^g" \
-    -e "s^{{NOTEs}}^${notes}^g" \
+    -e "s^{{NOTES}}^${notes}^g" \
     -e "s^{{DEFAULT}}^${DEFAULTC}^g" \
     -e "s^{{PRIMARY}}^${PRIMARYC}^g" \
     -e "s^{{SECONDARY}}^${SECONDARYC}^g" \

From 2dac8929ac5c045d43c6eddf736dcca4122eb7c6 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 20 Aug 2018 22:54:58 -0700
Subject: [PATCH 095/334] Analytics work

---
 lib/analytics.sh | 94 +++++++++++++++++++++++++++++++++++++++++++++---
 lib/loader.sh    |  2 +-
 2 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/lib/analytics.sh b/lib/analytics.sh
index 9a4600f..091700a 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -14,9 +14,10 @@ trace "Loading analytics functions"
 
 # Initialize variables
 read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
-  GA_SOCIAL ANALYTICSMSG <<< ""
-echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} ${GA_SEARCHES} 
-  ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG}" > /dev/null
+  GA_SOCIAL ANALYTICSMSG ga_var ga_day ga_sequence max_value <<< ""
+echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} 
+  ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG} ${ga_var} 
+  ${ga_sequence} ${max_value}" > /dev/null
 
 function ga_metrics() {
   array[0]="hits"
@@ -109,7 +110,86 @@ function ga_data() {
   fi
 }
 
-# If no other results are worht displaying, fall back to displaying hits
+# Just a test for now
+function ga_data_loop() {
+  # Setup variables to process
+  console "${GASTART} - ${GAEND}"
+  ga_var=(users newUsers percentNewSessions sessionsPerUser sessions 
+    bounceRate avgSessionDuration hits organicSearches pageviews avgTimeOnPage
+    avgPageLoadTime avgDomainLookupTime avgServerResponseTime impressions 
+    adClicks adCost CPC CTR)
+
+  # Start the loop
+  for i in "${ga_var[@]}" ; do
+    # This is essentially the same as insert_values() [see env-check.sh], we
+    #  should consolidate them into one function
+    RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$i&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
+    
+    # Round to two decimal places if needed
+    if [[ "${RESULT}" = *"."* ]]; then
+      RESULT="$(printf '%0.2f\n' "${RESULT}")"
+    fi
+
+    # Output trace
+    trace "${i}: ${RESULT}"
+  done
+}
+
+###############################################################################
+# ga_over_time()
+#   Collects Gollge Analytics data over a certain period of time
+#
+# Arguments:
+#   [metric]    Defines the metric you wish to get from Google's API. Examples
+#               include 'sessions', 'hits', etc. Refere to Google API docs at
+#               https://developers.google.com/analytics/devguides/reporting/core/dimsmets 
+#   [days]      The number of days for which to gather analytics data.
+#
+# Returns:  
+#   None
+###############################################################################  
+function ga_over_time() {
+  # Process arguments
+  if [[ -n "$2" ]]; then
+    GASTART="$(date -I -d "$GAEND - $2 day")"
+  fi
+
+  # Setup variables
+  ga_day="${GAEND}"
+  day="0"
+  METRIC="${1}"
+  
+  while [ "$ga_day" != "${GASTART}" ]; do 
+    RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${METRIC}&start-date=$ga_day&end-date=$ga_day&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
+    trace "${ga_day}: ${RESULT} $1"
+    
+    # Store the values 
+    declare "$1_${day}"="${RESULT}"
+    ga_sequence="${ga_sequence}${RESULT} "
+    day="$((day+1))"
+    ga_day="$(date -I -d "$ga_day - 1 day")"
+  done
+
+  # Create percentage array
+  ga_sequence="$(echo -e "${ga_sequence}" | sed -e 's/[[:space:]]*$//')"
+  trace "Calculating array: ${ga_sequence}"
+  IFS=', ' read -r -a a <<< "${ga_sequence}"
+  for i in ${a[@]}; do
+    if [[ $i -gt $max_value ]]; then 
+      max_value=$i
+    fi
+  done
+  trace "Max sequence value=${max_value}"
+
+  # Calculate
+  for ((n=0; n < $2; n++)); do 
+    var="$1_$n"; var_percent="$1_percent_$n"
+    var_percent=$(awk "BEGIN { pc=100*${!var}/${max_value}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
+    trace "100*${!var}/${max_value} = ${var_percent}%"
+  done
+}
+
+# If no other results are worth displaying, fall back to displaying hits
 function ga_fail() {
   METRIC="hits"
   ga_data
@@ -166,6 +246,12 @@ function ga_test() {
   ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")"
   echo "${ACCESSTOKEN}"
 
+  # Just here for testing
+  #ga_data_loop
+  empty_line; trace "Day count"
+  ga_over_time hits 7
+  return
+
   # Setup the metric we're after
   array[0]="hits"
   array[1]="percentNewSessions"
diff --git a/lib/loader.sh b/lib/loader.sh
index c510b3e..c94b5c8 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -19,7 +19,7 @@ fi
 
 ###############################################################################
 # trace()
-# Outputs timestamped, verbose info to both console and log files
+#   Outputs timestamped, verbose info to both console and log files
 #
 # Arguments:
 #   status      Will place the next trace output on the same line, e.g.

From d607f0e34eb2249566e82a0ed6642229d9361a8f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 24 Aug 2018 11:33:34 -0700
Subject: [PATCH 096/334] Cleanup trace output

---
 etc/html/active/stats/stats.html | 28 +++++++++++++++++++++++++---
 lib/loader.sh                    | 11 +++++++++--
 lib/wp.sh                        | 12 ++++++------
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/etc/html/active/stats/stats.html b/etc/html/active/stats/stats.html
index e798238..2f51bd5 100755
--- a/etc/html/active/stats/stats.html
+++ b/etc/html/active/stats/stats.html
@@ -82,7 +82,7 @@
 				My Dashboard > Statistics
 				

 				

-					

+					

 						

 							

 								
@@ -121,15 +121,37 @@
 						

 						

 							

-								

+								

 									
 								

-								

+								

 								
 								

 							

 						

 					

+
+                    

+                        

+                            

+                                

+                                    
About these charts

+                                

+                            

+                            

+                            	

+                            		These charts represent when, how many, and by who code changes to your website are being made. 
+                            	

+                            		What is a commit?
+                                

+                                	Your website code uses version control systems which allow rolling back to previous versions easily. In this context, a commit within a version control system is protected as it is easily rolled back, even after the commit has been applied.
+                            	

+                            	

+                            		More information about this type of workflow can be found here.
+                                

+                            

+                        

+                    

 				
	
 			

 		

diff --git a/lib/loader.sh b/lib/loader.sh
index c94b5c8..2ce31d9 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -25,6 +25,8 @@ fi
 #   status      Will place the next trace output on the same line, e.g.
 #               [trace 1]Checking database... [trace 2]OK will render 
 #               Checking database... OK in the logs
+#   notime      Output trace with no timestamp, generally used after a 
+#               `trace status "blahblah"`  
 # Returns:  
 #   None
 ###############################################################################      
@@ -33,7 +35,10 @@ function trace() {
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
       echo -e -n "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) ${2}"
-      echo "${TIMESTAMP} ${2}" >> "${logFile}"
+      echo -e -n "${TIMESTAMP} ${2}" >> "${logFile}"
+    elif [[ "${1}" == "notime" ]]; then
+      echo -e "${2}"
+      echo "${2}" >> "${logFile}"
     else
       echo -e "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) $*"
       echo "${TIMESTAMP} $*" >> "${logFile}"
@@ -41,7 +46,9 @@ function trace() {
   else
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
-      echo -n "${TIMESTAMP} ${2}" >> "${logFile}"
+      echo -e -n "${TIMESTAMP} ${2}" >> "${logFile}"
+    elif [[ "${1}" == "notime" ]]; then
+      echo "${2}" >> "${logFile}"
     else
       echo "${TIMESTAMP} $*" >> "${logFile}"
     fi
diff --git a/lib/wp.sh b/lib/wp.sh
index cb2d1dd..5b698ce 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -13,19 +13,19 @@ function wpPkg() {
 
     # Is wp-cli installed? 
     if hash "${WPCLI}"/wp 2>/dev/null; then
-    trace "wp-cli found, checking for Wordpress..."
+    trace status "wp-cli found, checking for Wordpress... "
 
       # Check for Wordpress
       if [[ -f "${WORKPATH}"/"${APP}${WPROOT}${WPSYSTEM}"/wp-settings.php ]]; then
-        trace "Wordpress found!"
+        trace notime "FOUND"
         cd "${WORKPATH}"/"${APP}${WPROOT}${WPAPP}"; \
 
         # Database check
-        trace status "Checking database: "
+        trace status "Checking database... "
         "${WPCLI}"/wp db check &>> /dev/null; EXITCODE=$?; 
         if [[ "${EXITCODE}" != "0" ]]; then 
           "${WPCLI}"/wp db check &>> "${logFile}"; 
-          trace "ERROR: Database check failed"
+          trace notime "FAIL"
           if [[ "${AUTOMATE}" == "1" ]]; then
             error "There is a problem with your Wordpress installation, check your configuration."
           else
@@ -33,7 +33,7 @@ function wpPkg() {
           fi
         else
         	# Get info
-        	info "OK"
+        	trace notime "OK"
           wp core version --extra  &>> "${logFile}";
 
           # Check for Wordfence
@@ -69,7 +69,7 @@ function wpPkg() {
           fi
         fi
       else
-        trace "Wordpress not found"
+        trace notime "NOT FOUND"
       fi
     else
       trace "wp-cli not found"

From 1f27fcf54323c1986f77459d92665cf0c462fe56 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 25 Aug 2018 15:09:28 -0700
Subject: [PATCH 097/334] Getting analytics engagement dashboard started

---
 etc/html/active/stats/css/styles.css  |  20 ++++
 etc/html/active/stats/engagement.html | 163 ++++++++++++++++++++++++++
 lib/analytics.sh                      |  19 ++-
 lib/statistics.sh                     |  11 ++
 4 files changed, 210 insertions(+), 3 deletions(-)
 create mode 100755 etc/html/active/stats/engagement.html

diff --git a/etc/html/active/stats/css/styles.css b/etc/html/active/stats/css/styles.css
index 4661481..56e5926 100755
--- a/etc/html/active/stats/css/styles.css
+++ b/etc/html/active/stats/css/styles.css
@@ -94,3 +94,23 @@ textarea.form-control {
 .text-white {
   color: #ffffff;
 }
+
+.progress-bar-vertical {
+  width: calc(86% / 7);
+  min-height: 340px;
+  display: flex;
+  align-items: flex-end;
+  float: left;
+}
+
+.progress-bar-vertical-margin {
+  margin-right: 2%;
+}
+
+.progress-bar-vertical .progress-bar {
+  width: 100%;
+  height: 0;
+  -webkit-transition: height 0.6s ease;
+  -o-transition: height 0.6s ease;
+  transition: height 0.6s ease;
+}
diff --git a/etc/html/active/stats/engagement.html b/etc/html/active/stats/engagement.html
new file mode 100755
index 0000000..fd44e0e
--- /dev/null
+++ b/etc/html/active/stats/engagement.html
@@ -0,0 +1,163 @@
+
+
+
+	
+	
+	{{PROJNAME}} • {{PROJCLIENT}}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+
+	

+		

+			

+				Reports
+				

+				
+				

+				
+				
 

+			

+
+			

+				
    
+					
  • Updated {{NOW}}
    • 
+				

+				My Dashboard > Audience Engagement
+				

+ 				

+                    

+                        

+                            

+                                

+                                    
{{GA_HITS}} hits (Last 7 days)

+                                

+                            

+                            

+
+	                            

+    								

+      									{{hits_6}}
{{hits_date_6}}
+    								

+  								

+
+	                            

+    								

+      									{{hits_5}}
{{hits_date_5}}
+    								

+  								

+
+	                            

+    								

+      									{{hits_4}}
{{hits_date_4}}
+    								

+  								
  								
+
+	                            

+    								

+      									{{hits_3}}
{{hits_date_3}}
+    								

+  								

+
+	                            

+    								

+      									{{hits_2}}
{{hits_date_2}}
+    								

+  								

+
+	                            

+    								

+      									{{hits_1}}
Yesterday
+    								

+  								

+
+	                            

+    								

+      									{{hits_0}}
Today
+    								

+  								

+
+                            

+                        

+                    

+                    

+                        

+                            

+                                

+                                    
About these charts

+                                

+                            

+                            

+                            	

+                            		blahblah
+                            	

+                            

+                        

+                    
 
+                
	
+			

+		

+	

+
+	

+		
+		
+		
+	
+
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 091700a..77941c6 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -14,10 +14,10 @@ trace "Loading analytics functions"
 
 # Initialize variables
 read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
-  GA_SOCIAL ANALYTICSMSG ga_var ga_day ga_sequence max_value <<< ""
+  GA_SOCIAL ANALYTICSMSG ga_var ga_day ga_sequence max_value n GA_TOTAL <<< ""
 echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} 
   ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG} ${ga_var} 
-  ${ga_sequence} ${max_value}" > /dev/null
+  ${ga_sequence} ${max_value} ${n} ${GA_TOTAL}" > /dev/null
 
 function ga_metrics() {
   array[0]="hits"
@@ -174,19 +174,32 @@ function ga_over_time() {
   ga_sequence="$(echo -e "${ga_sequence}" | sed -e 's/[[:space:]]*$//')"
   trace "Calculating array: ${ga_sequence}"
   IFS=', ' read -r -a a <<< "${ga_sequence}"
+
   for i in ${a[@]}; do
     if [[ $i -gt $max_value ]]; then 
       max_value=$i
     fi
   done
-  trace "Max sequence value=${max_value}"
 
   # Calculate
   for ((n=0; n < $2; n++)); do 
     var="$1_$n"; var_percent="$1_percent_$n"
     var_percent=$(awk "BEGIN { pc=100*${!var}/${max_value}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
     trace "100*${!var}/${max_value} = ${var_percent}%"
+
+    # Store values
+    eval $1_$n="${!var}"
+    eval $1_percent_$n="${var_percent}"
+
+    if [[ "${PROJSTATS}" == "1" ]]; then
+      sed -i -e "s^{{$1_$n}}^${!var}^g" \
+        -e "s^{{$1_percent_$n}}^${var_percent}^g" \
+        -e "s^{{$1_date_$n}}^${n} days ago^g" \
+        "${htmlFile}"
+    fi    
   done
+
+  trace "Values: ${hits_0}, ${hits_1}, ${hits_2}, ${hits_3}, ${hits_4}, ${hits_5}, ${hits_6}"
 }
 
 # If no other results are worth displaying, fall back to displaying hits
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 78e2e40..f96f7cd 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -80,6 +80,7 @@ function project_stats() {
     project_statistics
     project_firewall
     project_backup
+    project_engagement
 
     # Post files
     postLog
@@ -119,6 +120,16 @@ function project_firewall() {
   process_html; cat "${htmlFile}" > "/tmp/stats/firewall.html"
 }
 
+function project_engagement() {
+  cat "${deployPath}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${htmlFile}"
+  # This just for testing, will turn it into a loop
+  ga_over_time hits 7
+
+  # Process the HTML
+  process_html; 
+  cat "${htmlFile}" > "/tmp/stats/engagement.html"
+}
+
 function project_backup() {
   # Get file directory
   #echo "${BACKUP_FILES}" > "${trshFile}"

From 0052977e3d86985486cf01d8c425c02918fbab32 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 26 Aug 2018 21:24:20 -0700
Subject: [PATCH 098/334] Analytic charts

---
 CHANGELOG.md                                  |   2 +
 etc/html/active/digest/commit.html            |   1 +
 etc/html/active/digest/footer.html            |  34 ++
 etc/html/active/digest/header.html            | 102 ++++
 etc/html/active/digest/mockup.html            | 139 +++++
 etc/html/active/digest/scan-pass.png          | Bin 0 -> 2132 bytes
 etc/html/active/digest/speed.png              | Bin 0 -> 3155 bytes
 etc/html/active/digest/uptime.png             | Bin 0 -> 3468 bytes
 etc/html/active/digest/wrap.html              |   1 +
 etc/html/active/stats/engagement.html         | 321 +++++++-----
 etc/html/default/digest/footer.html           |  19 +-
 etc/html/default/digest/header.html           |  26 +-
 etc/html/default/stats/activity.html          | 121 +++++
 etc/html/default/stats/backup.html            | 115 ++++
 etc/html/default/stats/css/bootstrap.min.css  |   5 +
 etc/html/default/stats/css/styles.css         | 116 ++++
 etc/html/default/stats/engagement.html        | 220 ++++++++
 etc/html/default/stats/firewall.html          | 113 ++++
 .../fonts/glyphicons-halflings-regular.eot    | Bin 0 -> 20290 bytes
 .../fonts/glyphicons-halflings-regular.svg    | 229 ++++++++
 .../fonts/glyphicons-halflings-regular.ttf    | Bin 0 -> 41236 bytes
 .../fonts/glyphicons-halflings-regular.woff   | Bin 0 -> 23292 bytes
 .../fonts/glyphicons-halflings-regular.woff2  | Bin 0 -> 18028 bytes
 etc/html/default/stats/index.html             | 495 ++++++++----------
 etc/html/default/stats/js/bootstrap.min.js    |   7 +
 etc/html/default/stats/js/scripts.js          |   9 +
 etc/html/default/stats/scan.html              | 124 +++++
 etc/html/default/stats/stats.html             | 165 ++++++
 etc/html/default/theme.conf                   |   4 +-
 etc/html/minimal/approval.php                 | 136 +++++
 etc/html/minimal/approve.html                 |  23 +
 etc/html/minimal/client.html                  |  30 ++
 etc/html/minimal/digest/commit.html           |   1 +
 etc/html/minimal/digest/footer.html           |  34 ++
 etc/html/minimal/digest/header.html           | 102 ++++
 etc/html/minimal/digest/mockup.html           | 139 +++++
 etc/html/minimal/digest/scan-pass.png         | Bin 0 -> 2132 bytes
 etc/html/minimal/digest/speed.png             | Bin 0 -> 3155 bytes
 etc/html/minimal/digest/uptime.png            | Bin 0 -> 3468 bytes
 etc/html/minimal/digest/wrap.html             |   1 +
 etc/html/minimal/error.html                   |  19 +
 etc/html/minimal/footer.html                  |  24 +
 etc/html/minimal/header.html                  |  81 +++
 etc/html/minimal/remote/backup.png            | Bin 0 -> 2056 bytes
 etc/html/minimal/remote/backup.svg            |  12 +
 etc/html/minimal/remote/index.html            | 108 ++++
 etc/html/minimal/remote/nolog.html            |  97 ++++
 etc/html/minimal/remote/scan.png              | Bin 0 -> 2132 bytes
 etc/html/minimal/remote/scan.svg              |   9 +
 etc/html/minimal/remote/speed.png             | Bin 0 -> 3155 bytes
 etc/html/minimal/remote/speed.svg             |  13 +
 etc/html/minimal/remote/uptime.png            | Bin 0 -> 3468 bytes
 etc/html/minimal/remote/uptime.svg            |  10 +
 etc/html/minimal/remote/warning.png           | Bin 0 -> 1857 bytes
 etc/html/minimal/report/css/print.css         |   7 +
 etc/html/minimal/report/css/style.css         | 228 ++++++++
 etc/html/minimal/report/footer.html           |  14 +
 etc/html/minimal/report/header.html           |  53 ++
 etc/html/minimal/report/js/edit.js            | 139 +++++
 etc/html/minimal/scan/footer.html             |  20 +
 etc/html/minimal/scan/header.html             |  76 +++
 etc/html/minimal/stats/index.html             | 285 ++++++++++
 etc/html/minimal/success.html                 |  20 +
 install/doinst.sh                             |   2 +-
 lib/analytics.sh                              |  49 +-
 lib/digest.sh                                 |   3 +
 lib/post-log.sh                               |  12 +-
 lib/process-html.sh                           |   3 +-
 lib/statistics.sh                             |  22 +-
 69 files changed, 3674 insertions(+), 466 deletions(-)
 create mode 100755 etc/html/active/digest/commit.html
 create mode 100755 etc/html/active/digest/footer.html
 create mode 100755 etc/html/active/digest/header.html
 create mode 100755 etc/html/active/digest/mockup.html
 create mode 100755 etc/html/active/digest/scan-pass.png
 create mode 100755 etc/html/active/digest/speed.png
 create mode 100755 etc/html/active/digest/uptime.png
 create mode 100755 etc/html/active/digest/wrap.html
 create mode 100755 etc/html/default/stats/activity.html
 create mode 100755 etc/html/default/stats/backup.html
 create mode 100755 etc/html/default/stats/css/bootstrap.min.css
 create mode 100755 etc/html/default/stats/css/styles.css
 create mode 100755 etc/html/default/stats/engagement.html
 create mode 100755 etc/html/default/stats/firewall.html
 create mode 100755 etc/html/default/stats/fonts/glyphicons-halflings-regular.eot
 create mode 100755 etc/html/default/stats/fonts/glyphicons-halflings-regular.svg
 create mode 100755 etc/html/default/stats/fonts/glyphicons-halflings-regular.ttf
 create mode 100755 etc/html/default/stats/fonts/glyphicons-halflings-regular.woff
 create mode 100755 etc/html/default/stats/fonts/glyphicons-halflings-regular.woff2
 create mode 100755 etc/html/default/stats/js/bootstrap.min.js
 create mode 100755 etc/html/default/stats/js/scripts.js
 create mode 100755 etc/html/default/stats/scan.html
 create mode 100755 etc/html/default/stats/stats.html
 create mode 100755 etc/html/minimal/approval.php
 create mode 100755 etc/html/minimal/approve.html
 create mode 100755 etc/html/minimal/client.html
 create mode 100755 etc/html/minimal/digest/commit.html
 create mode 100755 etc/html/minimal/digest/footer.html
 create mode 100755 etc/html/minimal/digest/header.html
 create mode 100755 etc/html/minimal/digest/mockup.html
 create mode 100755 etc/html/minimal/digest/scan-pass.png
 create mode 100755 etc/html/minimal/digest/speed.png
 create mode 100755 etc/html/minimal/digest/uptime.png
 create mode 100755 etc/html/minimal/digest/wrap.html
 create mode 100755 etc/html/minimal/error.html
 create mode 100755 etc/html/minimal/footer.html
 create mode 100755 etc/html/minimal/header.html
 create mode 100755 etc/html/minimal/remote/backup.png
 create mode 100755 etc/html/minimal/remote/backup.svg
 create mode 100755 etc/html/minimal/remote/index.html
 create mode 100755 etc/html/minimal/remote/nolog.html
 create mode 100755 etc/html/minimal/remote/scan.png
 create mode 100755 etc/html/minimal/remote/scan.svg
 create mode 100755 etc/html/minimal/remote/speed.png
 create mode 100755 etc/html/minimal/remote/speed.svg
 create mode 100755 etc/html/minimal/remote/uptime.png
 create mode 100755 etc/html/minimal/remote/uptime.svg
 create mode 100755 etc/html/minimal/remote/warning.png
 create mode 100755 etc/html/minimal/report/css/print.css
 create mode 100755 etc/html/minimal/report/css/style.css
 create mode 100755 etc/html/minimal/report/footer.html
 create mode 100755 etc/html/minimal/report/header.html
 create mode 100755 etc/html/minimal/report/js/edit.js
 create mode 100755 etc/html/minimal/scan/footer.html
 create mode 100755 etc/html/minimal/scan/header.html
 create mode 100755 etc/html/minimal/stats/index.html
 create mode 100755 etc/html/minimal/success.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6e9b01..c740124 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Digest emails can now include a chart showing the week's analytics
 ### Changed 
 - Improved HTML post-processing
 
diff --git a/etc/html/active/digest/commit.html b/etc/html/active/digest/commit.html
new file mode 100755
index 0000000..a753414
--- /dev/null
+++ b/etc/html/active/digest/commit.html
@@ -0,0 +1 @@
+

+						  
+
+						
+							
+						
+					

\ No newline at end of file
diff --git a/etc/html/active/digest/footer.html b/etc/html/active/digest/footer.html
new file mode 100755
index 0000000..5d22d9a
--- /dev/null
+++ b/etc/html/active/digest/footer.html
@@ -0,0 +1,34 @@
+
+							
+							

+								
+									
+										
+										
+								

+											Looking for more? Check out your project's stats page.
+										

+							

+
+					
+						
+							
+						
+					
+			  	

+
+ + + diff --git a/etc/html/active/digest/header.html b/etc/html/active/digest/header.html new file mode 100755 index 0000000..051cbd2 --- /dev/null +++ b/etc/html/active/digest/header.html @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+

Your Weekly Digest

+ +

+ {{WEEKOF}} – {{NOW}}

+ +
{{PROJCLIENT}}
+ + + +
+

{{SCAN_MSG}} ◢
+ +

{{UPTIME}}% uptime ◢
+ +

{{LATENCY}}s latency ◢
+
+ + +

{{GREETING}}

+

{{ANALYTICSMSG}}

Analytics Chart

+ +

Here's a summary of code updates made to your website last week:

+
\ No newline at end of file diff --git a/etc/html/active/digest/mockup.html b/etc/html/active/digest/mockup.html new file mode 100755 index 0000000..950dd79 --- /dev/null +++ b/etc/html/active/digest/mockup.html @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+

Your Weekly Digest

+ +

+ March 30, 2018 – April 06, 2018

+ +
EMRL
+ + + +
+

Scan passed ◢
+

100% uptime ◢
+

1.54s latency ◢
+
+ + +

Happy Monday and welcome back!

+

You had 215 hits in the last week.

+ +

Here's a summary of code updates made to your website last week:

+
+
+commit 8a8dff7
+Author: Joe Horning
+Date: Thu, 5 Apr 2018 02:05:46 -0700 (2 days ago)

+Updated 2 of 2 plugins (advanced-custom-fields-pro 5.6.10, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)
+ +
+ + + + +
+ Looking for more? Check out your project's stats page. +
+
+ + + + + + +
+
+ + + diff --git a/etc/html/active/digest/scan-pass.png b/etc/html/active/digest/scan-pass.png new file mode 100755 index 0000000000000000000000000000000000000000..4974672a415771b5e3a05a946a1e1870fd2fc1aa GIT binary patch literal 2132 zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf; zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~ zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi- z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9 zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z( z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J zVrAsF0Y(IWSfehi@f10wLt5&!@I literal 0 HcmV?d00001 diff --git a/etc/html/active/digest/speed.png b/etc/html/active/digest/speed.png new file mode 100755 index 0000000000000000000000000000000000000000..551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed GIT binary patch literal 3155 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 VCxh58{^z{{40Q22)mn~`{|BIsV&nh- literal 0 HcmV?d00001 diff --git a/etc/html/active/digest/wrap.html b/etc/html/active/digest/wrap.html new file mode 100755 index 0000000..cae2bc8 --- /dev/null +++ b/etc/html/active/digest/wrap.html @@ -0,0 +1 @@ +
+
\ No newline at end of file diff --git a/etc/html/active/stats/engagement.html b/etc/html/active/stats/engagement.html index fd44e0e..ae2bab6 100755 --- a/etc/html/active/stats/engagement.html +++ b/etc/html/active/stats/engagement.html @@ -1,88 +1,89 @@ - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + - + +
+
+
+ Reports +
+ +
+ +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > Audience Engagement +
+
+
@@ -90,52 +91,108 @@

{{GA_HITS}} hits (Last 7 days)

+
+
+ {{hits_6}}
{{hits_date_6}} +
+
+ +
+
+ {{hits_5}}
{{hits_date_5}} +
+
-
-
- {{hits_6}}
{{hits_date_6}} -
-
- -
-
- {{hits_5}}
{{hits_date_5}} -
-
- -
-
- {{hits_4}}
{{hits_date_4}} -
-
- -
-
- {{hits_3}}
{{hits_date_3}} -
-
- -
-
- {{hits_2}}
{{hits_date_2}} -
-
- -
-
- {{hits_1}}
Yesterday -
-
- -
-
- {{hits_0}}
Today -
-
+
+
+ {{hits_4}}
{{hits_date_4}} +
+
+
+
+ {{hits_3}}
{{hits_date_3}} +
+
+ +
+
+ {{hits_2}}
{{hits_date_2}} +
+
+ +
+
+ {{hits_1}}
Yesterday +
+
+ +
+
+ {{hits_0}}
Today +
+
-
+ +
+
+
+

{{GA_SEARCHES}} organic searches (Last 7 days)

+
+
+
+
+
+ {{organicSearches_6}}
{{organicSearches_date_6}} +
+
+ +
+
+ {{organicSearches_5}}
{{organicSearches_date_5}} +
+
+ +
+
+ {{organicSearches_4}}
{{organicSearches_date_4}} +
+
+ +
+
+ {{organicSearches_3}}
{{organicSearches_date_3}} +
+
+ +
+
+ {{organicSearches_2}}
{{organicSearches_date_2}} +
+
+ +
+
+ {{organicSearches_1}}
Yesterday +
+
+ +
+
+ {{organicSearches_0}}
Today +
+
+
+
+ + + + + +
+ +
@@ -144,20 +201,20 @@

About these charts

-

- blahblah -

+

+ blahblah +

-
-
- - - -
- - - - + + + + + +
+ + + + diff --git a/etc/html/default/digest/footer.html b/etc/html/default/digest/footer.html index 5d22d9a..b7ef1c4 100755 --- a/etc/html/default/digest/footer.html +++ b/etc/html/default/digest/footer.html @@ -1,17 +1,14 @@ - + +
 
+ - @@ -20,8 +17,8 @@
EMRL -

EMRL • 1020 Tenth Street • Sacramento, CA 95814 • (916) 446-2440
- We ♥ your code

+

EMRL • 1020 Tenth Street • Sacramento, CA 95814 • (916) 446-2440
+ We ♥ your code
diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html index b74b7ef..08da59d 100755 --- a/etc/html/default/digest/header.html +++ b/etc/html/default/digest/header.html @@ -9,13 +9,13 @@ - + - + - - + +
-
+
-
-

Your Weekly Digest

+ 		+

Your Weekly Digest

-

+

{{WEEKOF}} – {{NOW}}

{{PROJCLIENT}}
@@ -96,7 +96,7 @@

{{GREETING}}

-

{{ANALYTICSMSG}}

+

{{ANALYTICSMSG}}

Analytics Chart

Here's a summary of code updates made to your website last week:

\ No newline at end of file diff --git a/etc/html/default/stats/activity.html b/etc/html/default/stats/activity.html new file mode 100755 index 0000000..ccb83d9 --- /dev/null +++ b/etc/html/default/stats/activity.html @@ -0,0 +1,121 @@ + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > Activity +
+
+
+
+
+
+

Activity history ({{TOTAL_COMMITS}} entries)

+
+
+
+ {{COMMITS_RECENT}} +
+
+
+
+
+
+
+

About activity

+
+
+
+

+ Every time we update your code, it is "committed" to a development system where it is stored, tracked with a uniqe ID, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong. +

+
+
+
+
+
+
+
+ +
+ + + + + diff --git a/etc/html/default/stats/backup.html b/etc/html/default/stats/backup.html new file mode 100755 index 0000000..235ccf7 --- /dev/null +++ b/etc/html/default/stats/backup.html @@ -0,0 +1,115 @@ + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > System Backup +
+
+
+
+
+
+

{{BACKUP_MSG}}

+
+
+
+

{{BACKUP_FILES}}

+
+
+
+
+
+
+

About the backup +

+
+
+
+
+
+
+
+ +
+ + + + + diff --git a/etc/html/default/stats/css/bootstrap.min.css b/etc/html/default/stats/css/bootstrap.min.css new file mode 100755 index 0000000..28f154d --- /dev/null +++ b/etc/html/default/stats/css/bootstrap.min.css @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none;visibility:hidden}.collapse.in{display:block;visibility:visible}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none;visibility:hidden}.tab-content>.active{display:block;visibility:visible}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:absolute;top:0;right:0;left:0;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file diff --git a/etc/html/default/stats/css/styles.css b/etc/html/default/stats/css/styles.css new file mode 100755 index 0000000..56e5926 --- /dev/null +++ b/etc/html/default/stats/css/styles.css @@ -0,0 +1,116 @@ +@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700'); + +body { + font-family: 'Roboto', sans-serif !important; +} + +p, td { + font-weight: 400; +} + +.navbar-static-top { + margin-bottom:20px; +} + +i { + font-size:16px; +} + +.nav > li > a { + color:#787878; +} + +footer { + margin-top:20px; + padding-top:20px; + padding-bottom:20px; + background-color:#efefef; +} + +/* count indicator near icons */ +.nav>li .count { + position: absolute; + bottom: 12px; + right: 6px; + font-size: 9px; + background: rgba(51,200,51,0.55); + color: rgba(255,255,255,0.9); + line-height: 1em; + padding: 2px 4px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + -ms-border-radius: 10px; + -o-border-radius: 10px; + border-radius: 10px; +} + +textarea.form-control { + height: 8.0em !important; +} + +.stat-label { + font-weight: 700; + font-size: 0.8em; +} + +.nav > li > a > span { + padding: 0 10px; +} + +.caret { + padding: 0 !important; +} + +.mauticform-post-success .mauticform-message { + color: white; + background-color: green; + padding: 20px; + text-align: center; + margin-bottom: 20px; + margin-top: 5px; + font-weight: 700; + font-size: 20px; +} + +.mauticform-post-success .mauticform-innerform { + display: none; +} + +@media (min-width: 768px) { + .modal-dialog { + width: 800px !important; + } +} + +.rss-items { + list-style-type: none; + -webkit-padding-start: 0px; +} + +.rss-item { + margin-bottom: 1.4em; +} + +.text-white { + color: #ffffff; +} + +.progress-bar-vertical { + width: calc(86% / 7); + min-height: 340px; + display: flex; + align-items: flex-end; + float: left; +} + +.progress-bar-vertical-margin { + margin-right: 2%; +} + +.progress-bar-vertical .progress-bar { + width: 100%; + height: 0; + -webkit-transition: height 0.6s ease; + -o-transition: height 0.6s ease; + transition: height 0.6s ease; +} diff --git a/etc/html/default/stats/engagement.html b/etc/html/default/stats/engagement.html new file mode 100755 index 0000000..b295d53 --- /dev/null +++ b/etc/html/default/stats/engagement.html @@ -0,0 +1,220 @@ + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > Audience Engagement +
+
+
+ +
+
+
+

{{GA_HITS}} hits (Last 7 days)

+
+
+
+
+
+ {{hits_6}}
{{hits_date_6}} +
+
+ +
+
+ {{hits_5}}
{{hits_date_5}} +
+
+ +
+
+ {{hits_4}}
{{hits_date_4}} +
+
+ +
+
+ {{hits_3}}
{{hits_date_3}} +
+
+ +
+
+ {{hits_2}}
{{hits_date_2}} +
+
+ +
+
+ {{hits_1}}
Yesterday +
+
+ +
+
+ {{hits_0}}
Today +
+
+
+
+ +
+
+
+

{{GA_SEARCHES}} organic searches (Last 7 days)

+
+
+
+
+
+ {{organicSearches_6}}
{{organicSearches_date_6}} +
+
+ +
+
+ {{organicSearches_5}}
{{organicSearches_date_5}} +
+
+ +
+
+ {{organicSearches_4}}
{{organicSearches_date_4}} +
+
+ +
+
+ {{organicSearches_3}}
{{organicSearches_date_3}} +
+
+ +
+
+ {{organicSearches_2}}
{{organicSearches_date_2}} +
+
+ +
+
+ {{organicSearches_1}}
Yesterday +
+
+ +
+
+ {{organicSearches_0}}
Today +
+
+
+
+ + + + + +
+ + +
+
+
+
+

About these charts

+
+
+
+

+ blahblah +

+
+
+
+
+
+
+
+ +
+ + + + + diff --git a/etc/html/default/stats/firewall.html b/etc/html/default/stats/firewall.html new file mode 100755 index 0000000..f2e58c2 --- /dev/null +++ b/etc/html/default/stats/firewall.html @@ -0,0 +1,113 @@ + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > Firewall & Security +
+
+
+
+
+
+

Not yet functional

+
+
+
+
+
+
+
+
+
+

About the firewall

+
+
+
+
+
+
+
+ +
+ + + + + diff --git a/etc/html/default/stats/fonts/glyphicons-halflings-regular.eot b/etc/html/default/stats/fonts/glyphicons-halflings-regular.eot new file mode 100755 index 0000000000000000000000000000000000000000..423bd5d3a20b804f596e04e5cd02fb4f16cfcbc1 GIT binary patch literal 20290 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etc/html/default/stats/fonts/glyphicons-halflings-regular.ttf b/etc/html/default/stats/fonts/glyphicons-halflings-regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..a498ef4e7c8b556fc36f580c5ff524025bb11c84 GIT binary patch literal 41236 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 literal 0 HcmV?d00001 diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html index 93081a1..eb148cd 100755 --- a/etc/html/default/stats/index.html +++ b/etc/html/default/stats/index.html @@ -1,285 +1,210 @@ - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - -
-

Site Smart BETA

- - -

Report generated {{NOW}}

-

{{PROJNAME}} - ({{PRODURL}}) -

- -
{{PROJCLIENT}}
- - -

Overview (last 7 days)

- -
-

{{SCAN_MSG}} ◢
- -

{{UPTIME}}% uptime ◢
- -

{{LATENCY}}s latency ◢
- -

{{LAST_BACKUP}} ◢
-
- -
- - - - - - - -
- - - - - - - -
-

Commits by day of week

-

- -

Commits by hour of week

-

- -

Commits by hour of day

-

- -

Commits by month of year

-

- -

Commits by year

-

- -

Commits by year/month

-

-

- -

- - -

- -

Any Questions?

-

If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

- - - - - - - -

-
- - - - - - -
-
- - - + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard +
+
+
+
+ +
{{SCAN_MSG}}
 +
{{UPTIME}}% uptime
 +
{{LATENCY}}s latency
 +
{{LAST_BACKUP}}
 +
+ + +
+
+
+
+

Engagement (Last 7 days)

+
+
+
+
+

{{GA_HITS}}

+

hits from visitors

+
+
+

{{GA_PERCENT}}%

+

traffic from new users

+
+
+

{{GA_SEARCHES}}

+

organic searches

+
+
+
+ + +
+
+
+
+ +

Recent Activity

+
+
+
+ {{COMMITS_RECENT}} +

+ View all +

+
+
+
+
+
+
+
+ +

Project Stats

+
+
+
+
+

+ Project: {{PROJNAME}}
+ Development: {{DEVURL}}
+ Production: {{PRODURL}} +

+

{{CODE_STATS}}

+
+
+ {{PROJCLIENT}} +
+
+ +
+ +
+

+ View all +

+
+
+
+
+
+
+ +

Support Request

+
+
+
+ +
+
+
+
+
+
+
+ + + + + +
+ + + + + + \ No newline at end of file diff --git a/etc/html/default/stats/js/bootstrap.min.js b/etc/html/default/stats/js/bootstrap.min.js new file mode 100755 index 0000000..c6d3692 --- /dev/null +++ b/etc/html/default/stats/js/bootstrap.min.js @@ -0,0 +1,7 @@ +/*! + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.2",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.2",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.2",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&"show"==b&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a(this.options.trigger).filter('[href="#'+b.id+'"], [data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.2",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0,trigger:'[data-toggle="collapse"]'},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":a.extend({},e.data(),{trigger:this});c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.2",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('
').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.divider):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j').prependTo(this.$element).on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.options.backdrop&&this.adjustBackdrop(),this.adjustDialog()},c.prototype.adjustBackdrop=function(){this.$backdrop.css("height",0).css("height",this.$element[0].scrollHeight)},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){this.bodyIsOverflowing=document.body.scrollHeight>document.documentElement.clientHeight,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||"destroy"!=b)&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.3.2",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-mp.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||"destroy"!=b)&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.2",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.2",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.2",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e() +}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.2",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a("body").height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file diff --git a/etc/html/default/stats/js/scripts.js b/etc/html/default/stats/js/scripts.js new file mode 100755 index 0000000..445a9e0 --- /dev/null +++ b/etc/html/default/stats/js/scripts.js @@ -0,0 +1,9 @@ + +$(document).ready(function(){$(".alert").addClass("in").fadeOut(4500); + +/* swap open/close side menu icons */ +$('[data-toggle=collapse]').click(function(){ + // toggle icon + $(this).find("i").toggleClass("glyphicon-chevron-right glyphicon-chevron-down"); +}); +}); \ No newline at end of file diff --git a/etc/html/default/stats/scan.html b/etc/html/default/stats/scan.html new file mode 100755 index 0000000..7155c2e --- /dev/null +++ b/etc/html/default/stats/scan.html @@ -0,0 +1,124 @@ + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > Malware Scan +
+
+
+
+
+
+

Malware scan: {{SCAN_MSG}}

+
+
+
+ {{SCAN_STATS}} +
+
+
+
+
+
+
+

About the scan

+
+
+
+

+ Our system performs comprehensive tests against your web server for multiple items, including over 6700 potentially dangerous files and programs, checks for outdated versions of over 1250 servers, and version specific problems on over 270 servers. +

+

+ It also checks for server configuration items such as the presence of multiple index files, HTTP server options, and will attempt to identify installed web servers and software. Scan items and plugins are frequently updated and are automatically updated. +

+
+
+
+
+
+
+
+ +
+ + + + + diff --git a/etc/html/default/stats/stats.html b/etc/html/default/stats/stats.html new file mode 100755 index 0000000..a2ddb5e --- /dev/null +++ b/etc/html/default/stats/stats.html @@ -0,0 +1,165 @@ + + + + + + {{PROJNAME}} • {{PROJCLIENT}} + + + + + + + + + + + + + + +
+
+
+ Reports +
+ + +

 

+
+ +
+
    +
  • Updated {{NOW}}
    • +
+ My Dashboard > Statistics +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+

About these charts

+
+
+
+

+ These charts represent when, how many, and by who code changes to your website are being made. +

+ What is a commit? +

+ Your website code uses version control systems which allow rolling back to previous versions easily. In this context, a commit within a version control system is protected as it is easily rolled back, even after the commit has been applied. +

+

+ More information about this type of workflow can be found here. +

+
+
+
+
+
+
+
+ +
+ + + + + diff --git a/etc/html/default/theme.conf b/etc/html/default/theme.conf index 13d06da..1535ad0 100755 --- a/etc/html/default/theme.conf +++ b/etc/html/default/theme.conf @@ -6,7 +6,7 @@ # Setup theme colors DEFAULTC="#555555" -PRIMARYC="#47ACDF" +PRIMARYC="#337ab7" SECONDARYC="#CCCCCC" SUCCESSC="#28a745" INFOC="#5D6D7E" @@ -18,4 +18,4 @@ LOGBC="#272727" # If you'd like to add Smooch.io live chat to your digest and statistics pages, # enter your App ID below # SMOOCHID="########################" -SMOOCHID="9pobrmwccxk3fozbbdyy9q0eh" +SMOOCHID="55ba69c672bbe71900c4ee44" diff --git a/etc/html/minimal/approval.php b/etc/html/minimal/approval.php new file mode 100755 index 0000000..bc57500 --- /dev/null +++ b/etc/html/minimal/approval.php @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +

{{LOGTITLE}}

+ + {{PROJCLIENT}} +

Date: {{NOW}}
+ Project: {{PROJNAME}} ({{PROJCLIENT}})
+ Staging URL: {{DEVURL}}
+ Production URL: {{PRODURL}} +

+ +

Proposed commit from {{USER}}
+ {{NOTES}}

+ + + + + + + + +
Deny Approve
+ + '; +} elseif ($approved) { + echo 'You have approved this commit and it will be deployed soon.'; +} else { + echo 'You have denied this commit and it will not be deployed.'; +} +?> + + +
+ + + + + + + + + + + 

diff --git a/etc/html/minimal/approve.html b/etc/html/minimal/approve.html
new file mode 100755
index 0000000..f75aacf
--- /dev/null
+++ b/etc/html/minimal/approve.html
@@ -0,0 +1,23 @@
+		
Proposed commit from {{USER}}

+			{{NOTES}}

+
+		
+		
+			
+				
+				
+				
+				
+				
+			
+		
 Review  Deny  Approve 

+
+ + + + + + + 

diff --git a/etc/html/minimal/client.html b/etc/html/minimal/client.html
new file mode 100755
index 0000000..36a6a13
--- /dev/null
+++ b/etc/html/minimal/client.html
@@ -0,0 +1,30 @@
+          
Message:  Updates have been deployed to your website.

+          {{NOTES}}

+          
+          
+          
+            
+              
+            
+          
 Learn More 

+
+ + + + + + + + + + + + + + diff --git a/etc/html/minimal/digest/commit.html b/etc/html/minimal/digest/commit.html new file mode 100755 index 0000000..a753414 --- /dev/null +++ b/etc/html/minimal/digest/commit.html @@ -0,0 +1 @@ +
+ + + + + +
\ No newline at end of file diff --git a/etc/html/minimal/digest/footer.html b/etc/html/minimal/digest/footer.html new file mode 100755 index 0000000..5d22d9a --- /dev/null +++ b/etc/html/minimal/digest/footer.html @@ -0,0 +1,34 @@ + + +
+ + + + +
+ Looking for more? Check out your project's stats page. +
+
+ + + + + + +
+
+ + + diff --git a/etc/html/minimal/digest/header.html b/etc/html/minimal/digest/header.html new file mode 100755 index 0000000..051cbd2 --- /dev/null +++ b/etc/html/minimal/digest/header.html @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + +
+

Your Weekly Digest

+ +

+ {{WEEKOF}} – {{NOW}}

+ +
{{PROJCLIENT}}
+ + + +
+

{{SCAN_MSG}} ◢
+ +

{{UPTIME}}% uptime ◢
+ +

{{LATENCY}}s latency ◢
+
+ + +

{{GREETING}}

+

{{ANALYTICSMSG}}

Analytics Chart

+ +

Here's a summary of code updates made to your website last week:

+
\ No newline at end of file diff --git a/etc/html/minimal/digest/mockup.html b/etc/html/minimal/digest/mockup.html new file mode 100755 index 0000000..950dd79 --- /dev/null +++ b/etc/html/minimal/digest/mockup.html @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+

Your Weekly Digest

+ +

+ March 30, 2018 – April 06, 2018

+ +
EMRL
+ + + +
+

Scan passed ◢
+

100% uptime ◢
+

1.54s latency ◢
+
+ + +

Happy Monday and welcome back!

+

You had 215 hits in the last week.

+ +

Here's a summary of code updates made to your website last week:

+
+
+commit 8a8dff7
+Author: Joe Horning
+Date: Thu, 5 Apr 2018 02:05:46 -0700 (2 days ago)

+Updated 2 of 2 plugins (advanced-custom-fields-pro 5.6.10, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)
+ +
+ + + + +
+ Looking for more? Check out your project's stats page. +
+
+ + + + + + +
+
+ + + diff --git a/etc/html/minimal/digest/scan-pass.png b/etc/html/minimal/digest/scan-pass.png new file mode 100755 index 0000000000000000000000000000000000000000..4974672a415771b5e3a05a946a1e1870fd2fc1aa GIT binary patch literal 2132 zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf; zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~ zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi- z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9 zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z( z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J zVrAsF0Y(IWSfehi@f10wLt5&!@I literal 0 HcmV?d00001 diff --git a/etc/html/minimal/digest/speed.png b/etc/html/minimal/digest/speed.png new file mode 100755 index 0000000000000000000000000000000000000000..551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed GIT binary patch literal 3155 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 VCxh58{^z{{40Q22)mn~`{|BIsV&nh- literal 0 HcmV?d00001 diff --git a/etc/html/minimal/digest/wrap.html b/etc/html/minimal/digest/wrap.html new file mode 100755 index 0000000..cae2bc8 --- /dev/null +++ b/etc/html/minimal/digest/wrap.html @@ -0,0 +1 @@ +
+ + + + + +
\ No newline at end of file diff --git a/etc/html/minimal/error.html b/etc/html/minimal/error.html new file mode 100755 index 0000000..73087db --- /dev/null +++ b/etc/html/minimal/error.html @@ -0,0 +1,19 @@ +

ERROR: + {{NOTES}}

+ + + + + + + + +
+ + + + + 

diff --git a/etc/html/minimal/footer.html b/etc/html/minimal/footer.html
new file mode 100755
index 0000000..ec82169
--- /dev/null
+++ b/etc/html/minimal/footer.html
@@ -0,0 +1,24 @@
+
+
+
+ + + + + + +
+
+ + diff --git a/etc/html/minimal/header.html b/etc/html/minimal/header.html new file mode 100755 index 0000000..c022d06 --- /dev/null +++ b/etc/html/minimal/header.html @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + +

{{LOGTITLE}}

+ + + {{PROJCLIENT}} + +

Date: {{NOW}}
+ Project: {{PROJNAME}} ({{PROJCLIENT}})
+ Staging URL: {{DEVURL}}
+ Production URL: {{PRODURL}} +

+
Uptime: {{UPTIME}}% ◢
+
Latency: {{LATENCY}}s ◢
+ \ No newline at end of file diff --git a/etc/html/minimal/remote/backup.png b/etc/html/minimal/remote/backup.png new file mode 100755 index 0000000000000000000000000000000000000000..91e60ff48cf06c909d83647d29c56992a9f3b333 GIT binary patch literal 2056 zcmb7Fi#yYc8~^TNE^Qdn@N+qvP#ts2CD&oOP|P-aWHu32)+%+L7~&ig#?`*}Xk=lMME^L(E7dEWeEf!+ueT@?TT z5WYV6pdIA=+e)yV8T2keaR+orhY6(Mq_ZSS)TLO!JtiqS*2wol6frg^HYz6lVo$6y z04V;>@c_x~=$py$JG+J!Hv=hyeFHH%JG=iw5oYG*>i0Cbn*U>PC?Huq zs-P}IIREnkq2t;5CbqBBcG%4gyOp^r{qXXTc_AoTBg6jPxBaA6ikb}5n;h^4HGG<0 z{D20k(B7(7k+*=jl4yE93SAb(8|DIvy`!CC=kO~k_5QyV#NoRf`IiP8J|Vr_)W07gr-%c5Nl5p65S z6=Yn{L(`56DNjZv_tvg;%edvGd$n6NrE9Y*2Oi*w1}f9M>~&UmrkCtyaJAwECwNiQ zdTheBs*9vQ;#_BZ5c6P{1<#Nv3`OOU&e1{YZYCUnZm4+-!oRbOk#|}R*_nXxW^#~1 z(wXjuQWS)b$Ewke4b~Cdl20ouz6(PY)r052t!BrCt)T`C2 zBd3}!yAz%DN?}7|r@S&ntkQ8OXu5}p$UA_zukLz;Wh6I`=B~A{OTi0A+ru=s2@;5B zRb2DaNn0edZEDZN^)>ykC5?Us2&^#BL}eODm!so9oz6Gw>Uga^;=gn#SG;Fg8!z}r zG4q#=|Mf<02IX66mIzY}qG;QO4fM?Wao0yZQWx}oc;T
    s>n;YnsaGkZj?5iGKF z*SDk>Uarfn3rfte^Wib@h!a_*Bgc##7#nx9ML3=$Z(;9pvmi?>ve#C|hO=;fw+B;g z(nhf=UjE7RXocwIv7fqL@zutnsz~K91g@FEvffIim@~$;1q|C{6q!T=7Y*4yCFs z`!H=PPyf}y&E}AAN$rEnr-Fk#B?@7_0 zx%n}kZ^0wJe#xn)tD0a`!`OD2y9?yH+=mIQ0ryn_`A)UDD(=-Om&;_o6{>hCx z{fV%l9|c&^OQ@H+xj>QtJZSImlR83e!Dz~~ z6fWtT>Px%Vw2w@fUXb?&*Yz#9vT|#{s43gsp@G?N7Zjge{9F$M2rM?iJakBVs>Brr z3|{5|I4Dz}bHG};5X2#Cae%3EH%lO`wgAMjae)Jsb97K`3nVR93HXdy^0A>2A$@VM zr39KzKahwRTJ?PoSZQ&~fN(vU2g=#n6ig$Y6(E>opvHab+NE@Kf=33;=DE4v)B!PQ zpzOIWZkSnY2eP1lIynkPDsTcM7TZ7Cau8y0V4AE8Xp0n;{RvX^pJV_$;yA1@7_0gU zJ81?#QVpPHQl)uh3x0U4e_?jSDW~-(851dq0Acs`m+XCdY7`}tw4TeA25PB?ULB;K zQE8#oJWs@>MBOtSOK~7}d74qzLiG3QLj(v~K{W4Y^r#I&2=CEOo z@w<&Yj6ZHHoe(~yKnV<}CmMvu%748e5=;PP0D9(p^LUEhMg}#=C(n3yTTTCW8dpPq z|IB~N_8v8S;SAyzt%hh&&5@_~X^=X_uHi0~3N0neCr>pOjc(nBVlFGQ{VJ6Y{!EuA zl;*IJkUHgWp?gT_uF1GW(xdUo={%YEE32X)nVfdw7>4y}b9gPQMmE$DXPHfpd{qq^ zM9j~wbgrboAFrH+Hw78rummsm5OO0&HUgGw-EzI4`-%takxX+T`z+0#5o^WUM+QHf zUVlvP`Kuws^a$ix6s-07it6*CoK=ffiA`nIGtdaC`oS+kLPw$1EAOAamal#hge(pJ ynN{xm@z!fzg(LbB*M6)9@*f@~0O0?og5f||NgoB{^0fG0tMB1Je1pg7oc{yjh@kBN literal 0 HcmV?d00001 diff --git a/etc/html/minimal/remote/backup.svg b/etc/html/minimal/remote/backup.svg new file mode 100755 index 0000000..b677891 --- /dev/null +++ b/etc/html/minimal/remote/backup.svg @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/etc/html/minimal/remote/index.html b/etc/html/minimal/remote/index.html new file mode 100755 index 0000000..ce60ec6 --- /dev/null +++ b/etc/html/minimal/remote/index.html @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + +
    +

    About Your Weekly Digest

    + + +

    Hey there!

    + +

    If you found this page, you must have received a weekly digest about your website! That's part of our ongoing effort to be as transparent as possible and let our clients in on the stuff that happens with their website development and maintenance.

    + +

    Every time we update your code, it is "committed" to a development system where it is stored, tracked, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong. This is an industry-standard approach to software development, and if you're feeling nerdy you can learn more about it on Wikipedia.

    + +

    The weekly digest will include notes on code changes we have made at your request, as well as system updates and security patches.

    + +

    Scheduled Updates & Maintenance

    +

    Security Patches: Every Sunday & Thursday at 2:00am

    +

    System Updates: Every Sunday & Thursday at 2:00am

    +

    + Off-site Backup: Every Sunday at 3am

    + +

    Any Questions?

    +

    If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

    + + + + + + + +
    + + + + + + +
    +
    + + + + diff --git a/etc/html/minimal/remote/nolog.html b/etc/html/minimal/remote/nolog.html new file mode 100755 index 0000000..52969a2 --- /dev/null +++ b/etc/html/minimal/remote/nolog.html @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + +
    + + + + + +

    Darn it, there doesn't appear to be a logfile for that commit.

    + +

    If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

    + + + + + + + +
    + + + + + + +
    +
    + + + + diff --git a/etc/html/minimal/remote/scan.png b/etc/html/minimal/remote/scan.png new file mode 100755 index 0000000000000000000000000000000000000000..4974672a415771b5e3a05a946a1e1870fd2fc1aa GIT binary patch literal 2132 zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf; zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~ zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi- z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9 zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z( z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J zVrAsF0Y(IWSfehi@f10wLt5&!@I literal 0 HcmV?d00001 diff --git a/etc/html/minimal/remote/scan.svg b/etc/html/minimal/remote/scan.svg new file mode 100755 index 0000000..e5aad72 --- /dev/null +++ b/etc/html/minimal/remote/scan.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/etc/html/minimal/remote/speed.png b/etc/html/minimal/remote/speed.png new file mode 100755 index 0000000000000000000000000000000000000000..551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed GIT binary patch literal 3155 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 + + + + + + + diff --git a/etc/html/minimal/remote/uptime.png b/etc/html/minimal/remote/uptime.png new file mode 100755 index 0000000000000000000000000000000000000000..158e8a40e23f3ede2c5cb6ff3811007bf99cfaf1 GIT binary patch literal 3468 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 VCxh58{^z{{40Q22)mn~`{|BIsV&nh- literal 0 HcmV?d00001 diff --git a/etc/html/minimal/remote/uptime.svg b/etc/html/minimal/remote/uptime.svg new file mode 100755 index 0000000..0a98f23 --- /dev/null +++ b/etc/html/minimal/remote/uptime.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/etc/html/minimal/remote/warning.png b/etc/html/minimal/remote/warning.png new file mode 100755 index 0000000000000000000000000000000000000000..741aba5532000142c6da9a9e0b09fc65ee8eb879 GIT binary patch literal 1857 zcma)5eK^zW8~<*IO?J(@pO>0cb0l&ozlm*5mY8=crSh`rWh!qWrA(c}*h(zNs>4DZ zZ;?fbDT-O^crBf?Xk=nKF{T&a8r%8m_xJC*&U0PQb3fPp+|PaApU>xca)ScA^^oRB z008uSc6o(Bwqs@Ltb*2%H^;Rh^Pf|s@Kd4jhfk$NC&dDu)cBZKjL(VaBe5Z|(bV)r zQLH-vteWug@(epYJR^~uu<$k#C?=m04;_R{JP%~;zVI^34IK)5mE{|R@X@XAkasvd zxqH5_rNfSA_2iFbPD#E}sc|7nR9H3cv6vw58~kF0=8PK90RRr@02tu^Zk*G<$(ohp zy}s`zq7e6t)rtjqC)nSdlNL#cFh-$sKTghm22&qcYND%^V+Teh=NHRH6ch}7i$r}r zKMT12LA67cSv@kw;$HMmXcQ3IM%6Bl<(avT#m%n8dJ5B80c`)fPfY1tcYle!q4rUp za;;FFsTa>8;fQhW>%X;Q=u*DA;r%(n1bNhgX+R{q%Rg;}oUQ7HY7YnS#RPc20a5<| ztn4lgHDe~xYjAgMRrSdM42`fi%b9bk?XxYvjyFwv*FJ~Qq-6thTJT+?%Q*$I-t4i3 z!%L+YdV++jize=ts2@jc`|_LA7ViVxHdP0KX^6}&3Fu4&NcU1_aKG?uVMZg%IsS9A zD1vWBA&@t#+N`pNcTgACx~WSK?#oEBIe<76xfIv0v=`v4Q9+uOs|D&d>(u>MHK?;H zq5K<%V%LSm5x1>zUj=6jL#g5svg9r-0;8M1Mi=Hat0Ge_SEIR2h|xMQ`I1NF7L!SU zpWx5{^828C4LcUcew^YU6+WmdEbaUPpgdJw_x-|p`g}=|F1q7)2*Rc~s8w)1?D(Fg z9phuW!2tml5oPFWbv7W{-WRA{Ve(NOxEIY`Pk$vDnTNS|xX)N>Ms{hS||L>E^)nWqd6z^iPhIC=95 z(KPDq)1djSI-BT72$GH!cjltWiUc%uc|H2dM7fiBCm%4;BX6Y6c=-L3gQ08YZ=F8bV=O^&MZ&sDr5_%$>F zHjJ;)l%8VH!W#_>2#>CDWNh}gM0g#=G3F*R>-9c^H zDZ^L&GO)UmMA(@EPy(rSS;rygl!~_e`q8Q8&gUs-keCYuhYz39T(k$43m%!=(;@cg z6ACutUmvkmmCZ|f^$F}rIU8r$AvSa@h_!F6g`{wLB3FnWSwWGcSI5vw(!}C<*Js;l$so#9FSZm-u9&>q@U`in} za?E0R6y){B#f8Ei-mo!f{3^jJUl=2A-Qo2@G%-rVF8J5+VbFJG;$j@PF#}Id0^Oxz zc5l6Noe7;|^CQnEBS}{~L15bQ-y_B=jz%|pdU)`X>JH8~>J@iimsJUKZ1XZ=0tO2R*MTPYJ2LT;&Jc0-SFhCPP1OIvx ctMI480Ik2ZH{1{p`2o=IAq9BV{}grMALYMgvH$=8 literal 0 HcmV?d00001 diff --git a/etc/html/minimal/report/css/print.css b/etc/html/minimal/report/css/print.css new file mode 100755 index 0000000..65433c5 --- /dev/null +++ b/etc/html/minimal/report/css/print.css @@ -0,0 +1,7 @@ +table tr { + border-bottom: solid 1px black; +} +#hiderow, +.delete { + display: none; +} \ No newline at end of file diff --git a/etc/html/minimal/report/css/style.css b/etc/html/minimal/report/css/style.css new file mode 100755 index 0000000..37999dc --- /dev/null +++ b/etc/html/minimal/report/css/style.css @@ -0,0 +1,228 @@ +* { + margin: 0; + padding: 0; +} +body { + font: 14px/1.4 Arimo, sans-serif; +} +#page-wrap { + width: 800px; + margin: 6px auto; +} +textarea { + border: 0; + font: 14px Arimo, sans-erif; + overflow: hidden; + resize: none; +} +table { + border-collapse: collapse; +} +table td, +table th { + border: 1px solid black; + padding: 5px; +} +table thead { + display: table-header-group; +} +table tr { + page-break-inside: avoid; + page-break-after: auto; +} +#header { + height: 15px; + width: 100%; + margin: 20px 0; + background: #222; + text-align: center; + color: white; + text-decoration: uppercase; + letter-spacing: 20px; + padding: 8px 0px; +} +#address { + width: 250px; + height: 150px; + float: left; +} +#customer { + overflow: hidden; +} +#logo { + text-align: right; + float: right; + position: relative; + margin-top: 25px; + border: 1px solid #fff; + max-width: 540px; + max-height: 100px; + overflow: hidden; +} +#logo:hover, +#logo.edit { + border: 1px solid #000; + margin-top: 0px; + max-height: 125px; +} +#logoctr { + display: none; +} +#logo:hover #logoctr, +#logo.edit #logoctr { + display: block; + text-align: right; + line-height: 25px; + background: #eee; + padding: 0 5px; +} +#logohelp { + text-align: left; + display: none; + font-style: italic; + padding: 10px 5px; +} +#logohelp input { + margin-bottom: 5px; +} +.edit #logohelp { + display: block; +} +.edit #save-logo, +.edit #cancel-logo { + display: inline; +} +.edit #image, +#save-logo, +#cancel-logo, +.edit #change-logo, +.edit #delete-logo { + display: none; +} +#customer-title { + font-size: 20px; + font-weight: bold; + float: left; +} +#meta { + margin-top: 10px; + width: 300px; + float: right; +} +#meta td { + text-align: right; +} +#meta td.meta-head { + text-align: left; + background: #eee; +} +#meta td textarea { + width: 100%; + height: 20px; + text-align: right; +} +#desc { + margin-top: 10px; + width: 400px; + float: left; +} +#items { + clear: both; + width: 100%; + margin: 30px 0 0 0; + border: 1px solid black; + -webkit-box-decoration-break: clone; + box-decoration-break: clone; +} +#items th { + text-align: left; + background: #eee; +} +#items textarea { + width: 80px; + height: 50px; +} +#items tr.item-row td { + border: 0; + vertical-align: top; +} +#items td.description { + width: 70%; +} +#items td.item-name { + width: 18%; +} +#items td.description textarea, +#items td.item-name textarea { + width: 100%; +} +#items td.total-line { + border-right: 0; + text-align: right; +} +#items td.total-value { + border-left: 0; + padding: 10px; +} +#items td.total-value textarea { + height: 20px; + background: none; +} +#items td.balance { + background: #eee; +} +#items td.blank { + border: 0; +} +#terms { + text-align: center; + margin: 40px 0 0 0; +} +#terms h5 { + text-transform: uppercase; + font: 13px; + letter-spacing: 10px; + border-bottom: 1px solid black; + padding: 0 0 8px 0; + margin: 0 0 8px 0; +} +#terms textarea { + width: 100%; + text-align: center; +} +textarea:hover, +#items td.total-value textarea:hover, +#items td.total-value textarea:focus, +div.editable:hover { + background-color: none; + outline: none !important; + border-bottom: none; + box-shadow: inset 0 -1px 0px 0px #E6E6E6; +} +textarea:focus, +div.editable:focus { + outline: none !important; + box-shadow: inset 0 -1px 0px 0px #bbb; +} +.delete:hover { + color: #ffffff; +} +.delete-wpr { + position: relative; +} +.delete { + display: block; + color: #000; + text-decoration: none; + position: absolute; + background: #EEEEEE; + font-weight: bold; + padding: 0px 3px; + border: none; + top: 0px; + left: -22px; + font-size: 12px; +} +.editable { + outline: none; +} diff --git a/etc/html/minimal/report/footer.html b/etc/html/minimal/report/footer.html new file mode 100755 index 0000000..d6d3ffb --- /dev/null +++ b/etc/html/minimal/report/footer.html @@ -0,0 +1,14 @@ + +
Add a row
+ +
+
Thank you
+ EMRL • 1020 Tenth Street • Sacramento, CA 95814 • (916) 446-2440 • support@emrl.com +
+
+ + + diff --git a/etc/html/minimal/report/header.html b/etc/html/minimal/report/header.html new file mode 100755 index 0000000..e6e0b1f --- /dev/null +++ b/etc/html/minimal/report/header.html @@ -0,0 +1,53 @@ + + + + + + + Monthly Maintenance Report for {{PROJCLIENT}} + + + + + + + + + +
+
+ {{LASTMONTH}} maintenance report for +
+

{{PROJCLIENT}}
+ +

+ +
+

+ This report for the month of {{LASTMONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}} +

+
+ + + + + + + + + + + +
Ref. #
Date
+
+ + + + + + + + + diff --git a/etc/html/minimal/report/js/edit.js b/etc/html/minimal/report/js/edit.js new file mode 100755 index 0000000..cf95d27 --- /dev/null +++ b/etc/html/minimal/report/js/edit.js @@ -0,0 +1,139 @@ +function print_today() { + // *********************************************** + // AUTHOR: WWW.CGISCRIPT.NET, LLC + // URL: http://www.cgiscript.net + // Use the script, just leave this message intact. + // Download your FREE CGI/Perl Scripts today! + // ( http://www.cgiscript.net/scripts.htm ) + // *********************************************** + var now = new Date(); + var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December'); + var date = ((now.getDate()<10) ? "0" : "")+ now.getDate(); + function fourdigits(number) { + return (number < 1000) ? number + 1900 : number; + } + var today = months[now.getMonth()] + " " + date + ", " + (fourdigits(now.getYear())); + return today; +} + +// from http://www.mediacollege.com/internet/javascript/number/round.html +function roundNumber(number,decimals) { + var newString;// The new rounded number + decimals = Number(decimals); + if (decimals < 1) { + newString = (Math.round(number)).toString(); + } else { + var numString = number.toString(); + if (numString.lastIndexOf(".") == -1) {// If there is no decimal point + numString += ".";// give it one at the end + } + var cutoff = numString.lastIndexOf(".") + decimals;// The point at which to truncate the number + var d1 = Number(numString.substring(cutoff,cutoff+1));// The value of the last decimal place that we'll end up with + var d2 = Number(numString.substring(cutoff+1,cutoff+2));// The next decimal, after the last one we want + if (d2 >= 5) {// Do we need to round up at all? If not, the string will just be truncated + if (d1 == 9 && cutoff > 0) {// If the last digit is 9, find a new cutoff point + while (cutoff > 0 && (d1 == 9 || isNaN(d1))) { + if (d1 != ".") { + cutoff -= 1; + d1 = Number(numString.substring(cutoff,cutoff+1)); + } else { + cutoff -= 1; + } + } + } + d1 += 1; + } + if (d1 == 10) { + numString = numString.substring(0, numString.lastIndexOf(".")); + var roundedNum = Number(numString) + 1; + newString = roundedNum.toString() + '.'; + } else { + newString = numString.substring(0,cutoff) + d1.toString(); + } + } + if (newString.lastIndexOf(".") == -1) {// Do this again, to the new string + newString += "."; + } + var decs = (newString.substring(newString.lastIndexOf(".")+1)).length; + for(var i=0;i'); + if ($(".delete").length > 0) $(".delete").show(); + bind(); + }); + + bind(); + + $(".delete").live('click',function(){ + $(this).parents('.item-row').remove(); + update_total(); + if ($(".delete").length < 2) $(".delete").hide(); + }); + + $("#cancel-logo").click(function(){ + $("#logo").removeClass('edit'); + }); + $("#delete-logo").click(function(){ + $("#logo").remove(); + }); + $("#change-logo").click(function(){ + $("#logo").addClass('edit'); + $("#imageloc").val($("#image").attr('src')); + $("#image").select(); + }); + $("#save-logo").click(function(){ + $("#image").attr('src',$("#imageloc").val()); + $("#logo").removeClass('edit'); + }); + + $("#date").val(print_today()); + +}); diff --git a/etc/html/minimal/scan/footer.html b/etc/html/minimal/scan/footer.html new file mode 100755 index 0000000..c392ea8 --- /dev/null +++ b/etc/html/minimal/scan/footer.html @@ -0,0 +1,20 @@ + + +
ItemDescription
Item ID
X
Description
+ + + + + + +
+
+ + + diff --git a/etc/html/minimal/scan/header.html b/etc/html/minimal/scan/header.html new file mode 100755 index 0000000..2a8c822 --- /dev/null +++ b/etc/html/minimal/scan/header.html @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+

Site Scan BETA

+ + +

Report generated {{NOW}}

+

{{PROJNAME}} + ({{PRODURL}}) +

+ +
{{PROJCLIENT}}
+ + +

{{SCAN_RESULT}}

+
\ No newline at end of file diff --git a/etc/html/minimal/stats/index.html b/etc/html/minimal/stats/index.html new file mode 100755 index 0000000..93081a1 --- /dev/null +++ b/etc/html/minimal/stats/index.html @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+

Site Smart BETA

+ + +

Report generated {{NOW}}

+

{{PROJNAME}} + ({{PRODURL}}) +

+ +
{{PROJCLIENT}}
+ + +

Overview (last 7 days)

+ +
+

{{SCAN_MSG}} ◢
+ +

{{UPTIME}}% uptime ◢
+ +

{{LATENCY}}s latency ◢
+ +

{{LAST_BACKUP}} ◢
+
+ +
+ + + + + + + +
+ + + + + + + +
+

Commits by day of week

+

+ +

Commits by hour of week

+

+ +

Commits by hour of day

+

+ +

Commits by month of year

+

+ +

Commits by year

+

+ +

Commits by year/month

+

+

+ +

+ + +

+ +

Any Questions?

+

If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

+ + + + + + + +

+
+ + + + + + +
+
+ + + diff --git a/etc/html/minimal/success.html b/etc/html/minimal/success.html new file mode 100755 index 0000000..53fc33b --- /dev/null +++ b/etc/html/minimal/success.html @@ -0,0 +1,20 @@ +

Commit {{COMMITHASH}} by {{USER}} +
Notes: {{NOTES}} +

+ + + + + + + +
+ + + - - 

diff --git a/install/doinst.sh b/install/doinst.sh
index dd70576..f6c5f66 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -90,7 +90,7 @@ fi
 dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sleep tee tput)
 
 # Declare optional stuff
-options=(gitchart grunt npm scp sendmail ssh sshpass wget wkhtmltopdf wp)
+options=(gitchart gnuplot grunt npm scp sendmail ssh sshpass wget wkhtmltopdf wp)
 
 message=''
 fg_red="$(tput setaf 1)"
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 77941c6..40ea34b 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -154,14 +154,24 @@ function ga_over_time() {
     GASTART="$(date -I -d "$GAEND - $2 day")"
   fi
 
+  # Make sure temp directory exists
+  if [[ ! -d "/tmp/stats" ]]; then
+    umask 077 && mkdir /tmp/stats &> /dev/null
+  fi
+  
   # Setup variables
   ga_day="${GAEND}"
   day="0"
   METRIC="${1}"
-  
+  ga_sequence=""
+  max_value=""
+
+  # Flush csv
+  [[ -f "${trshFile}" ]] && rm "${trshFile}"
+
   while [ "$ga_day" != "${GASTART}" ]; do 
     RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${METRIC}&start-date=$ga_day&end-date=$ga_day&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
-    trace "${ga_day}: ${RESULT} $1"
+    # trace "${ga_day}: ${RESULT} $1"
     
     # Store the values 
     declare "$1_${day}"="${RESULT}"
@@ -172,7 +182,7 @@ function ga_over_time() {
 
   # Create percentage array
   ga_sequence="$(echo -e "${ga_sequence}" | sed -e 's/[[:space:]]*$//')"
-  trace "Calculating array: ${ga_sequence}"
+  # trace "Calculating array: ${ga_sequence}"
   IFS=', ' read -r -a a <<< "${ga_sequence}"
 
   for i in ${a[@]}; do
@@ -185,21 +195,48 @@ function ga_over_time() {
   for ((n=0; n < $2; n++)); do 
     var="$1_$n"; var_percent="$1_percent_$n"
     var_percent=$(awk "BEGIN { pc=100*${!var}/${max_value}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
-    trace "100*${!var}/${max_value} = ${var_percent}%"
+    # trace "100*${!var}/${max_value} = ${var_percent}%"
 
     # Store values
     eval $1_$n="${!var}"
     eval $1_percent_$n="${var_percent}"
+    this_day=$(date '+%a' -d "$n days ago")
+    echo -e "${this_day}, ${!var}, ${var_percent}" >> "${trshFile}"
 
     if [[ "${PROJSTATS}" == "1" ]]; then
       sed -i -e "s^{{$1_$n}}^${!var}^g" \
         -e "s^{{$1_percent_$n}}^${var_percent}^g" \
-        -e "s^{{$1_date_$n}}^${n} days ago^g" \
+        -e "s^{{$1_date_$n}}^${this_day}^g" \
         "${htmlFile}"
     fi    
   done
 
-  trace "Values: ${hits_0}, ${hits_1}, ${hits_2}, ${hits_3}, ${hits_4}, ${hits_5}, ${hits_6}"
+  tac "${trshFile}" > /tmp/stats/"${METRIC}".csv
+  # Future home of gnuplot charts
+  gnuplot -p << EOF
+  set encoding utf8
+  set terminal png enhanced size 1280,600
+  primary = "${PRIMARYC}"; 
+  secondary = "${SECONDARYC}";
+  info = "${INFOC}"
+  set key off
+  set datafile separator ","
+  set output '/tmp/stats/${METRIC}.png'
+  set boxwidth 0.5
+  set style fill transparent solid 0.1 noborder
+  set samples 1000
+  set style line 100 lt 1 lc rgb secondary lw 1
+  set style line 101 lt 0.5 lc rgb secondary lw 1
+  set grid mytics ytics ls 100, ls 101
+  set grid mxtics xtics ls 100, ls 101
+  set style line 11 lc rgb '${DEFAULTC}' lt 1 lw 3
+  set border 3 back ls 11
+  set tics out nomirror
+  #plot '~/${METRIC}.csv' using 2:xtic(1) with boxes lc rgb primary, \
+  #"" using 2:xtic(1) smooth bezier with lines lc rgb info
+  plot '/tmp/stats/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
+    "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info
+EOF
 }
 
 # If no other results are worth displaying, fall back to displaying hits
diff --git a/lib/digest.sh b/lib/digest.sh
index a5430aa..b566f81 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -40,6 +40,9 @@ function create_digest() {
   # Attempt to get analytics
   analytics
 
+  # Gnereate the correct analytics chart
+  ga_over_time "${METRIC}" 7
+
   # Assemble the file
   DIGESTWRAP="$(<${deployPath}/html/${HTMLTEMPLATE}/digest/commit.html)"
 
diff --git a/lib/post-log.sh b/lib/post-log.sh
index 142c368..ac980a9 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -85,15 +85,15 @@ function postLog() {
       if [[ "${DIGEST}" == "1" ]]; then
         REMOTEFILE="digest-${EPOCH}.html"
         DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}"
-        eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
-        eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
+        #eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
+        #eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
         # Clean up your mess
-        if [[ -d "/tmp/avatar" ]]; then
-          rm -R "/tmp/avatar"
-        fi
+        #if [[ -d "/tmp/avatar" ]]; then
+        #  rm -R "/tmp/avatar"
+        #fi
       fi
 
-      if [[ "${PROJSTATS}" == "1" ]]; then
+      if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" ]]; then
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/stats"
         eval "${SCPCMD} -r" "/tmp/stats/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 9f81a9c..162ba9e 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -86,7 +86,7 @@ function process_html() {
     # This is essentially the same as insert_values() [see env-check.sh], we
     #  should consolidate them into one function
     if [[ -n "${!i:-}" ]]; then
-      [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
+      # [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
       sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${htmlFile}")
       # Kludgy but works. Ugh.
       eval "${sed_hack}"
@@ -111,5 +111,6 @@ function process_html() {
     -e "s^{{GRAVATARURL}}^${REMOTEURL}\/${APP}\/avatar^g" \
     -e "s^{{STATURL}}^${REMOTEURL}\/${APP}\/stats^g" \
     -e "s^{{LASTMONTH}}^${LAST_MONTH}^g" \
+    -e "s^{{ANALYTICS_CHART}}^${REMOTEURL}/${APP}/stats/${METRIC}.png^g" \
     "${htmlFile}"
   }
diff --git a/lib/statistics.sh b/lib/statistics.sh
index f96f7cd..099f321 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -76,14 +76,14 @@ function project_stats() {
     spinner $!
 
     # Create sub pages
-    project_activity
-    project_statistics
-    project_firewall
-    project_backup
-    project_engagement
+    project_activity & spinner $!
+    project_statistics & spinner $!
+    project_firewall & spinner $!
+    project_backup & spinner $!
+    project_engagement & spinner $!
 
     # Post files
-    postLog
+    postLog & spinner $!
   fi
 }
 
@@ -122,8 +122,12 @@ function project_firewall() {
 
 function project_engagement() {
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${htmlFile}"
-  # This just for testing, will turn it into a loop
-  ga_over_time hits 7
+
+  ga_var=(hits users newUsers sessions organicSearches pageviews)
+  # Start the loop
+  for i in "${ga_var[@]}" ; do
+    ga_over_time ${i} 7
+  done
 
   # Process the HTML
   process_html; 
@@ -228,4 +232,4 @@ function assign_nav() {
   [[ -n "${SCAN_MSG}" ]] && SCAN_NAV="scan.html"
   [[ -n "${FIREWALL_NAV}" ]] && FIREWALL_NAV="firewall.html"
   [[ -n "${BACKUP_STATUS}" ]] && BACKUP_NAV="backup.html"
-}
\ No newline at end of file
+}

From 8b7321953208c6add79588543c0014eab117696f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 27 Aug 2018 17:47:28 -0700
Subject: [PATCH 099/334] Analytic charts, html improvements, resolve #143

---
 CHANGELOG.md                           |   2 +
 etc/html/default/digest/header.html    |   2 +-
 etc/html/default/stats/activity.html   |  12 +-
 etc/html/default/stats/backup.html     |  15 ++-
 etc/html/default/stats/engagement.html | 156 ++++++++++---------------
 etc/html/default/stats/firewall.html   |   5 +-
 etc/html/default/stats/index.html      |  18 ++-
 etc/html/default/stats/scan.html       |   9 +-
 etc/html/default/stats/stats.html      |  17 +--
 lib/analytics.sh                       |  51 +++++---
 lib/process-html.sh                    |   3 +-
 lib/quit.sh                            |   4 +-
 lib/statistics.sh                      |  17 ++-
 13 files changed, 165 insertions(+), 146 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c740124..25f0a74 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Digest emails can now include a chart showing the week's analytics
 ### Changed 
 - Improved HTML post-processing
+### Fixed
+- Log files should no longer be left behind in the `/tmp` directory
 
 ## [3.7.1] - 07-13-2018
 ### Added
diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html
index 08da59d..cf7cca0 100755
--- a/etc/html/default/digest/header.html
+++ b/etc/html/default/digest/header.html
@@ -96,7 +96,7 @@ 
{{GREETING}}

-								
{{ANALYTICSMSG}}
Analytics Chart

+								
{{ANALYTICSMSG}}
Analytics Chart

 
 								
Here's a summary of code updates made to your website last week:

 								

\ No newline at end of file
diff --git a/etc/html/default/stats/activity.html b/etc/html/default/stats/activity.html
index ccb83d9..b3ab141 100755
--- a/etc/html/default/stats/activity.html
+++ b/etc/html/default/stats/activity.html
@@ -56,8 +56,9 @@
                 

                 

-
             

                 
    
                     
  • Updated {{NOW}}
    • 
                 

-                My Dashboard > Activity
+                My Dashboard > Update History
                 

                 

                     

                         

                             

                                 

-                                    
Activity history ({{TOTAL_COMMITS}} entries)

+                                    
Commit log ({{TOTAL_COMMITS}} entries)

                                 

                             

                             

@@ -98,7 +98,7 @@ 
Activity history ({{TOTAL_COMMITS}} entries)

                         

                             

                                 

-                                    
About activity

+                                    
About your updates

                                 

                             

                             

diff --git a/etc/html/default/stats/backup.html b/etc/html/default/stats/backup.html
index 235ccf7..4238190 100755
--- a/etc/html/default/stats/backup.html
+++ b/etc/html/default/stats/backup.html
@@ -56,8 +56,9 @@
 				

 				

                     

                         

+                            

+                                

+                                    
About your backup

+                                

+                            

                             

-                                
About the backup
+                                

+                                	Your site files are incrementally backed up offsite. This includes the code we created for you, as well as your content.
                                 

+                                

+                                	Backups are versioned, and kept up to 60 days.
                             

                         

                     
 
diff --git a/etc/html/default/stats/engagement.html b/etc/html/default/stats/engagement.html
index b295d53..4d72ce3 100755
--- a/etc/html/default/stats/engagement.html
+++ b/etc/html/default/stats/engagement.html
@@ -56,8 +56,9 @@
                 

                 
    
                     
  • 
-                    
  • Activity
    • 
-                    
  • Statistics
    • 
+                    
  • Audience Engagement
    • 
+                    
  • Update History
    • 
+                    
  • Code Statistics
    • 
                     
  • Malware Scan
    • 
                     
  • Firewall & Security
    • 
                     
  • System Backup
    • 
@@ -79,7 +80,7 @@
                 
      
                     
    • Updated {{NOW}}
      • 
                 
    
-                My Dashboard > Audience Engagement
+                My Dashboard > Audience Engagement
                 
    
                 
    
                     
    
@@ -87,111 +88,75 @@
                         
    
                             
    
                                 
    
-                                    
    {{GA_HITS}} hits (Last 7 days)
    
+                                    
    {{GA_HITS}} pageviews (Last 7 days)
    
                                 
    
                             
    
-                            
    
-                                
    
-                                    
    
-                                        {{hits_6}}
    {{hits_date_6}}    
-                                    
    
-                                
    
-
-                                
    
-                                    
    
-                                        {{hits_5}}
    {{hits_date_5}}    
-                                    
    
-                                
    
-
-                                
    
-                                    
    
-                                        {{hits_4}}
    {{hits_date_4}}    
-                                    
    
-                                
                                      
-
-                                
    
-                                    
    
-                                        {{hits_3}}
    {{hits_date_3}}    
-                                    
    
-                                
    
-
-                                
    
-                                    
    
-                                        {{hits_2}}
    {{hits_date_2}}    
-                                    
    
-                                
    
-
-                                
    
-                                    
    
-                                        {{hits_1}}
    Yesterday    
-                                    
    
-                                
    
-
-                                
    
-                                    
    
-                                        {{hits_0}}
    Today    
-                                    
    
-                                
    
+                            
    
+                                
                             
    
+                            
    The total number of times a user has viewed an entire page including all text, images, etc.
    
                         
    
-
-                       
    
+                        
    
+                       
 
-                                
    
-                                    
    
-                                        {{organicSearches_3}}
    {{organicSearches_date_3}}    
-                                    
    
+                       
    
+                            
    
+                                
    
+                                    
    {{GA_SEARCHES}} organic searches (Last 7 days)
    
                                 
    
-
-                                
    
-                                    
    
-                                        {{organicSearches_2}}
    {{organicSearches_date_2}}    
-                                    
    
+                            
    
+                            
    
+                                
+                            
    
+                            
    The number of organic searches that helped visitors find your website. This metric is search engine agnostic.
    
+                        
    
+                        
    
+                        
    
+                            
    
+                                
    
+                                    
    Unique visitors (Last 7 days)
    
                                 
    
-
-                                
    
-                                    
    
-                                        {{organicSearches_1}}
    Yesterday    
-                                    
    
+                            
    
+                            
    
+                                
+                            
    
+                            
    The total number of users over the last 7 days.
    
+                        
    
+                        
    
+                        
    
+                            
    
+                                
    
+                                    
    {{GA_PERCENT}}% new users (Last 7 days)
    
                                 
    
-
-                                
    
-                                    
    
-                                        {{organicSearches_0}}
    Today    
-                                    
    
+                            
    
+                            
    
+                                
+                            
    
+                            
    The number of sessions marked as a user's first visit.
    
+                        
    
+                        
    
+                        
    
+                            
    
+                                
    
+                                    
    Sessions (Last 7 days)
    
                                 
    
                             
    
+                            
    
+                                
+                            
    
+                            
    The total number of sessions, defined as a group of interactions one user takes within a single visit.
    
                         
    
-
-
-
-
-
-                     
    
-
+                    
    
 
                     
    
                         
    
@@ -202,7 +167,10 @@ 
    About these charts
    
                             
    
                             
    
                                 
    
-                                    blahblah
+                                    This data is collected using Google Analytics.
+                                
    
+                                
    
+                                    There is much more detailed data available, if you would like to see more comprehensive reports we can set you up easy. Drop us an email or let us know using the live support chat on this page.
                                 
    
                             
    
                         
    
diff --git a/etc/html/default/stats/firewall.html b/etc/html/default/stats/firewall.html
index f2e58c2..8ca7b0d 100755
--- a/etc/html/default/stats/firewall.html
+++ b/etc/html/default/stats/firewall.html
@@ -56,8 +56,9 @@
 				
    
 				
      
 					
    • 
-					
    • Activity
      • 
-					
    • Statistics
      • 
+					
    • Audience Engagement
      • 
+					
    • Update History
      • 
+					
    • Code Statistics
      • 
 					
    • Malware Scan
      • 
 					
    • Firewall & Security
      • 
 					
    • System Backup
      • 
diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html
index eb148cd..04f53d4 100755
--- a/etc/html/default/stats/index.html
+++ b/etc/html/default/stats/index.html
@@ -56,8 +56,9 @@
 				
      
 				
        
 					
      • 
-					
      • Activity
        • 
-					
      • Statistics
        • 
+					
      • Audience Engagement
        • 
+					
      • Update History
        • 
+					
      • Code Statistics
        • 
 					
      • Malware Scan
        • 
 					
      • Firewall & Security
        • 
 					
      • System Backup
        • 
@@ -96,13 +97,14 @@
 						
        
 							
        
 								
        
-									
        Engagement (Last 7 days)
        
+									
+									
        Audience Engagement (Last 7 days)
        
 								
        
 							
        
 							
        
 								
        
 									
        {{GA_HITS}}
        
-									
        hits from visitors
        
+									
        page views
        
 								
        
 								
        
 								
        {{GA_PERCENT}}%
        
@@ -110,9 +112,15 @@ 
        {{GA_PERCENT}}%
        
 								
        
 								
        
 								
        {{GA_SEARCHES}}
        
-									
        organic searches
        
+									
        inbound organic searches
        
 								
        
 							
        
+							
        
+								
        
+								
        
+									View all
+								
        
+							
        
 						
        
 						
 
diff --git a/etc/html/default/stats/scan.html b/etc/html/default/stats/scan.html
index 7155c2e..c5e74d9 100755
--- a/etc/html/default/stats/scan.html
+++ b/etc/html/default/stats/scan.html
@@ -56,8 +56,9 @@
                 
        
                 
          
                     
        • 
-                    
        • Activity
          • 
-                    
        • Statistics
          • 
+                    
        • Audience Engagement
          • 
+                    
        • Update History
          • 
+                    
        • Code Statistics
          • 
                     
        • Malware Scan
          • 
                     
        • Firewall & Security
          • 
                     
        • System Backup
          • 
@@ -84,9 +85,9 @@
                 
          
                     
          
                         
          
-                            
          
+                            
          
                                 
          
-                                    
          Malware scan: {{SCAN_MSG}}
          
+                                    
          Malware scan: {{SCAN_MSG}} 
          
                                 
          
                             
          
                             
          
diff --git a/etc/html/default/stats/stats.html b/etc/html/default/stats/stats.html
index a2ddb5e..94b1a15 100755
--- a/etc/html/default/stats/stats.html
+++ b/etc/html/default/stats/stats.html
@@ -56,8 +56,9 @@
 				
          
 				
            
 					
          • 
-					
          • Activity
            • 
-					
          • Statistics
            • 
+					
          • Audience Engagement
            • 
+					
          • Update History
            • 
+					
          • Code Statistics
            • 
 					
          • Malware Scan
            • 
 					
          • Firewall & Security
            • 
 					
          • System Backup
            • 
@@ -79,7 +80,7 @@
 				
              
 					
            • Updated {{NOW}}
              • 
 				
            
-				My Dashboard > Statistics
+				My Dashboard > Code Statistics
 				
            
 				
            
 					
            
@@ -121,11 +122,11 @@
 						
            
 						
            
 							
            
-								
            
+								
            
 									
 								
            
-								
            
-								
+								
            
+									
 								
            
 							
            
 						
            
@@ -144,10 +145,10 @@ 
            About these charts
            
                             	
            
                             		What is a commit?
                                 
            
-                                	Your website code uses version control systems which allow rolling back to previous versions easily. In this context, a commit within a version control system is protected as it is easily rolled back, even after the commit has been applied.
+                                	Your website code uses version control systems which allow rolling back to previous versions easily. In this context, a commit within a version control system is protected as it is easily rolled back, even after the commit has been applied.
                             	
            
                             	
            
-                            		More information about this type of workflow can be found here.
+                            		More information about this type of workflow can be found here.
                                 
            
                             
            
                         
            
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 40ea34b..f68370c 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -14,10 +14,10 @@ trace "Loading analytics functions"
 
 # Initialize variables
 read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
-  GA_SOCIAL ANALYTICSMSG ga_var ga_day ga_sequence max_value n GA_TOTAL <<< ""
+  GA_SOCIAL ANALYTICSMSG ga_var ga_day ga_sequence max_value n a GA_TOTAL <<< ""
 echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} 
   ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG} ${ga_var} 
-  ${ga_sequence} ${max_value} ${n} ${GA_TOTAL}" > /dev/null
+  ${ga_sequence} ${max_value} ${n} ${a} ${GA_TOTAL}" > /dev/null
 
 function ga_metrics() {
   array[0]="hits"
@@ -137,7 +137,7 @@ function ga_data_loop() {
 
 ###############################################################################
 # ga_over_time()
-#   Collects Gollge Analytics data over a certain period of time
+#   Collects Google Analytics data over a certain period of time
 #
 # Arguments:
 #   [metric]    Defines the metric you wish to get from Google's API. Examples
@@ -171,6 +171,9 @@ function ga_over_time() {
 
   while [ "$ga_day" != "${GASTART}" ]; do 
     RESULT=$(curl -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${METRIC}&start-date=$ga_day&end-date=$ga_day&access_token=$ACCESSTOKEN" | tr , '\n' | grep "totalsForAllResults" | cut -d'"' -f6)
+    
+    # Make sure we're only dealing with integers
+    RESULT="$(printf "%.0f\n" "${RESULT}")"
     # trace "${ga_day}: ${RESULT} $1"
     
     # Store the values 
@@ -194,7 +197,13 @@ function ga_over_time() {
   # Calculate
   for ((n=0; n < $2; n++)); do 
     var="$1_$n"; var_percent="$1_percent_$n"
-    var_percent=$(awk "BEGIN { pc=100*${!var}/${max_value}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
+
+    # Calculating percent while zero was causing nasty bugs
+    if [[ -n "${!var}" ]] && [[ "${!var}" != "0" ]]; then
+      var_percent=$(awk "BEGIN { pc=100*${!var}/${max_value}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
+    else
+      var_percent="0"
+    fi
     # trace "100*${!var}/${max_value} = ${var_percent}%"
 
     # Store values
@@ -212,13 +221,14 @@ function ga_over_time() {
   done
 
   tac "${trshFile}" > /tmp/stats/"${METRIC}".csv
-  # Future home of gnuplot charts
+
   gnuplot -p << EOF
   set encoding utf8
   set terminal png enhanced size 1280,600
   primary = "${PRIMARYC}"; 
   secondary = "${SECONDARYC}";
-  info = "${INFOC}"
+  info = "${INFOC}";
+  default = "${DEFAULTC}";
   set key off
   set datafile separator ","
   set output '/tmp/stats/${METRIC}.png'
@@ -229,13 +239,21 @@ function ga_over_time() {
   set style line 101 lt 0.5 lc rgb secondary lw 1
   set grid mytics ytics ls 100, ls 101
   set grid mxtics xtics ls 100, ls 101
-  set style line 11 lc rgb '${DEFAULTC}' lt 1 lw 3
+  set style line 11 lc rgb default lt 1 lw 3
   set border 3 back ls 11
   set tics out nomirror
-  #plot '~/${METRIC}.csv' using 2:xtic(1) with boxes lc rgb primary, \
-  #"" using 2:xtic(1) smooth bezier with lines lc rgb info
+  
+  # PNG
+  set terminal png enhanced size 1280,600
+  set output '/tmp/stats/${METRIC}.png'
   plot '/tmp/stats/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
     "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info
+
+  # SVG
+  set terminal svg dynamic enhanced size 1280,600
+  set output '/tmp/stats/${METRIC}.svg'
+  plot '/tmp/stats/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
+    "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info  
 EOF
 }
 
@@ -296,12 +314,6 @@ function ga_test() {
   ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")"
   echo "${ACCESSTOKEN}"
 
-  # Just here for testing
-  #ga_data_loop
-  empty_line; trace "Day count"
-  ga_over_time hits 7
-  return
-
   # Setup the metric we're after
   array[0]="hits"
   array[1]="percentNewSessions"
@@ -311,8 +323,15 @@ function ga_test() {
   SIZE="${#array[@]}"
   RND="$(($RANDOM % $SIZE))"
   METRIC="${array[$RND]}"
+ 
+  # Just here for testing
+  #ga_data_loop
+  # METRIC="newUsers"
+  notice "Retrieving ${METRIC}..." 
+  ga_over_time "${METRIC}" 7
+  cat /tmp/stats/"${METRIC}".csv
+  return
 
-  notice "Retrieving ${METRIC}..."  
   console "Running: printf \"${METRIC} (Last 7 days): \"; curl -s \"https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN\"" # | tr , '\n' | grep \"totalsForAllResults\" | cut -d'\"' -f6"
   #empty_line; analytics
   sleep 3
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 162ba9e..3f74a67 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -33,6 +33,7 @@ function process_html() {
   [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_NAV/d' "${htmlFile}"
   [[ -z "${FIREWALL_STATUS}" ]] && sed -i '/FIREWALL_NAV/d' "${htmlFile}"
   [[ -z "${BACKUP_STATUS}" ]] && sed -i '/BACKUP_NAV/d' "${htmlFile}"
+  [[ -z "${PROFILEID}" ]] && sed -i '/ENGAGEMENT_NAV/d' "${htmlFile}"
 
 
   if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
@@ -79,7 +80,7 @@ function process_html() {
     GREETING REMOTEURL ANALYTICSMSG COVER WEEKOF UPTIME LATENCY GA_HITS \
     GA_PERCENT GA_SEARCHES GA_DURATION GA_SOCIAL CODE_STATS SCAN_BTN \
     UPTIME_BTN LATENCY_BTN BACKUP_BTN ACTIVITY_NAV STATISTICS_NAV SCAN_NAV \
-    FIREWALL_NAV BACKUP_NAV BACKUP_MSG TOTAL_COMMITS RSS_URL)
+    ENGAGEMENT_NAV FIREWALL_NAV BACKUP_NAV BACKUP_MSG TOTAL_COMMITS RSS_URL)
 
   # Start the loop
   for i in "${process_var[@]}" ; do
diff --git a/lib/quit.sh b/lib/quit.sh
index 2a58588..fc4ada7 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -87,12 +87,14 @@ function clean_up() {
   [[ -f "${trshFile}" ]] && rm "${trshFile}"
   [[ -f "${postFile}" ]] && rm "${postFile}"
   [[ -f "${statFile}" ]] && rm "${statFile}"
+  [[ -f "${scanFile}" ]] && rm "${scanFile}"
   [[ -f "${wpFile}" ]] && rm "${wpFile}"
   [[ -f "${urlFile}" ]] && rm "${urlFile}"
   [[ -f "${htmlFile}" ]] && rm "${htmlFile}"
   [[ -f "${htmlEmail}" ]] && rm "${htmlEmail}"
   [[ -f "${clientEmail}" ]] && rm "${clientEmail}"
   [[ -f "${coreFile}" ]] && rm "${coreFile}"
+  [[ -d /tmp/stats ]] && rm -rf /tmp/stats
   # [[ -f "${gitLock}" ]] && rm "${gitLock}"
   # Attempt to reset the terminal
   # echo -e \\033c
@@ -126,5 +128,5 @@ function clean_up() {
   fi
 
   # Say goodnight, Gracie. Goodnight Gracie.
-  info "Exiting."; console
+  console "Exiting."
 }
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 099f321..ff9802d 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -10,14 +10,15 @@ trace "Loading statistics functions"
 # Initialize variables
 read -r DB_API_TOKEN DB_BACKUP_PATH LAST_BACKUP BACKUP_STATUS CODE_STATS \
   BACKUP_BTN LATENCY_BTN UPTIME_BTN SCAN_BTN COMMITS_RECENT  \
-  repo_charts ACTIVITY_NAV STATISTICS_NAV SCAN_NAV FIREWALL_NAV \
-  BACKUP_NAV SCAN_STATS FIREWALL_STATUS BACKUP_MSG BACKUP_FILES \
-  TOTAL_COMMITS RSS_URL <<< ""
+  repo_charts ACTIVITY_NAV STATISTICS_NAV SCAN_NAV ENGAGEMENT_NAV \
+  FIREWALL_NAV BACKUP_NAV SCAN_STATS FIREWALL_STATUS BACKUP_MSG \
+  BACKUP_FILES TOTAL_COMMITS RSS_URL <<< ""
 echo "${DB_API_TOKEN} ${DB_BACKUP_PATH} ${LAST_BACKUP} ${BACKUP_STATUS} 
   ${CODE_STATS} ${BACKUP_BTN} ${LATENCY_BTN} ${UPTIME_BTN} ${SCAN_BTN}
   ${COMMITS_RECENT} ${repo_charts} ${ACTIVITY_NAV} ${STATISTICS_NAV} 
-  ${SCAN_NAV} ${FIREWALL_NAV} ${BACKUP_NAV} ${FIREWALL_STATUS}
-  ${BACKUP_MSG} ${BACKUP_FILES} ${TOTAL_COMMITS} ${RSS_URL}" > /dev/null
+  ${SCAN_NAV} ${ENGAGEMENT_NAV} ${FIREWALL_NAV} ${BACKUP_NAV} 
+  ${FIREWALL_STATUS} ${BACKUP_MSG} ${BACKUP_FILES} ${TOTAL_COMMITS} 
+  ${RSS_URL}" > /dev/null
 
 function project_stats() {
   hash gitchart 2>/dev/null || {
@@ -121,6 +122,11 @@ function project_firewall() {
 }
 
 function project_engagement() {
+  if [[ -z "${PROFILEID}" ]]; then
+    trace "Google Analytics not configured"
+    return
+  fi
+  
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${htmlFile}"
 
   ga_var=(hits users newUsers sessions organicSearches pageviews)
@@ -229,6 +235,7 @@ function assign_nav() {
   # Assign URLs - this will change later on
   ACTIVITY_NAV="activity.html"
   STATISTICS_NAV="stats.html"
+  [[ -n "${PROFILEID}" ]] && ENGAGEMENT_NAV="engagement.html"
   [[ -n "${SCAN_MSG}" ]] && SCAN_NAV="scan.html"
   [[ -n "${FIREWALL_NAV}" ]] && FIREWALL_NAV="firewall.html"
   [[ -n "${BACKUP_STATUS}" ]] && BACKUP_NAV="backup.html"

From 47490774c1fbb508cda49b02f214f471b08aae1d Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 27 Aug 2018 18:17:25 -0700
Subject: [PATCH 100/334] Resolve #142

---
 etc/html/default/success.html | 5 +++--
 lib/deployment.sh             | 2 +-
 lib/process-html.sh           | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/html/default/success.html b/etc/html/default/success.html
index 53fc33b..4ac0c19 100755
--- a/etc/html/default/success.html
+++ b/etc/html/default/success.html
@@ -1,5 +1,6 @@
-					
            Commit {{COMMITHASH}} by {{USER}}
-						
            Notes: {{NOTES}}
+					
            
+						Commit {{COMMITHASH}} by {{USER}}
            
+						Notes: {{NOTES}}
 		  			
            
 					
 					
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 78d19f0..4b21a42 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -148,7 +148,7 @@ function postDeploy() {
       # Run integration hooks
       postCommit  
       # This needs a check.
-      # info "Deployment Success."
+      info "Deployed to ${PRODURL}"
     else
       info ""
       warning "Deployment succeeded, but something unexpected happened."
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 3f74a67..f69833d 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -28,6 +28,7 @@ function process_html() {
   [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${htmlFile}"
   [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${htmlFile}"
   [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${htmlFile}"
+  [[ -z "${COMMITHASH}" ]] && sed -i '/COMMITHASH/d' "${htmlFile}"
 
   # Clean out dashboard nav menu
   [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_NAV/d' "${htmlFile}"

From 43e94715b6974bf0761247e6b47443a3af9b36cb Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 27 Aug 2018 18:24:07 -0700
Subject: [PATCH 101/334] Poke

---
 deploy.sh         | 3 ++-
 lib/deployment.sh | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index ceccd4a..4d68a30 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -291,7 +291,8 @@ echo -e "Launching deploy${STARTUP}\n" >> "${logFile}"
 postFile="/tmp/${APP}.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail
 trshFile="/tmp/${APP}.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail
 scanFile="/tmp/${APP}.scan-$RANDOM.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail 
-statFile="/tmp/${APP}.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail 
+statFile="/tmp/${APP}.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail
+statDir="/tmp/${APP}.stat-$RANDOM"; (umask 077 && mkdir "${statDir}" &> /dev/null) || log_fail
 urlFile="/tmp/${APP}.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail
 htmlFile="/tmp/${APP}.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail
 htmlEmail="/tmp/${APP}.email-$RANDOM.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 4b21a42..dd5b8a2 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -148,7 +148,9 @@ function postDeploy() {
       # Run integration hooks
       postCommit  
       # This needs a check.
-      info "Deployed to ${PRODURL}"
+      if [[ -n "${PRODURL}" ]]; then
+        info "Deployed to ${PRODURL}"
+      fi
     else
       info ""
       warning "Deployment succeeded, but something unexpected happened."

From 464cd8acf4eba5e92c9d43f5fcabab8501e280bd Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 27 Aug 2018 19:10:00 -0700
Subject: [PATCH 102/334] Restructure temp stats folders

---
 CHANGELOG.md      |  1 +
 lib/analytics.sh  | 18 +++++++++---------
 lib/deployment.sh |  1 -
 lib/post-log.sh   | 16 ++++++++--------
 lib/quit.sh       |  1 +
 lib/statistics.sh | 40 +++++++++++++++++++++-------------------
 6 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25f0a74..4db688f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Improved HTML post-processing
 ### Fixed
 - Log files should no longer be left behind in the `/tmp` directory
+- Fixed a problem where statistic dashboard could get corrupted when multiple instances of `deploy --stats` are running
 
 ## [3.7.1] - 07-13-2018
 ### Added
diff --git a/lib/analytics.sh b/lib/analytics.sh
index f68370c..9e48312 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -155,8 +155,8 @@ function ga_over_time() {
   fi
 
   # Make sure temp directory exists
-  if [[ ! -d "/tmp/stats" ]]; then
-    umask 077 && mkdir /tmp/stats &> /dev/null
+  if [[ ! -d "${statDir}" ]]; then
+    umask 077 && mkdir ${statDir} &> /dev/null
   fi
   
   # Setup variables
@@ -220,7 +220,7 @@ function ga_over_time() {
     fi    
   done
 
-  tac "${trshFile}" > /tmp/stats/"${METRIC}".csv
+  tac "${trshFile}" > ${statDir}/"${METRIC}".csv
 
   gnuplot -p << EOF
   set encoding utf8
@@ -231,7 +231,7 @@ function ga_over_time() {
   default = "${DEFAULTC}";
   set key off
   set datafile separator ","
-  set output '/tmp/stats/${METRIC}.png'
+  set output '${statDir}/${METRIC}.png'
   set boxwidth 0.5
   set style fill transparent solid 0.1 noborder
   set samples 1000
@@ -245,14 +245,14 @@ function ga_over_time() {
   
   # PNG
   set terminal png enhanced size 1280,600
-  set output '/tmp/stats/${METRIC}.png'
-  plot '/tmp/stats/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
+  set output '${statDir}/${METRIC}.png'
+  plot '${statDir}/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
     "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info
 
   # SVG
   set terminal svg dynamic enhanced size 1280,600
-  set output '/tmp/stats/${METRIC}.svg'
-  plot '/tmp/stats/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
+  set output '${statDir}/${METRIC}.svg'
+  plot '${statDir}/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
     "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info  
 EOF
 }
@@ -329,7 +329,7 @@ function ga_test() {
   # METRIC="newUsers"
   notice "Retrieving ${METRIC}..." 
   ga_over_time "${METRIC}" 7
-  cat /tmp/stats/"${METRIC}".csv
+  cat ${statDir}/"${METRIC}".csv
   return
 
   console "Running: printf \"${METRIC} (Last 7 days): \"; curl -s \"https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:$METRIC&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN\"" # | tr , '\n' | grep \"totalsForAllResults\" | cut -d'\"' -f6"
diff --git a/lib/deployment.sh b/lib/deployment.sh
index dd5b8a2..23f1649 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -152,7 +152,6 @@ function postDeploy() {
         info "Deployed to ${PRODURL}"
       fi
     else
-      info ""
       warning "Deployment succeeded, but something unexpected happened."
       if yesno --default yes "View status? [Y/n] "; then
         git status
diff --git a/lib/post-log.sh b/lib/post-log.sh
index ac980a9..a19210d 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -47,7 +47,7 @@ function postLog() {
       if [[ "${PROJSTATS}" == "1" ]]; then
         [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}"
         [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats"
-        cp -R "/tmp/stats" "${LOCALHOSTPATH}/${APP}"
+        cp -R "${statDir}" "${LOCALHOSTPATH}/${APP}"
         chmod -R a+rw "${deployPath}/html/${HTMLTEMPLATE}/stats" &> /dev/null
       fi
 
@@ -95,13 +95,13 @@ function postLog() {
 
       if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" ]]; then
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/stats"
-        eval "${SCPCMD} -r" "/tmp/stats/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
+        eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
         eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
         # Clean up your mess
-        if [[ -d "/tmp/stats" ]]; then
-          rm -R "/tmp/stats"
-        fi
+        #if [[ -d "${statDir}" ]]; then
+        #  rm -R "${statDir}"
+        #fi
         if [[ -d "/tmp/avatar" ]]; then
           rm -R "/tmp/avatar"
         fi
@@ -112,10 +112,10 @@ function postLog() {
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/scan"
         eval "${SCPCMD} -r" "${scan_html}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/scan/index.html"
         # This stuff is for the new dashboard method
-        eval "${SCPCMD} -r" "/tmp/stats/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
+        eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         # Clean up your mess
-        #if [[ -d "/tmp/stats" ]]; then
-        #  rm -R "/tmp/stats"
+        #if [[ -d "${statDir}" ]]; then
+        #  rm -R "${statDir}"
         #fi
       fi
 
diff --git a/lib/quit.sh b/lib/quit.sh
index fc4ada7..cc1c9f7 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -94,6 +94,7 @@ function clean_up() {
   [[ -f "${htmlEmail}" ]] && rm "${htmlEmail}"
   [[ -f "${clientEmail}" ]] && rm "${clientEmail}"
   [[ -f "${coreFile}" ]] && rm "${coreFile}"
+  [[ -d "${statDir}" ]] && rm -rf "${statDir}"
   [[ -d /tmp/stats ]] && rm -rf /tmp/stats
   # [[ -f "${gitLock}" ]] && rm "${gitLock}"
   # Attempt to reset the terminal
diff --git a/lib/statistics.sh b/lib/statistics.sh
index ff9802d..9208c77 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -30,14 +30,14 @@ function project_stats() {
   queue_check
 
     # Setup up tmp work folder
-    if [[ ! -d "/tmp/stats" ]]; then
-      umask 077 && mkdir /tmp/stats &> /dev/null
-    fi
+    #if [[ ! -d "${statDir}" ]]; then
+    #  umask 077 && mkdir "${statDir}" &> /dev/null
+    #fi
 
     # Prep assets
-    cp -R "${deployPath}/html/${HTMLTEMPLATE}/stats/css" "/tmp/stats/"
-    cp -R "${deployPath}/html/${HTMLTEMPLATE}/stats/fonts" "/tmp/stats/"
-    cp -R "${deployPath}/html/${HTMLTEMPLATE}/stats/js" "/tmp/stats/"
+    cp -R "${deployPath}/html/${HTMLTEMPLATE}/stats/css" "${statDir}/"
+    cp -R "${deployPath}/html/${HTMLTEMPLATE}/stats/fonts" "${statDir}/"
+    cp -R "${deployPath}/html/${HTMLTEMPLATE}/stats/js" "${statDir}/"
 
     notice "Generating files..."
 
@@ -64,15 +64,15 @@ function project_stats() {
     cat "${deployPath}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}"
     process_html
 
-    cat "${htmlFile}" > "/tmp/stats/index.html"
+    cat "${htmlFile}" > "${statDir}/index.html"
 
     # Create SVG charts
     repo_charts=(authors commits_day_week commits_hour_day commits_hour_week \
       commits_month commits_year commits_year_month files_type)
     for i in "${repo_charts[@]}" ; do
-      /usr/bin/gitchart -r "${WORKPATH}/${APP}" "${i}" "/tmp/stats/${i}.svg" &>> /dev/null
-      sed -i "s/#9999ff/${PRIMARYC}/g" "/tmp/stats/${i}.svg" 
-      sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "/tmp/stats/${i}.svg"
+      /usr/bin/gitchart -r "${WORKPATH}/${APP}" "${i}" "${statDir}/${i}.svg" &>> /dev/null
+      sed -i "s/#9999ff/${PRIMARYC}/g" "${statDir}/${i}.svg" 
+      sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "${statDir}/${i}.svg"
     done &
     spinner $!
 
@@ -96,29 +96,31 @@ function project_activity() {
 
   # Process the HTML
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/activity.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "/tmp/stats/activity.html"
+  process_html; cat "${htmlFile}" > "${statDir}/activity.html"
 }
 
 function project_statistics() {
   # Process the HTML
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/stats.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "/tmp/stats/stats.html"
+  process_html; cat "${htmlFile}" > "${statDir}/stats.html"
 }
 
 # This is a special snowflake for now, called from within scan_host()
 function project_scan(){
-  if [[ ! -d "/tmp/stats" ]]; then
-    umask 077 && mkdir /tmp/stats &> /dev/null
-  fi
+  
+  #if [[ ! -d "${statDir}" ]]; then
+  #  umask 077 && mkdir ${statDir} &> /dev/null
+  #fi
+  
   SCAN_STATS=$(<${scan_html})
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/scan.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "/tmp/stats/scan.html"
+  process_html; cat "${htmlFile}" > "${statDir}/scan.html"
 }
 
 function project_firewall() {
   # Process the HTML
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/firewall.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "/tmp/stats/firewall.html"
+  process_html; cat "${htmlFile}" > "${statDir}/firewall.html"
 }
 
 function project_engagement() {
@@ -137,7 +139,7 @@ function project_engagement() {
 
   # Process the HTML
   process_html; 
-  cat "${htmlFile}" > "/tmp/stats/engagement.html"
+  cat "${htmlFile}" > "${statDir}/engagement.html"
 }
 
 function project_backup() {
@@ -153,7 +155,7 @@ function project_backup() {
 
   # Process the HTML
   cat "${deployPath}/html/${HTMLTEMPLATE}/stats/backup.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "/tmp/stats/backup.html"
+  process_html; cat "${htmlFile}" > "${statDir}/backup.html"
 }
 
 function check_backup() {

From 64ee398079bb6ca406ac673195f283a9275b05fd Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 27 Aug 2018 21:58:40 -0700
Subject: [PATCH 103/334] Tiny tweaky tweaks

---
 etc/html/default/stats/activity.html   | 3 ++-
 etc/html/default/stats/backup.html     | 6 +++---
 etc/html/default/stats/engagement.html | 4 ++--
 etc/html/default/stats/firewall.html   | 2 +-
 etc/html/default/stats/index.html      | 2 +-
 etc/html/default/stats/scan.html       | 6 +++---
 etc/html/default/stats/stats.html      | 2 +-
 lib/analytics.sh                       | 8 ++++----
 lib/user-feedback.sh                   | 4 ++--
 9 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/etc/html/default/stats/activity.html b/etc/html/default/stats/activity.html
index b3ab141..5340226 100755
--- a/etc/html/default/stats/activity.html
+++ b/etc/html/default/stats/activity.html
@@ -59,7 +59,7 @@
                     
          • Audience Engagement
            • 
                     
          • Update History
            • 
                     
          • Code Statistics
            • 
-                    
          • Malware Scan
            • 
+                    
          • Server Health
            • 
                     
          • Firewall & Security
            • 
                     
          • System Backup
            • 
                 
@@ -75,6 +75,7 @@
                 
                 
             
            
             
+            
             
            
                 
@@ -104,10 +104,10 @@ 
            About your backup
            
                             
            
                             
            
                                 
            
-                                	Your site files are incrementally backed up offsite. This includes the code we created for you, as well as your content.
+                                	Your site files are incrementally backed up offsite. This includes the code we created for you, as well as your content.
                                 
            
                                 
            
-                                	Backups are versioned, and kept up to 60 days.
+                                	Backups are archived, dated, and kept for up to 60 days.
                             
            
                         
                      
diff --git a/etc/html/default/stats/engagement.html b/etc/html/default/stats/engagement.html
index 4d72ce3..7b84abf 100755
--- a/etc/html/default/stats/engagement.html
+++ b/etc/html/default/stats/engagement.html
@@ -59,7 +59,7 @@
                     
          • Audience Engagement
            • 
                     
          • Update History
            • 
                     
          • Code Statistics
            • 
-                    
          • Malware Scan
            • 
+                    
          • Server Health
            • 
                     
          • Firewall & Security
            • 
                     
          • System Backup
            • 
                 
@@ -170,7 +170,7 @@ 
            About these charts
            
                                     This data is collected using Google Analytics.
                                 
            
                                 
            
-                                    There is much more detailed data available, if you would like to see more comprehensive reports we can set you up easy. Drop us an email or let us know using the live support chat on this page.
+                                    There is much more detailed data available; if you would like to see more comprehensive reports we can set you up easy. Drop us an email or let us know using the live support chat on this page.
                                 
            
                             
                         
diff --git a/etc/html/default/stats/firewall.html b/etc/html/default/stats/firewall.html
index 8ca7b0d..ee7d906 100755
--- a/etc/html/default/stats/firewall.html
+++ b/etc/html/default/stats/firewall.html
@@ -59,7 +59,7 @@
 					
          • Audience Engagement
            • 
 					
          • Update History
            • 
 					
          • Code Statistics
            • 
-					
          • Malware Scan
            • 
+					
          • Server Health
            • 
 					
          • Firewall & Security
            • 
 					
          • System Backup
            • 
 				
diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html
index 04f53d4..dc69956 100755
--- a/etc/html/default/stats/index.html
+++ b/etc/html/default/stats/index.html
@@ -59,7 +59,7 @@
 					
          • Audience Engagement
            • 
 					
          • Update History
            • 
 					
          • Code Statistics
            • 
-					
          • Malware Scan
            • 
+					
          • Server Health
            • 
 					
          • Firewall & Security
            • 
 					
          • System Backup
            • 
 				
diff --git a/etc/html/default/stats/scan.html b/etc/html/default/stats/scan.html
index c5e74d9..586d131 100755
--- a/etc/html/default/stats/scan.html
+++ b/etc/html/default/stats/scan.html
@@ -59,7 +59,7 @@
                     
          • Audience Engagement
            • 
                     
          • Update History
            • 
                     
          • Code Statistics
            • 
-                    
          • Malware Scan
            • 
+                    
          • Server Health
            • 
                     
          • Firewall & Security
            • 
                     
          • System Backup
            • 
                 
@@ -80,7 +80,7 @@
                 
              
                     
            • Updated {{NOW}}
              • 
                 
            
-                My Dashboard > Malware Scan
+                My Dashboard > Server Health
                 
            
                 
            
                     
            
@@ -99,7 +99,7 @@ 
            Malware scan: {{SCAN_MSG}} 
                             
            
                                 
            
-                                    
            About the scan
            
+                                    
            About server health
            
                                 
            
                             
            
                             
            
diff --git a/etc/html/default/stats/stats.html b/etc/html/default/stats/stats.html
index 94b1a15..d67cc8d 100755
--- a/etc/html/default/stats/stats.html
+++ b/etc/html/default/stats/stats.html
@@ -59,7 +59,7 @@
 					
          • Audience Engagement
            • 
 					
          • Update History
            • 
 					
          • Code Statistics
            • 
-					
          • Malware Scan
            • 
+					
          • Server Health
            • 
 					
          • Firewall & Security
            • 
 					
          • System Backup
            • 
 				
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 9e48312..8309b89 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -246,14 +246,14 @@ function ga_over_time() {
   # PNG
   set terminal png enhanced size 1280,600
   set output '${statDir}/${METRIC}.png'
-  plot '${statDir}/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
-    "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info
+  plot '${statDir}/${METRIC}.csv' using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info,\
+    "" using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3
 
   # SVG
   set terminal svg dynamic enhanced size 1280,600
   set output '${statDir}/${METRIC}.svg'
-  plot '${statDir}/${METRIC}.csv' using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3,\
-    "" using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info  
+  plot '${statDir}/${METRIC}.csv' using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info,\
+    "" using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3
 EOF
 }
 
diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh
index e3a9720..1b704dd 100755
--- a/lib/user-feedback.sh
+++ b/lib/user-feedback.sh
@@ -13,7 +13,7 @@ echo "${pid} ${delay} ${spinstr} %{temp}" > /dev/null
 
 # Progress spinner; we'll see if this works
 function spinner() {
-  if [[ "${QUIET}" != "1" ]]; then
+  if [[ "${QUIET}" != "1" ]] && [[ "${DEBUG}" != "1" ]]; then
     local pid=$1
     local delay=0.15
     # Is ther ea better way to format this thing?  It's wonky
@@ -48,7 +48,7 @@ function progressBar() {
 
 # Display progress bar
 function showProgress() {
-  if [[ "${QUIET}" != "1" ]]; then
+  if [[ "${QUIET}" != "1" ]] && [[ "${DEBUG}" != "1" ]]; then
     _start=1
     _end=100
     for number in $(seq ${_start} ${_end})

From 9b245b14b22c7f45c4bd827a70155d201f0e1937 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 5 Sep 2018 17:19:23 -0700
Subject: [PATCH 104/334] Fixed a problem running from cron process

---
 CHANGELOG.md                           |  2 ++
 deploy.sh                              | 20 ++++++++++----------
 etc/html/default/stats/activity.html   |  2 +-
 etc/html/default/stats/backup.html     |  2 +-
 etc/html/default/stats/engagement.html |  4 ++--
 etc/html/default/stats/firewall.html   |  2 +-
 etc/html/default/stats/index.html      |  4 ++--
 etc/html/default/stats/scan.html       |  2 +-
 etc/html/default/stats/stats.html      |  2 +-
 lib/analytics.sh                       |  3 ++-
 lib/loader.sh                          |  2 +-
 lib/quit.sh                            |  1 +
 lib/scan.sh                            |  9 +++++----
 lib/statistics.sh                      | 17 +++++++++--------
 lib/utilities.sh                       |  2 +-
 15 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4db688f..d15a51c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed 
 - Improved HTML post-processing
 ### Fixed
+- The `--stats` flag should no longer cause issues when being properly run from a cron process
 - Log files should no longer be left behind in the `/tmp` directory
 - Fixed a problem where statistic dashboard could get corrupted when multiple instances of `deploy --stats` are running
 
+
 ## [3.7.1] - 07-13-2018
 ### Added
 - Added `deploy --build [project name]` for quickly building project assets
diff --git a/deploy.sh b/deploy.sh
index 4d68a30..fe0f732 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -213,7 +213,7 @@ while [[ ${1:-unset} = -?* ]]; do
     --invoice) CREATE_INVOICE="1" ;;
     --unlock) UNLOCK="1" ;;
     --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;;
-    --scan) SCAN="1"; FORCE="1" ;;
+    --scan) SCAN="1" ;;
     --no-check) NOCHECK="1" ;;
     --function-list) FUNCTIONLIST="1"; CURRENT="1" ;; # Spoofs --current
     --variable-list) VARIABLELIST="1"; CURRENT="1" ;; # Spoofs --current
@@ -288,15 +288,15 @@ echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}"
 echo -e "Launching deploy${STARTUP}\n" >> "${logFile}"
 
 # More crappy tmp files
-postFile="/tmp/${APP}.wtf-$RANDOM.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail
-trshFile="/tmp/${APP}.trsh-$RANDOM.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail
-scanFile="/tmp/${APP}.scan-$RANDOM.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail 
-statFile="/tmp/${APP}.stat-$RANDOM.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail
-statDir="/tmp/${APP}.stat-$RANDOM"; (umask 077 && mkdir "${statDir}" &> /dev/null) || log_fail
-urlFile="/tmp/${APP}.url-$RANDOM.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail
-htmlFile="/tmp/${APP}.log-$RANDOM.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail
-htmlEmail="/tmp/${APP}.email-$RANDOM.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail
-clientEmail="/tmp/${APP}.shortemail-$RANDOM.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail
+postFile="/tmp/${APP}.wtf-${RANDOM}.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail
+trshFile="/tmp/${APP}.trsh-${RANDOM}.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail
+scanFile="/tmp/${APP}.scan-${RANDOM}.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail 
+statFile="/tmp/${APP}.stat-${RANDOM}.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail
+statDir="/tmp/${APP}.stat-${RANDOM}"; (umask 077 && mkdir "${statDir}" &> /dev/null) || log_fail
+urlFile="/tmp/${APP}.url-${RANDOM}.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail
+htmlFile="/tmp/${APP}.log-${RANDOM}.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail
+htmlEmail="/tmp/${APP}.email-${RANDOM}.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail
+clientEmail="/tmp/${APP}.shortemail-${RANDOM}.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail
 
 # Path of the script; I should flip this check to make it more useful
 if [ -d "/etc/deploy" ]; then
diff --git a/etc/html/default/stats/activity.html b/etc/html/default/stats/activity.html
index 5340226..4b53847 100755
--- a/etc/html/default/stats/activity.html
+++ b/etc/html/default/stats/activity.html
@@ -56,7 +56,7 @@
                 
            
                 
              
                     
            • 
-                    
            • Audience Engagement
              • 
+                    
            • Site Traffic
              • 
                     
            • Update History
              • 
                     
            • Code Statistics
              • 
                     
            • Server Health
              • 
diff --git a/etc/html/default/stats/backup.html b/etc/html/default/stats/backup.html
index e35db37..0fa69fe 100755
--- a/etc/html/default/stats/backup.html
+++ b/etc/html/default/stats/backup.html
@@ -56,7 +56,7 @@
 				
              
 				
                
 					
              • 
-					
              • Audience Engagement
                • 
+					
              • Site Traffic
                • 
 					
              • Update History
                • 
 					
              • Code Statistics
                • 
 					
              • Server Health
                • 
diff --git a/etc/html/default/stats/engagement.html b/etc/html/default/stats/engagement.html
index 7b84abf..0952ba0 100755
--- a/etc/html/default/stats/engagement.html
+++ b/etc/html/default/stats/engagement.html
@@ -56,7 +56,7 @@
                 
                
                 
                  
                     
                • 
-                    
                • Audience Engagement
                  • 
+                    
                • Site Traffic
                  • 
                     
                • Update History
                  • 
                     
                • Code Statistics
                  • 
                     
                • Server Health
                  • 
@@ -80,7 +80,7 @@
                 
                    
                     
                  • Updated {{NOW}}
                    • 
                 
                  
-                My Dashboard > Audience Engagement
+                My Dashboard > Site Traffic
                 
                  
                 
                  
                     
                  
diff --git a/etc/html/default/stats/firewall.html b/etc/html/default/stats/firewall.html
index ee7d906..710a197 100755
--- a/etc/html/default/stats/firewall.html
+++ b/etc/html/default/stats/firewall.html
@@ -56,7 +56,7 @@
 				
                  
 				
                    
 					
                  • 
-					
                  • Audience Engagement
                    • 
+					
                  • Site Traffic
                    • 
 					
                  • Update History
                    • 
 					
                  • Code Statistics
                    • 
 					
                  • Server Health
                    • 
diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html
index dc69956..1ad5c64 100755
--- a/etc/html/default/stats/index.html
+++ b/etc/html/default/stats/index.html
@@ -56,7 +56,7 @@
 				
                    
 				
                      
 					
                    • 
-					
                    • Audience Engagement
                      • 
+					
                    • Site Traffic
                      • 
 					
                    • Update History
                      • 
 					
                    • Code Statistics
                      • 
 					
                    • Server Health
                      • 
@@ -98,7 +98,7 @@
 							
                      
 								
                      
 									
-									
                      Audience Engagement (Last 7 days)
                      
+									
                      Site Traffic (Last 7 days)
                      
 								
                      
 							
                      
 							
                      
diff --git a/etc/html/default/stats/scan.html b/etc/html/default/stats/scan.html
index 586d131..a09d45a 100755
--- a/etc/html/default/stats/scan.html
+++ b/etc/html/default/stats/scan.html
@@ -56,7 +56,7 @@
                 
                      
                 
                        
                     
                      • 
-                    
                      • Audience Engagement
                        • 
+                    
                      • Site Traffic
                        • 
                     
                      • Update History
                        • 
                     
                      • Code Statistics
                        • 
                     
                      • Server Health
                        • 
diff --git a/etc/html/default/stats/stats.html b/etc/html/default/stats/stats.html
index d67cc8d..8adbd42 100755
--- a/etc/html/default/stats/stats.html
+++ b/etc/html/default/stats/stats.html
@@ -56,7 +56,7 @@
 				
                        
 				
                          
 					
                        • 
-					
                        • Audience Engagement
                          • 
+					
                        • Site Traffic
                          • 
 					
                        • Update History
                          • 
 					
                        • Code Statistics
                          • 
 					
                        • Server Health
                          • 
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 8309b89..b423fd2 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -183,7 +183,8 @@ function ga_over_time() {
     ga_day="$(date -I -d "$ga_day - 1 day")"
   done
 
-  # Create percentage array
+  # Create percentage array, this is pretty much obsolete now since 
+  # we're using gnuplot
   ga_sequence="$(echo -e "${ga_sequence}" | sed -e 's/[[:space:]]*$//')"
   # trace "Calculating array: ${ga_sequence}"
   IFS=', ' read -r -a a <<< "${ga_sequence}"
diff --git a/lib/loader.sh b/lib/loader.sh
index 2ce31d9..5d1c57a 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -31,7 +31,7 @@ fi
 #   None
 ###############################################################################      
 function trace() {
-  if [[ "${VERBOSE}" == "TRUE" ]]; then
+  if [[ "${VERBOSE}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
       echo -e -n "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) ${2}"
diff --git a/lib/quit.sh b/lib/quit.sh
index cc1c9f7..07e3d69 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -88,6 +88,7 @@ function clean_up() {
   [[ -f "${postFile}" ]] && rm "${postFile}"
   [[ -f "${statFile}" ]] && rm "${statFile}"
   [[ -f "${scanFile}" ]] && rm "${scanFile}"
+  [[ -f "${scan_html}" ]] && rm "${scan_html}"
   [[ -f "${wpFile}" ]] && rm "${wpFile}"
   [[ -f "${urlFile}" ]] && rm "${urlFile}"
   [[ -f "${htmlFile}" ]] && rm "${htmlFile}"
diff --git a/lib/scan.sh b/lib/scan.sh
index 3482dfe..391840c 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -49,12 +49,13 @@ function scan_host() {
   
   # Run the scan
   trace "Scanning ${PRODURL}..."
+  # Spinners commented out for now, causing issues when running from a crontab
   if [[ -z "${NIKTO_PROXY}" ]]; then
-    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" &
-    spinner $!
+    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" #&
+    #spinner $!
   else
-    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scanFile}" &
-    spinner $!
+    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scanFile}" #&
+    #spinner $!
   fi
 
   # For testing only
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 9208c77..6b469ff 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -67,24 +67,25 @@ function project_stats() {
     cat "${htmlFile}" > "${statDir}/index.html"
 
     # Create SVG charts
+    # Spinners commented out for now, causing issues when running from a crontab
     repo_charts=(authors commits_day_week commits_hour_day commits_hour_week \
       commits_month commits_year commits_year_month files_type)
     for i in "${repo_charts[@]}" ; do
       /usr/bin/gitchart -r "${WORKPATH}/${APP}" "${i}" "${statDir}/${i}.svg" &>> /dev/null
       sed -i "s/#9999ff/${PRIMARYC}/g" "${statDir}/${i}.svg" 
       sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "${statDir}/${i}.svg"
-    done &
-    spinner $!
+    done #&
+    #spinner $!
 
     # Create sub pages
-    project_activity & spinner $!
-    project_statistics & spinner $!
-    project_firewall & spinner $!
-    project_backup & spinner $!
-    project_engagement & spinner $!
+    project_activity #& spinner $!
+    project_statistics #& spinner $!
+    project_firewall #& spinner $!
+    project_backup #& spinner $!
+    project_engagement #& spinner $!
 
     # Post files
-    postLog & spinner $!
+    postLog #& spinner $!
   fi
 }
 
diff --git a/lib/utilities.sh b/lib/utilities.sh
index cb0dc40..45b26f5 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -84,7 +84,7 @@ function go() {
   fi
 
   # Chill and wait for user to confirm project
-  if  [[ "${FORCE}" == "1" ]] || yesno --default yes "Continue? [Y/n] "; then
+  if  [[ "${FORCE}" == "1" || "${SCAN}" == "1" || "${PROJSTATS}" == "1" ]] || yesno --default yes "Continue? [Y/n] "; then
     trace "Loading project"
   else
     quickExit

From dfd30cf2cb72eb2c32d1ae0139226958b7ed50b9 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 5 Sep 2018 18:12:21 -0700
Subject: [PATCH 105/334] Resolve #145

---
 lib/scp.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/scp.sh b/lib/scp.sh
index b703eb0..f9daaea 100755
--- a/lib/scp.sh
+++ b/lib/scp.sh
@@ -20,11 +20,19 @@ function deploy_scp() {
       SCP_DEPLOY_PORT="22"
     fi
 
+    # Checkout production branch - note this function currently requires the
+    # --merge flag, this will need to be changed
+    gitChkProd
+
     # Todo: Add proper checks/fallbacks here
     TMP=$(<$SCP_DEPLOY_PASS)
     SCP_DEPLOY_PASS="${TMP}"
     sshpass -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -P "${SCP_DEPLOY_PORT}" -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/"  &>> "${logFile}"; error_check;
+
+    # Checkout master and move on
+    gitChkMstr
+
   else
-    echo "ERROR: Can not find production server path"; exit 1
+    echo "ERROR: Can not find production server path"; return
   fi 
 }

From 5e8b42f74bf1b2bb6bcc77707a5ff30101a05010 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 11 Sep 2018 13:43:46 -0700
Subject: [PATCH 106/334] Better early user exit trapping

---
 deploy.sh   | 29 ++++++++++++++++++++++++++---
 lib/quit.sh |  1 +
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index fe0f732..e6e3dd3 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,6 +23,32 @@ APP="null"
 # Set mode
 set -uo pipefail
 
+# Trap ctrl-c exits; someday I'll do this better 
+trap ctrl_c INT
+
+function ctrl_c() {
+  if type quietExit &>/dev/null; then
+    quietExit
+  else
+    [[ -f "${logFile}" ]] && rm "${logFile}"
+    [[ -f "${trshFile}" ]] && rm "${trshFile}"
+    [[ -f "${postFile}" ]] && rm "${postFile}"
+    [[ -f "${statFile}" ]] && rm "${statFile}"
+    [[ -f "${scanFile}" ]] && rm "${scanFile}"
+    [[ -f "${scan_html}" ]] && rm "${scan_html}"
+    [[ -f "${wpFile}" ]] && rm "${wpFile}"
+    [[ -f "${urlFile}" ]] && rm "${urlFile}"
+    [[ -f "${htmlFile}" ]] && rm "${htmlFile}"
+    [[ -f "${htmlEmail}" ]] && rm "${htmlEmail}"
+    [[ -f "${clientEmail}" ]] && rm "${clientEmail}"
+    [[ -f "${coreFile}" ]] && rm "${coreFile}"
+    [[ -d "${statDir}" ]] && rm -rf "${statDir}"
+    [[ -d /tmp/stats ]] && rm -rf /tmp/stats
+    [[ -d /tmp/avatar ]] && rm -rf /tmp/avatar
+    exit 27
+  fi
+}
+
 # Initialize variables 
 # Startup switches
 read -r APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \
@@ -565,8 +591,5 @@ fi
 # Execute the deploy process
 main
 
-# Trapping stuff
-trap userExit INT
-
 # All done
 safeExit
diff --git a/lib/quit.sh b/lib/quit.sh
index 07e3d69..e358c13 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -97,6 +97,7 @@ function clean_up() {
   [[ -f "${coreFile}" ]] && rm "${coreFile}"
   [[ -d "${statDir}" ]] && rm -rf "${statDir}"
   [[ -d /tmp/stats ]] && rm -rf /tmp/stats
+  [[ -d /tmp/avatar ]] && rm -rf /tmp/avatar
   # [[ -f "${gitLock}" ]] && rm "${gitLock}"
   # Attempt to reset the terminal
   # echo -e \\033c

From ec293bbbaaaa3a3a23848bce9227e1868379911c Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 12 Sep 2018 09:53:42 -0700
Subject: [PATCH 107/334] Added analytics totals to dashboard engagement
 template

---
 CHANGELOG.md                           | 1 +
 etc/html/default/stats/engagement.html | 8 ++++----
 lib/analytics.sh                       | 5 ++++-
 lib/process-html.sh                    | 3 ++-
 lib/statistics.sh                      | 6 ++++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d15a51c..718db6a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Project dashboards have been redesigned to include more analytics charts and information
 - Digest emails can now include a chart showing the week's analytics
 ### Changed 
 - Improved HTML post-processing
diff --git a/etc/html/default/stats/engagement.html b/etc/html/default/stats/engagement.html
index 0952ba0..c5266f5 100755
--- a/etc/html/default/stats/engagement.html
+++ b/etc/html/default/stats/engagement.html
@@ -112,7 +112,7 @@ 
                          Pageviews (Last 7 days)
                          
                        
                          
                             
                          
                                 
                          
-                                    
                          {{GA_SEARCHES}} organic searches (Last 7 days)
                          
+                                    
                          {{ga_organicSearches}} organic searches (Last 7 days)
                          
                                 
                          
                             
                          
                             
                          
@@ -124,7 +124,7 @@ 
                          {{GA_SEARCHES}} organic searches (Last 7 days)
                          
                         
                          
                             
                          
                                 
                          
-                                    
                          Unique visitors (Last 7 days)
                          
+                                    
                          {{ga_users}} unique visitors (Last 7 days)
                          
                                 
                          
                             
                          
                             
                          
@@ -136,7 +136,7 @@ 
                          Unique visitors (Last 7 days)
                          
                         
                          
                             
                          
                                 
                          
-                                    
                          {{GA_PERCENT}}% new users (Last 7 days)
                          
+                                    
                          {{ga_newUsers}} new users (Last 7 days)
                          
                                 
                          
                             
                          
                             
                          
@@ -148,7 +148,7 @@ 
                          {{GA_PERCENT}}% new users (Last 7 days)
                          
                         
                          
                             
                          
                                 
                          
-                                    
                          Sessions (Last 7 days)
                          
+                                    
                          {{ga_sessions}} sessions (Last 7 days)
                          
                                 
                          
                             
                          
                             
                          
diff --git a/lib/analytics.sh b/lib/analytics.sh
index b423fd2..85eba7c 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -176,13 +176,16 @@ function ga_over_time() {
     RESULT="$(printf "%.0f\n" "${RESULT}")"
     # trace "${ga_day}: ${RESULT} $1"
     
+    # Add to total
+    let ga_${METRIC}+="${RESULT}"
+    
     # Store the values 
     declare "$1_${day}"="${RESULT}"
     ga_sequence="${ga_sequence}${RESULT} "
     day="$((day+1))"
     ga_day="$(date -I -d "$ga_day - 1 day")"
   done
-
+ 
   # Create percentage array, this is pretty much obsolete now since 
   # we're using gnuplot
   ga_sequence="$(echo -e "${ga_sequence}" | sed -e 's/[[:space:]]*$//')"
diff --git a/lib/process-html.sh b/lib/process-html.sh
index f69833d..4e9eb8d 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -81,7 +81,8 @@ function process_html() {
     GREETING REMOTEURL ANALYTICSMSG COVER WEEKOF UPTIME LATENCY GA_HITS \
     GA_PERCENT GA_SEARCHES GA_DURATION GA_SOCIAL CODE_STATS SCAN_BTN \
     UPTIME_BTN LATENCY_BTN BACKUP_BTN ACTIVITY_NAV STATISTICS_NAV SCAN_NAV \
-    ENGAGEMENT_NAV FIREWALL_NAV BACKUP_NAV BACKUP_MSG TOTAL_COMMITS RSS_URL)
+    ENGAGEMENT_NAV FIREWALL_NAV BACKUP_NAV BACKUP_MSG TOTAL_COMMITS RSS_URL \
+    ga_hits ga_users ga_newUsers ga_sessions ga_organicSearches ga_pageviews)
 
   # Start the loop
   for i in "${process_var[@]}" ; do
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 6b469ff..5c95ada 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -12,13 +12,15 @@ read -r DB_API_TOKEN DB_BACKUP_PATH LAST_BACKUP BACKUP_STATUS CODE_STATS \
   BACKUP_BTN LATENCY_BTN UPTIME_BTN SCAN_BTN COMMITS_RECENT  \
   repo_charts ACTIVITY_NAV STATISTICS_NAV SCAN_NAV ENGAGEMENT_NAV \
   FIREWALL_NAV BACKUP_NAV SCAN_STATS FIREWALL_STATUS BACKUP_MSG \
-  BACKUP_FILES TOTAL_COMMITS RSS_URL <<< ""
+  BACKUP_FILES TOTAL_COMMITS RSS_URL ga_hits ga_users ga_newUsers ga_sessions \
+  ga_organicSearches ga_pageviews <<< ""
 echo "${DB_API_TOKEN} ${DB_BACKUP_PATH} ${LAST_BACKUP} ${BACKUP_STATUS} 
   ${CODE_STATS} ${BACKUP_BTN} ${LATENCY_BTN} ${UPTIME_BTN} ${SCAN_BTN}
   ${COMMITS_RECENT} ${repo_charts} ${ACTIVITY_NAV} ${STATISTICS_NAV} 
   ${SCAN_NAV} ${ENGAGEMENT_NAV} ${FIREWALL_NAV} ${BACKUP_NAV} 
   ${FIREWALL_STATUS} ${BACKUP_MSG} ${BACKUP_FILES} ${TOTAL_COMMITS} 
-  ${RSS_URL}" > /dev/null
+  ${RSS_URL} ${ga_hits} ${ga_users} ${ga_newUsers} ${ga_sessions} 
+  ${ga_organicSearches} ${ga_pageviews}" > /dev/null
 
 function project_stats() {
   hash gitchart 2>/dev/null || {

From 4f52a9b375a566ffe2b3d2965ee70adfba1867ed Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 24 Sep 2018 12:06:46 -0700
Subject: [PATCH 108/334] Fix unbound variable error when analytics result is
 zero

---
 CHANGELOG.md     |  1 +
 lib/analytics.sh | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 718db6a..bb4f2d6 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - The `--stats` flag should no longer cause issues when being properly run from a cron process
 - Log files should no longer be left behind in the `/tmp` directory
 - Fixed a problem where statistic dashboard could get corrupted when multiple instances of `deploy --stats` are running
+- Unbound variable errors no longer occur when a Google Analytics result is zero
 
 
 ## [3.7.1] - 07-13-2018
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 85eba7c..186d9de 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -14,10 +14,21 @@ trace "Loading analytics functions"
 
 # Initialize variables
 read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
-  GA_SOCIAL ANALYTICSMSG ga_var ga_day ga_sequence max_value n a GA_TOTAL <<< ""
+  GA_SOCIAL ANALYTICSMSG ga_day ga_sequence max_value n a GA_TOTAL <<< ""
 echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} 
-  ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG} ${ga_var} 
-  ${ga_sequence} ${max_value} ${n} ${a} ${GA_TOTAL}" > /dev/null
+  ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG} ${ga_sequence} 
+  ${max_value} ${n} ${a} ${GA_TOTAL}" > /dev/null
+
+ga_var=(users newUsers percentNewSessions sessionsPerUser sessions 
+    bounceRate avgSessionDuration hits organicSearches pageviews avgTimeOnPage
+    avgPageLoadTime avgDomainLookupTime avgServerResponseTime impressions 
+    adClicks adCost CPC CTR socialInteractions)
+
+for i in "${ga_var[@]}" ; do
+  read -r ga_${i} <<< ""
+  echo "ga_${i}" > /dev/null
+done
+
 
 function ga_metrics() {
   array[0]="hits"
@@ -331,7 +342,7 @@ function ga_test() {
   # Just here for testing
   #ga_data_loop
   # METRIC="newUsers"
-  notice "Retrieving ${METRIC}..." 
+  notice "Retrieving a random metric (${METRIC})..." 
   ga_over_time "${METRIC}" 7
   cat ${statDir}/"${METRIC}".csv
   return

From 6ae4cc6a58da72a81e7197e38a8af238f855fcfd Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 25 Sep 2018 16:47:59 -0700
Subject: [PATCH 109/334] Exit cleanup

---
 deploy.sh     | 2 ++
 lib/digest.sh | 8 ++++----
 lib/quit.sh   | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index e6e3dd3..33e1b38 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -43,6 +43,7 @@ function ctrl_c() {
     [[ -f "${clientEmail}" ]] && rm "${clientEmail}"
     [[ -f "${coreFile}" ]] && rm "${coreFile}"
     [[ -d "${statDir}" ]] && rm -rf "${statDir}"
+    [[ -d "${avatarDir}" ]] && rm -rf "${avatarDir}"
     [[ -d /tmp/stats ]] && rm -rf /tmp/stats
     [[ -d /tmp/avatar ]] && rm -rf /tmp/avatar
     exit 27
@@ -319,6 +320,7 @@ trshFile="/tmp/${APP}.trsh-${RANDOM}.log"; (umask 077 && touch "${trshFile}" &>
 scanFile="/tmp/${APP}.scan-${RANDOM}.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail 
 statFile="/tmp/${APP}.stat-${RANDOM}.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail
 statDir="/tmp/${APP}.stat-${RANDOM}"; (umask 077 && mkdir "${statDir}" &> /dev/null) || log_fail
+avatarDir="/tmp/${APP}.avatar-${RANDOM}"; (umask 077 && mkdir "${avatarDir}" &> /dev/null) || log_fail
 urlFile="/tmp/${APP}.url-${RANDOM}.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail
 htmlFile="/tmp/${APP}.log-${RANDOM}.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail
 htmlEmail="/tmp/${APP}.email-${RANDOM}.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail
diff --git a/lib/digest.sh b/lib/digest.sh
index b566f81..49f12d9 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -21,10 +21,10 @@ function get_avatars() {
     if [[ "${SCPPOST}" != "TRUE" ]]; then 
       IMGFILE="${LOCALHOSTPATH}/${APP}/avatar/$AUTHORNAME.png"
     else
-      if [[ ! -d "/tmp/avatar" ]]; then
-        umask 077 && mkdir /tmp/avatar &> /dev/null
-      fi
-      IMGFILE="/tmp/avatar/${AUTHORNAME}.png"
+      #if [[ ! -d "/tmp/avatar" ]]; then
+      #  umask 077 && mkdir /tmp/avatar &> /dev/null
+      #fi
+      IMGFILE="${avatarDir}/${AUTHORNAME}.png"
     fi
     curl -fso "${IMGFILE}" "${GRAVATAR}"
   done  
diff --git a/lib/quit.sh b/lib/quit.sh
index e358c13..2e92e2b 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -96,8 +96,9 @@ function clean_up() {
   [[ -f "${clientEmail}" ]] && rm "${clientEmail}"
   [[ -f "${coreFile}" ]] && rm "${coreFile}"
   [[ -d "${statDir}" ]] && rm -rf "${statDir}"
+  [[ -d "${avatarDir}" ]] && rm -rf "${avatarDir}"
   [[ -d /tmp/stats ]] && rm -rf /tmp/stats
-  [[ -d /tmp/avatar ]] && rm -rf /tmp/avatar
+  # [[ -d /tmp/avatar ]] && rm -rf /tmp/avatar
   # [[ -f "${gitLock}" ]] && rm "${gitLock}"
   # Attempt to reset the terminal
   # echo -e \\033c

From b4a3ddc8b31643c34a66654d657ce364fa4894c3 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 25 Sep 2018 16:53:25 -0700
Subject: [PATCH 110/334] Release 3.7.2

---
 CHANGELOG.md | 5 +++--
 deploy.sh    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb4f2d6..dcec9c8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [3.7.2] - 09-25-2018
 ### Added
 - Project dashboards have been redesigned to include more analytics charts and information
 - Digest emails can now include a chart showing the week's analytics
@@ -230,7 +230,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Old monolithic script rewritten
 
 
-[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.1...HEAD
+[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.2...HEAD
+[3.7.2]: https://github.com/EMRL/deploy/compare/v3.7.1...v3.7.2
 [3.7.1]: https://github.com/EMRL/deploy/compare/v3.7...v3.7.1
 [3.7]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7
 [3.6.7]: https://github.com/EMRL/deploy/compare/v3.6.6...v3.6.7
diff --git a/deploy.sh b/deploy.sh
index 33e1b38..e5c3af2 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -10,7 +10,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.7.2-dev"
+VERSION="3.7.2"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"

From 9c7b7d4b49b2376dfb004e0e1763d275c2bee510 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 25 Sep 2018 16:55:32 -0700
Subject: [PATCH 111/334] One more thing

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 437bb81..0254978 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Deploy
 
-[![release](https://img.shields.io/badge/release-v3.7.1-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
+[![release](https://img.shields.io/badge/release-v3.7.2-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
 
 `deploy` is designed to speed up, automate, and integrate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 

From e9ff60ef792af18f4400babefaaccd88b9b825b0 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 25 Sep 2018 17:17:02 -0700
Subject: [PATCH 112/334] .donotdeploy can now override deployment

---
 CHANGELOG.md     | 4 ++++
 deploy.sh        | 2 +-
 lib/utilities.sh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcec9c8..b2bf2b3 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Changed
+- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory
+
 ## [3.7.2] - 09-25-2018
 ### Added
 - Project dashboards have been redesigned to include more analytics charts and information
diff --git a/deploy.sh b/deploy.sh
index e5c3af2..5ea7815 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -10,7 +10,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.7.2"
+VERSION="3.7.3-dev"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 45b26f5..77ddc20 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -91,7 +91,7 @@ function go() {
   fi
 
   # Is this project locked?
-  if [[ "${DONOTDEPLOY}" == "TRUE" ]]; then
+  if [[ "${DONOTDEPLOY}" == "TRUE" ]] || [[ -f "${WORKPATH}/${APP}/.donotdeploy" ]]; then
     warning "This project is currently locked, and can't be deployed."; quickExit
   fi
 

From 0cf0f0def7426a263cd24c634025bfe12b3d8cba Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 26 Sep 2018 17:52:53 -0700
Subject: [PATCH 113/334] Upload fix, resolve #147

---
 lib/post-log.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/post-log.sh b/lib/post-log.sh
index a19210d..8e0e97e 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -97,13 +97,13 @@ function postLog() {
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/stats"
         eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
-        eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}"
+        eval "${SCPCMD} -r" "${avatarDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/avatar/"
         # Clean up your mess
         #if [[ -d "${statDir}" ]]; then
         #  rm -R "${statDir}"
         #fi
-        if [[ -d "/tmp/avatar" ]]; then
-          rm -R "/tmp/avatar"
+        if [[ -d "${avatarDir}" ]]; then
+          rm -R "${avatarDir}"
         fi
       fi
 

From 8c62451ba3b57467a1e31306baf7b37f3e4d8a0a Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 5 Oct 2018 11:57:00 -0700
Subject: [PATCH 114/334] File integrity check for ACF Pro updates

---
 CHANGELOG.md      |  2 ++
 install/doinst.sh |  2 +-
 lib/wp-acf.sh     | 32 ++++++++++++++++++++++++++------
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2bf2b3..58b0b74 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
 ### Changed
 - Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory
 
diff --git a/install/doinst.sh b/install/doinst.sh
index f6c5f66..3eabcda 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -90,7 +90,7 @@ fi
 dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sleep tee tput)
 
 # Declare optional stuff
-options=(gitchart gnuplot grunt npm scp sendmail ssh sshpass wget wkhtmltopdf wp)
+options=(gitchart gnuplot grunt npm scp sendmail ssh sshpass unzip wget wkhtmltopdf wp)
 
 message=''
 fg_red="$(tput setaf 1)"
diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh
index e67d872..0e5fd4c 100755
--- a/lib/wp-acf.sh
+++ b/lib/wp-acf.sh
@@ -12,11 +12,31 @@ echo "${ACFFILE}" > /dev/null
 
 function acf_update() {
   if grep -q "advanced-custom-fields-pro" "${wpFile}"; then
-    ACFFILE="/tmp/acfpro.zip"
-    # Download the ACF Pro upgrade file
-    wget -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${logFile}"
-    "${WPCLI}"/wp plugin delete --no-color advanced-custom-fields-pro &>> "${logFile}"
-    "${WPCLI}"/wp plugin install --no-color "${ACFFILE}" &>> "${logFile}"
-    rm "${ACFFILE}"
+	ACFFILE="/tmp/acfpro.zip"
+	# Download the ACF Pro upgrade file
+	wget --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${logFile}"; error_check
+
+	# Check file integrity
+	acf_filecheck
+
+	# Proceed with install
+	"${WPCLI}"/wp plugin delete --no-color advanced-custom-fields-pro &>> "${logFile}"
+	"${WPCLI}"/wp plugin install --no-color "${ACFFILE}" &>> "${logFile}"
+	rm "${ACFFILE}"
   fi
 }
+
+function acf_filecheck() {
+	if [[ -f "${ACFFILE}" ]]; then
+		hash unzip 2>/dev/null || {
+			if [[ "${AUTOMATE}" == "1" ]]; then
+				warning "Can not find unzip command, skipping ACF file integrity check."; return
+			else
+				error "Can not find unzip command, ACF file integrity can not be checked."
+			fi
+		  }
+
+		# Run the check
+		unzip -t "${ACFFILE}" &>/dev/null; error_check
+	fi
+}
\ No newline at end of file

From 1ba5352f097ae70bd91d9b71c4da584c7aa947a0 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 5 Oct 2018 12:16:46 -0700
Subject: [PATCH 115/334] Improved deployment messages

---
 CHANGELOG.md      |  2 ++
 lib/deployment.sh | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b0b74..3180205 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
 ### Changed
 - Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory
+### Fixed
+- Fixed a bug that occasionally caused successful deployment to be incorrectly reported
 
 ## [3.7.2] - 09-25-2018
 ### Added
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 23f1649..c6a60da 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -7,6 +7,10 @@
 ###############################################################################
 trace "Loading deployment functions"   
 
+# Initializa needed variables
+read -r start_deploy <<< ""
+echo "${start_deploy}" > /dev/null
+
 # Housekeeping tasks to run before final deployment
 function preDeploy() {
   # If there are changes waiting in the repo, stop and ask for user input
@@ -75,6 +79,7 @@ function pkgDeploy() {
 
       # If we don't require approval to push to live, keep going
       if [[ "${FORCE}" == "1" ]] || yesno --default yes "Deploy to live server? [Y/n] "; then
+        start_deploy="1"
 
         # Test deployment command before running
         if [[ "${DEPLOY}" != "SCP" ]]; then
@@ -100,11 +105,10 @@ function pkgDeploy() {
             fi
           else
             if [[ "${DEPLOY}" == "SCP" ]]; then
-              deploy_scp &>> "${logFile}"
+              deploy_scp &>> "${logFile}"; error_check
             else
-              eval "${DEPLOY}" &>> "${logFile}"
+              eval "${DEPLOY}" &>> "${logFile}"; error_check
             fi
-            error_check
           fi
         fi
 
@@ -147,10 +151,7 @@ function postDeploy() {
     if [[ -z $(git status -uno --porcelain) ]]; then
       # Run integration hooks
       postCommit  
-      # This needs a check.
-      if [[ -n "${PRODURL}" ]]; then
-        info "Deployed to ${PRODURL}"
-      fi
+      deploy_msg
     else
       warning "Deployment succeeded, but something unexpected happened."
       if yesno --default yes "View status? [Y/n] "; then
@@ -167,8 +168,14 @@ function postDeploy() {
       if [[ -z "${PRODURL}" ]]; then
         warning "No production URL configured, but deployment command ran successfully."
       else
-        info "Deployed to ${PRODURL}"
+        deploy_msg
       fi
     fi
   fi
 }
+
+function deploy_msg() {
+  if [[ -n "${PRODURL}" ]] && [[ "${start_deploy}" == "1" ]]; then
+    info "Deployed to ${PRODURL}"
+  fi
+}

From 22b56682e8f9b0946acc80364b158995f9068fc1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 14 Oct 2018 14:06:11 -0700
Subject: [PATCH 116/334] Composer detection

---
 CHANGELOG.md           |  3 +-
 README.md              |  4 +--
 lib/error-check.sh     | 16 ++++++++--
 lib/package-manager.sh | 68 +++++++++++++++++++++++++-----------------
 lib/scp.sh             | 13 ++++++--
 lib/wp-plugins.sh      | 16 +++++++++-
 6 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3180205..9897288 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Wordpress projects can now be managed using either `composer` or `wp-cli` (or both) transparently
 - ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
 ### Changed
-- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory
+- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory (This is the equivalent of setting `DONOTDEPLOY="TRUE"` in `.deploy.sh`)
 ### Fixed
 - Fixed a bug that occasionally caused successful deployment to be incorrectly reported
 
diff --git a/README.md b/README.md
index 0254978..c4e6409 100755
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![release](https://img.shields.io/badge/release-v3.7.2-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
 
-`deploy` is designed to speed up, automate, and integrate project deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
+`deploy` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 
 [Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md)
 
@@ -59,7 +59,7 @@ Other Options:
 
 ## How It Works
 
-Basically, this thing consolidates a boatload of commands into a single command that simplifies web app deployment from a development or staging environment to a production server. 
+`deploy` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. 
 
 `deploy` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
 
diff --git a/lib/error-check.sh b/lib/error-check.sh
index 14213ff..26f3132 100755
--- a/lib/error-check.sh
+++ b/lib/error-check.sh
@@ -51,11 +51,23 @@ function deploy_check() {
     elif [[ -f "${WORKPATH}/${APP}/.deploy.yml" ]]; then
       DEPLOYTEST="bundle exec mina --simulate deploy -f Minafile"
       grep -n -w "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
-      MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile})
+      
+      if grep -q "'" "${trshFile}"; then
+        MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile}) # Single quote method
+      else
+        MINAUSER=$(awk 'NF>1{print $NF}' ${trshFile})
+      fi
+
       echo -n "${MINAUSER}" > "${statFile}"
       echo -n "@" >> ${statFile}
       grep -n -w "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
-      MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile})
+
+      if grep -q "'" "${trshFile}"; then
+        MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile}) # Single quote method
+      else
+        MINADOMAIN=$(awk 'NF>1{print $NF}' ${trshFile})
+      fi
+
       echo -n "${MINADOMAIN}" >> "${statFile}"
       SSHTARGET=$(sed -r 's/\s+//g' ${statFile})  
       # SSH check
diff --git a/lib/package-manager.sh b/lib/package-manager.sh
index d33dc0b..644fe02 100755
--- a/lib/package-manager.sh
+++ b/lib/package-manager.sh
@@ -8,8 +8,8 @@
 trace "Loading build management"
 
 # Initialize variables
-read -r deploy_config SKIP_BUILD <<< ""
-echo "${deploy_config} ${SKIP_BUILD}" > /dev/null
+read -r deploy_config SKIP_BUILD npm_json <<< ""
+echo "${deploy_config} ${SKIP_BUILD} ${npm_json}" > /dev/null
 
 function pkgMgr() {
   if [[ "${FORCE}" != "1" ]] || [[ "${BUILD}" == "1" ]]; then
@@ -36,32 +36,8 @@ function pkgMgr() {
         sleep 1
 
         # node.js check
-        if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then
-          trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found."
+        npm_build
 
-          check_build_method
-          if [[ "${SKIP_BUILD}" == "1" ]]; then
-            return
-          fi
-          
-          notice "Found npm configuration!"
-          if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then
-            cd "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}" || errorCheck
-
-            if [[ "${VERBOSE}" == "TRUE" ]]; then
-              npm run build | tee --append "${trshFile}"               
-            else
-              npm run build &>> "${trshFile}" &
-              spinner $!   
-              info "Packages successfully compiled."
-            fi
-          else
-            info "Skipping Node Package Manager..."
-          fi
-        else
-          # info "No package management needed."
-          trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/$APP/package.json not found, skipping."
-        fi
       fi
     fi
   fi
@@ -78,3 +54,41 @@ function check_build_method() {
     fi
   fi
 }
+
+function npm_build() {
+  if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/site/package.json" ]]; then
+    trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/site/package.json found."
+    npm_json="${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/site"
+  elif [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then
+    trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found."
+    npm_json="${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}"
+  elif [[ -f "${WORKPATH}/${APP}/package.json" ]]; then
+    trace "${WORKPATH}/${APP}/package.json found."
+    npm_json="${WORKPATH}/${APP}"
+  fi
+
+  if [[ -z "${npm_json}" ]]; then 
+    trace "package.json not found, skipping."
+    return
+  fi
+
+  check_build_method
+
+  if [[ "${SKIP_BUILD}" == "1" ]]; then
+    return
+  fi
+   
+  notice "Found npm configuration!"
+  if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then
+    cd "${npm_json}" || errorCheck
+    if [[ "${VERBOSE}" == "TRUE" ]]; then
+      npm run build | tee --append "${trshFile}"               
+    else
+      npm run build &>> "${trshFile}" &
+      spinner $!   
+      info "Packages successfully compiled."
+    fi
+  else
+    info "Skipping Node Package Manager..."
+  fi
+}
diff --git a/lib/scp.sh b/lib/scp.sh
index f9daaea..968092c 100755
--- a/lib/scp.sh
+++ b/lib/scp.sh
@@ -20,9 +20,16 @@ function deploy_scp() {
       SCP_DEPLOY_PORT="22"
     fi
 
-    # Checkout production branch - note this function currently requires the
-    # --merge flag, this will need to be changed
-    gitChkProd
+    # Checkout production branch
+
+    if [[ -n "${PRODUCTION}" ]]; then
+      # Remove this requirement at some point
+      MERGE="1"
+      gitChkProd
+    else
+      error "Production branch must be defined"
+      return
+    fi
 
     # Todo: Add proper checks/fallbacks here
     TMP=$(<$SCP_DEPLOY_PASS)
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index 1f243e4..e159211 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -39,7 +39,21 @@ function wpPlugins() {
       acf_update
     fi
 
-    # Let's get to work
+    # First, check for for updates via composer
+    if [[ -f "${WORKPATH}/${APP}/composer.json" ]]; then
+      trace "Found composer.json, updating"
+      cd "${WORKPATH}"/"${APP}"; \
+      if [[ "${QUIET}" != "1" ]]; then
+        # Come back and get this path properly
+        /usr/local/bin/composer update &>> "${logFile}" &
+        spinner $!
+      else
+        /usr/local/bin/composer update &>> "${logFile}"
+      fi
+      cd "${WORKPATH}"/"${APP}${WPROOT}${WPAPP}"; \
+    fi
+
+    # Now, run the rest of the needed updates via wp-cli
     if [[ "${QUIET}" != "1" ]]; then
       "${WPCLI}"/wp plugin update --all --no-color &>> "${logFile}" &
       spinner $!

From b202d0a1a6c98015b02f08e69aaae52404beeeb2 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 19 Oct 2018 11:04:40 -0700
Subject: [PATCH 117/334] Removed cal from dependencies

---
 install/doinst.sh | 4 ++--
 lib/report.sh     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/install/doinst.sh b/install/doinst.sh
index 3eabcda..95b0e46 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -87,10 +87,10 @@ else
 fi
 
 # Declare dependencies
-dependencies=(awk cal cat curl echo eval git grep pkill printf read sed sleep tee tput)
+dependencies=(awk cat curl echo eval git grep pkill printf read sed sleep tee tput)
 
 # Declare optional stuff
-options=(gitchart gnuplot grunt npm scp sendmail ssh sshpass unzip wget wkhtmltopdf wp)
+options=(cal gitchart gnuplot grunt npm scp sendmail ssh sshpass unzip wget wkhtmltopdf wp)
 
 message=''
 fg_red="$(tput setaf 1)"
diff --git a/lib/report.sh b/lib/report.sh
index 0896cd1..838c8d1 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -12,6 +12,12 @@ read -r CURMTH CURYR PRVMTH PRVYR LASTDY <<< ""
 echo "${CURMTH} ${CURYR} ${PRVMTH} ${PRVYR} ${LASTDY}" > /dev/null
 
 function create_report() {
+
+  # Make sure we've got cal, or don't bother
+  hash cal 2>/dev/null || {
+    console "Creating reports requires the cal utility whichh cannot be found."; quietExit
+  }
+
   message_state="REPORT"
   htmlDir
 

From 0f9d29c4d905f82160ba4647d0de8a95a82f0843 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 23 Oct 2018 17:10:51 -0700
Subject: [PATCH 118/334] Little doodads

---
 etc/deploy-example.conf |  9 +--------
 lib/active-check.sh     |  2 +-
 lib/git.sh              |  2 +-
 lib/wp-plugins.sh       | 18 ++++++++++++++++++
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/etc/deploy-example.conf b/etc/deploy-example.conf
index 8dda96b..9f2bfa2 100755
--- a/etc/deploy-example.conf
+++ b/etc/deploy-example.conf
@@ -7,15 +7,12 @@
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-GLOBAL_VERSION="3.7.1"
+GLOBAL_VERSION="3.7.2"
 
 ###############################################################################
 # General Setup
 ###############################################################################
 
-# Clear screen on startup, when not running with --quiet or --verbose switch
-# CLEARSCREEN="{{CLEARSCREEN}}"
-
 # Set the work path. This is the directory where all your 
 # repos are stored, with no trailing slash
 # WORKPATH="{{WORKPATH}}"
@@ -53,10 +50,6 @@ GLOBAL_VERSION="3.7.1"
 # Wordpress updates. Set to "TRUE" to activate.
 # SMARTCOMMIT="{{SMARTCOMMIT}}"
 
-# If you want to see statistics about your recent git 
-# commits, set this value to exactly "TRUE"
-# GITSTATS="{{GITSTATS}}"
-
 # If dirty (yet to be committed) files exist in the repo, deploy will normally not halt
 # execution when running with the --automate flag. If you prefer to have the dirty files 
 # stashed and proceed with updates set the below value to TRUE. Files will be unstashed
diff --git a/lib/active-check.sh b/lib/active-check.sh
index 2742e75..b04ccee 100755
--- a/lib/active-check.sh
+++ b/lib/active-check.sh
@@ -11,7 +11,7 @@ trace "Loading activity checking"
 read -r active_files <<< ""
 echo "${active_files}" > /dev/null
 
-function active_check() { 
+function check_active() { 
   if [[ "${FORCE}" == "1" ]] && [[ "${UPGRADE}" == "1" ]] && [[ "${QUIET}" == "1" ]] && [[ "${ACTIVECHECK}" = "TRUE" ]]; then
     trace "Checking for active files"
     active_files=$(find "${WORKPATH}/${APP}" -mmin -"${CHECKTIME}" ! -path "${WORKPATH}/${APP}/public/app/wflogs" ! -path "${WORKPATH}/${APP}/.git/*" ! -path "${WORKPATH}/${APP}/.git")
diff --git a/lib/git.sh b/lib/git.sh
index 3cba08a..532cc6d 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -56,7 +56,7 @@ function gitStart() {
   fi
 
   # Check for active files
-  active_check
+  check_active
 
   # Try to clear out old git processes owned by this user, if they exist
   pkill -f git &>> /dev/null || true
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index e159211..0947a08 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -78,3 +78,21 @@ function wpPlugins() {
     info "Skipping plugin updates..."
   fi 
 }
+
+###############################################################################
+# add_plugin()
+#   Adds plugins to a Wordpress project, using either composer or wp-cli 
+#   depending on project setup 
+#
+# Arguments:
+#   [plugin]    Name of the plugin. Will only work if plugin is tracked in 
+#               the Wordpress plugin archive
+############################################################################### 
+function add_plugin() {
+  # User will be doing something like `deploy --add-plugin wp-job-manager` from 
+  # the shell
+  # If composer:
+  composer require wpackagist-plugin/wp-job-manager:*
+  # If no composer:
+  wp plugin install wp-job-manager
+}

From 0bce697ad2661d8400f83d487e848dfdcea4b550 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 23 Oct 2018 17:44:40 -0700
Subject: [PATCH 119/334] Decreased spam of verbose output

---
 CHANGELOG.md            |   1 +
 README.md               | 181 ++++++++++++++++++++--------------------
 deploy.sh               |  58 ++++++-------
 lib/active-check.sh     |   1 -
 lib/analytics.sh        |   1 -
 lib/approval.sh         |   3 +-
 lib/configure.sh        |   1 -
 lib/deployment.sh       |   3 +-
 lib/digest.sh           |   1 -
 lib/display-styles.sh   |   1 -
 lib/error-check.sh      |   1 -
 lib/git.sh              |   1 -
 lib/loader.sh           |   2 -
 lib/lock.sh             |   1 -
 lib/log-handling.sh     |   1 -
 lib/mail-log.sh         |   1 -
 lib/monitor.sh          |   1 -
 lib/package-manager.sh  |   1 -
 lib/permissions-fix.sh  |   1 -
 lib/post-integration.sh |   1 -
 lib/post-log.sh         |   1 -
 lib/process-html.sh     |   1 -
 lib/quit.sh             |   1 -
 lib/report.sh           |   1 -
 lib/scan.sh             |   1 -
 lib/server-check.sh     |   1 -
 lib/slack.sh            |   1 -
 lib/smart-commits.sh    |   1 -
 lib/statistics.sh       |   1 -
 lib/user-feedback.sh    |   1 -
 lib/utilities.sh        |   1 -
 lib/validate.sh         |   1 -
 lib/webhook.sh          |   1 -
 lib/wp.sh               |   1 -
 lib/yes-no.sh           |   1 -
 35 files changed, 123 insertions(+), 154 deletions(-)
 mode change 100755 => 100644 CHANGELOG.md
 mode change 100755 => 100644 README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100755
new mode 100644
index 9897288..c507621
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -257,3 +257,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 [3.3]: https://github.com/EMRL/deploy/compare/v3.1...v3.3
 [3.1]: https://github.com/EMRL/deploy/compare/v3.0...v3.1
 [3.0]: https://github.com/EMRL/deploy/commits/v3.0
+
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index c4e6409..ca027d8
--- a/README.md
+++ b/README.md
@@ -1,90 +1,91 @@
-# Deploy
-
-[![release](https://img.shields.io/badge/release-v3.7.2-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
-[![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
-
-`deploy` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
-
-[Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md)
-
-This script is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us.
-
-Please note that our documentation here is nearly useless, and there is quite a bit of setup involved in getting this running reliably. A full setup guide is coming soon™.
-
-## Startup Options
-
-```
-Usage: deploy [options] [target] ...
-
-Options:
-  -F, --force            Skip all user interaction, forces 'Yes' to all actions
-  -S, --skip-update      Skip any Wordpress core/plugin updates
-  -u, --update           If no available Wordpress updates, halt deployment
-  -U, --update-only      Deploy only Wordpresss plugin/core updates
-  -P, --publish          Publish current production code to live environment
-  -m, --merge            Force merge of branches
-  -c, --current          Deploy a project from current working directory          
-  -t, --time             Add time to project management integration
-  -V, --verbose          Output more process information to screen
-  -q, --quiet            Display minimal output on screen
-  -h, --help             Display this help and exit
-  -v, --version          Output version information and exit
-
-Other Options:
-  --automate             For unattended deployment via cron
-  --approve              Approve and deploy queued code changes
-  --deny                 Deny queued code changes
-  --build                Build project assets
-  --digest               Create and send weekly digest
-  --report               Create a monthly activity report
-  --no-check             Override active file and server checks
-  --stats                Generate project statistics pages
-  --invoice              Create an invoice
-  --strict               Any error will halt deployment completely
-  --debug                Run in debug mode
-  --unlock               Delete expired lock files
-  --repair               Repair a deployment after merge failure
-  --scan                 Scan production hosts for malware issues
-  --ssh-test             Validate SSH key setup
-  --email-test           Test email configuration
-  --slack-test           Test Slack integration
-  --post-test            Test webhook integration  
-  --analytics-test       Test Google Analytics authentication
-  --monitor-test         Test production server uptime and latency monitoring
-  --function-list        Output a list of all functions()
-  --variable-list        Output a project's declared variables
-```
-
-[![asciicast](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP.png)](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP?t=0)
-
-## How It Works
-
-`deploy` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. 
-
-`deploy` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
-
-## Installation
-
-`deploy` can be run from wherever you've installed it, but if you'd like it to be installed server-wide, follow the instructions below. 
-
-1. In the `deploy` directory, type `sudo ./install/doinst.sh` and enter your sudo password when/if asked
-2. That's it. By default `deploy` is installed to `/usr/local/bin/` and support files are installed to `/etc/deploy/`
-
-## Configuration
-
-Configuration is handled globally in the `etc/deploy.conf` file. Individual users also have their own settings in `~/.deployrc`
-
-Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/deploy/blob/master/etc/deploy.sh).
-
-## Slack
-
-For workgroups and teams that use it, `deploy` is able to integrate with Slack. You'll need to set up an "Incoming Webhook" custom integration on the Slack side to get this ready to roll. See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get going. Once you think you've got Slack configured, run `deploy --slack-test [project]` to test.
-
-## Autopilot
-
-`deploy --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/deploy/blob/master/etc/cron/deploy.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed.
-
-## Contact
-
-* 
-* 
+# Deploy
+
+[![release](https://img.shields.io/badge/release-v3.7.2-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
+[![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
+
+`deploy` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
+
+[Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md)
+
+This script is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us.
+
+Please note that our documentation here is nearly useless, and there is quite a bit of setup involved in getting this running reliably. A full setup guide is coming soon™.
+
+## Startup Options
+
+```
+Usage: deploy [options] [target] ...
+
+Options:
+  -F, --force            Skip all user interaction, forces 'Yes' to all actions
+  -S, --skip-update      Skip any Wordpress core/plugin updates
+  -u, --update           If no available Wordpress updates, halt deployment
+  -U, --update-only      Deploy only Wordpresss plugin/core updates
+  -P, --publish          Publish current production code to live environment
+  -m, --merge            Force merge of branches
+  -c, --current          Deploy a project from current working directory          
+  -t, --time             Add time to project management integration
+  -V, --verbose          Output more process information to screen
+  -q, --quiet            Display minimal output on screen
+  -h, --help             Display this help and exit
+  -v, --version          Output version information and exit
+
+Other Options:
+  --automate             For unattended deployment via cron
+  --approve              Approve and deploy queued code changes
+  --deny                 Deny queued code changes
+  --build                Build project assets
+  --digest               Create and send weekly digest
+  --report               Create a monthly activity report
+  --no-check             Override active file and server checks
+  --stats                Generate project statistics pages
+  --invoice              Create an invoice
+  --strict               Any error will halt deployment completely
+  --debug                Run in debug mode
+  --unlock               Delete expired lock files
+  --repair               Repair a deployment after merge failure
+  --scan                 Scan production hosts for malware issues
+  --ssh-test             Validate SSH key setup
+  --email-test           Test email configuration
+  --slack-test           Test Slack integration
+  --post-test            Test webhook integration  
+  --analytics-test       Test Google Analytics authentication
+  --monitor-test         Test production server uptime and latency monitoring
+  --function-list        Output a list of all functions()
+  --variable-list        Output a project's declared variables
+```
+
+[![asciicast](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP.png)](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP?t=0)
+
+## How It Works
+
+`deploy` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. 
+
+`deploy` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
+
+## Installation
+
+`deploy` can be run from wherever you've installed it, but if you'd like it to be installed server-wide, follow the instructions below. 
+
+1. In the `deploy` directory, type `sudo ./install/doinst.sh` and enter your sudo password when/if asked
+2. That's it. By default `deploy` is installed to `/usr/local/bin/` and support files are installed to `/etc/deploy/`
+
+## Configuration
+
+Configuration is handled globally in the `etc/deploy.conf` file. Individual users also have their own settings in `~/.deployrc`
+
+Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/deploy/blob/master/etc/deploy.sh).
+
+## Slack
+
+For workgroups and teams that use it, `deploy` is able to integrate with Slack. You'll need to set up an "Incoming Webhook" custom integration on the Slack side to get this ready to roll. See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get going. Once you think you've got Slack configured, run `deploy --slack-test [project]` to test.
+
+## Autopilot
+
+`deploy --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/deploy/blob/master/etc/cron/deploy.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed.
+
+## Contact
+
+* 
+* 
+
diff --git a/deploy.sh b/deploy.sh
index 5ea7815..53dd699 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -297,35 +297,6 @@ if [[ "${CURRENT}" != "1" ]] && [[ -z "${*}" ]]; then
   echo "Choose a valid project, or use the --current flag to deploy from the current directory."; exit 1
 fi
 
-# Fire up temporary log files. Consolidate this shit better someday, geez.
-# 
-# Crash and burn
-function log_fail() {
-  echo "Could not create temporary file, exiting."; exit 1
-}
-
-# Main log file
-logFile="/tmp/${APP}.log-$RANDOM.log"
-(umask 077 && touch "${logFile}") || log_fail
-wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail
-coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail
-
-# Start writing the logfile
-echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}"
-echo -e "Launching deploy${STARTUP}\n" >> "${logFile}"
-
-# More crappy tmp files
-postFile="/tmp/${APP}.wtf-${RANDOM}.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail
-trshFile="/tmp/${APP}.trsh-${RANDOM}.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail
-scanFile="/tmp/${APP}.scan-${RANDOM}.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail 
-statFile="/tmp/${APP}.stat-${RANDOM}.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail
-statDir="/tmp/${APP}.stat-${RANDOM}"; (umask 077 && mkdir "${statDir}" &> /dev/null) || log_fail
-avatarDir="/tmp/${APP}.avatar-${RANDOM}"; (umask 077 && mkdir "${avatarDir}" &> /dev/null) || log_fail
-urlFile="/tmp/${APP}.url-${RANDOM}.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail
-htmlFile="/tmp/${APP}.log-${RANDOM}.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail
-htmlEmail="/tmp/${APP}.email-${RANDOM}.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail
-clientEmail="/tmp/${APP}.shortemail-${RANDOM}.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail
-
 # Path of the script; I should flip this check to make it more useful
 if [ -d "/etc/deploy" ]; then
   deployPath="/etc/deploy"
@@ -381,6 +352,35 @@ else
   exit 1
 fi
 
+# Fire up temporary log files. Consolidate this shit better someday, geez.
+# 
+# Crash and burn
+function log_fail() {
+  echo "Could not create temporary file, exiting."; exit 1
+}
+
+# Main log file
+logFile="/tmp/${APP}.log-$RANDOM.log"
+(umask 077 && touch "${logFile}") || log_fail
+wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail
+coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail
+
+# Start writing the logfile
+echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}"
+echo -e "Launching deploy${STARTUP}\n" >> "${logFile}"
+
+# More crappy tmp files
+postFile="/tmp/${APP}.wtf-${RANDOM}.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail
+trshFile="/tmp/${APP}.trsh-${RANDOM}.log"; (umask 077 && touch "${trshFile}" &> /dev/null) || log_fail
+scanFile="/tmp/${APP}.scan-${RANDOM}.log"; (umask 077 && touch "${scanFile}" &> /dev/null) || log_fail 
+statFile="/tmp/${APP}.stat-${RANDOM}.log"; (umask 077 && touch "${statFile}" &> /dev/null) || log_fail
+statDir="/tmp/${APP}.stat-${RANDOM}"; (umask 077 && mkdir "${statDir}" &> /dev/null) || log_fail
+avatarDir="/tmp/${APP}.avatar-${RANDOM}"; (umask 077 && mkdir "${avatarDir}" &> /dev/null) || log_fail
+urlFile="/tmp/${APP}.url-${RANDOM}.log"; (umask 077 && touch "${urlFile}" &> /dev/null) || log_fail
+htmlFile="/tmp/${APP}.log-${RANDOM}.html"; (umask 077 && touch "${htmlFile}" &> /dev/null) || log_fail
+htmlEmail="/tmp/${APP}.email-${RANDOM}.html"; (umask 077 && touch "${htmlEmail}" &> /dev/null) || log_fail
+clientEmail="/tmp/${APP}.shortemail-${RANDOM}.html"; (umask 077 && touch "${clientEmail}" &> /dev/null) || log_fail
+
 # Function list
 if [[ "${FUNCTIONLIST}" == "1" ]]; then
   compgen -A function | more; quickExit
diff --git a/lib/active-check.sh b/lib/active-check.sh
index b04ccee..0d5f6b3 100755
--- a/lib/active-check.sh
+++ b/lib/active-check.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Checks for recently active project files that may cause deployment issues
 ###############################################################################
-trace "Loading activity checking"
 
 # Initialize variables
 read -r active_files <<< ""
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 186d9de..05e73ed 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -10,7 +10,6 @@
 # 
 # https://developers.google.com/analytics/devguides/reporting/core/dimsmets for all the metrics
 ###############################################################################
-trace "Loading analytics functions"   
 
 # Initialize variables
 read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
diff --git a/lib/approval.sh b/lib/approval.sh
index 05020da..ccc968d 100755
--- a/lib/approval.sh
+++ b/lib/approval.sh
@@ -4,8 +4,7 @@
 #
 ###############################################################################
 # Handles deployment approval queue
-###############################################################################
-trace "Loading approval functions"   
+############################################################################### 
 
 # Initialize variables
 read -r QUEUED <<< ""
diff --git a/lib/configure.sh b/lib/configure.sh
index 593ef93..22f75d3 100755
--- a/lib/configure.sh
+++ b/lib/configure.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Global, user, and project configuration
 ###############################################################################
-trace "Loading configuration"
 
 # Initialize variables
 read -r value <<< ""
diff --git a/lib/deployment.sh b/lib/deployment.sh
index c6a60da..5c34239 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -4,8 +4,7 @@
 #
 ###############################################################################
 # Handles deployment-related tasks
-###############################################################################
-trace "Loading deployment functions"   
+############################################################################### 
 
 # Initializa needed variables
 read -r start_deploy <<< ""
diff --git a/lib/digest.sh b/lib/digest.sh
index 49f12d9..b33f597 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles parsing and creating logs
 ###############################################################################
-trace "Loading digest handling"
 
 # Initializa needed variables
 read -r AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP \
diff --git a/lib/display-styles.sh b/lib/display-styles.sh
index 26695e6..d1025b2 100755
--- a/lib/display-styles.sh
+++ b/lib/display-styles.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles text colors and other screen output
 ############################################################################### 
-trace "Loading console styles"
 
 # Define color codes
 black='\E[30;47m'
diff --git a/lib/error-check.sh b/lib/error-check.sh
index 26f3132..ced7658 100755
--- a/lib/error-check.sh
+++ b/lib/error-check.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles various exit code checking
 ###############################################################################
-trace "Loading error checking"
 
 # Try to get exit/error code, with a hard stop on fail
 function error_check() {
diff --git a/lib/git.sh b/lib/git.sh
index 532cc6d..713e602 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles git related processes
 ###############################################################################
-trace "Loading git functions"
 
 # Initialize variables
 read -r FULLUSER <<< ""
diff --git a/lib/loader.sh b/lib/loader.sh
index 5d1c57a..9493694 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -27,8 +27,6 @@ fi
 #               Checking database... OK in the logs
 #   notime      Output trace with no timestamp, generally used after a 
 #               `trace status "blahblah"`  
-# Returns:  
-#   None
 ###############################################################################      
 function trace() {
   if [[ "${VERBOSE}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then
diff --git a/lib/lock.sh b/lib/lock.sh
index cab9c3b..2166f18 100755
--- a/lib/lock.sh
+++ b/lib/lock.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Locks deployment process
 ###############################################################################
-trace "Locking process"
 
 # Define lock file location
 LOCK_FILE="/tmp/$APP.lock"
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index 4a12163..0e7c4e9 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles parsing and creating logs
 ###############################################################################
-trace "Loading log handling"
 
 function makeLog() {
   # Clean up stuff that is most likely there
diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index fd68197..e4d3f47 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Mail handling
 ###############################################################################
-trace "Loading mail handler"
 
 function mailLog() {
   # Only send email if a commit has been made, an approval is required, or there has been an error
diff --git a/lib/monitor.sh b/lib/monitor.sh
index 299b07c..ad5006d 100755
--- a/lib/monitor.sh
+++ b/lib/monitor.sh
@@ -6,7 +6,6 @@
 # Uses PHP Server Monitor and an add-on API to retrieve a production server's 
 # uptime and latency
 ###############################################################################
-trace "Loading server monitoring"
 
 function server_monitor() {
   # Don't bother unless all the needed variables are declared
diff --git a/lib/package-manager.sh b/lib/package-manager.sh
index 644fe02..c20dcb6 100755
--- a/lib/package-manager.sh
+++ b/lib/package-manager.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Checks if project uses node.js or grunt, and builds assets if needed. 
 ###############################################################################
-trace "Loading build management"
 
 # Initialize variables
 read -r deploy_config SKIP_BUILD npm_json <<< ""
diff --git a/lib/permissions-fix.sh b/lib/permissions-fix.sh
index 2ac444f..f53ab5c 100755
--- a/lib/permissions-fix.sh
+++ b/lib/permissions-fix.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Repairs potential permission issues before deployment
 ###############################################################################
-trace "Loading permissions fixes"
 
 function permFix() {
   if [[ "${FIXPERMISSIONS}" == "TRUE" ]]; then
diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index a2ebd40..1bc445f 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles integration with other services
 ###############################################################################
-trace "Loading integration"
 
 # Compile commit message with other stuff for integration
 function build_log() {
diff --git a/lib/post-log.sh b/lib/post-log.sh
index 8e0e97e..f46c8d7 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles posting logs to localhost as well as remote hosts
 ###############################################################################
-trace "Loading post functions"
 
 # Initialize variables
 read -r SCPPORT <<< ""
diff --git a/lib/process-html.sh b/lib/process-html.sh
index 4e9eb8d..b0d651e 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Filters through html templates to inject our project's variables
 ###############################################################################
-trace "Loading html handling"
 
 # Initialize variables 
 read -r DEFAULTC PRIMARYC SECONDARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID \
diff --git a/lib/quit.sh b/lib/quit.sh
index 2e92e2b..6a71e53 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles exiting the program
 ###############################################################################
-trace "Loading exit states"
 
 # User-requested exit
 function userExit() {
diff --git a/lib/report.sh b/lib/report.sh
index 838c8d1..f33227e 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles parsing and creating monthly work reports
 ###############################################################################
-trace "Loading report handling"
 
 # Initialize variables
 read -r CURMTH CURYR PRVMTH PRVYR LASTDY <<< ""
diff --git a/lib/scan.sh b/lib/scan.sh
index 391840c..4a6edaf 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Integrates with nikto to run malware and security scans 
 ###############################################################################
-trace "Loading malware scanning utilities"
 
 # Initialize variables
 read -r NIKTO NIKTO_CONFIG NIKTO_PROXY scan_html SCAN_RESULT SCAN_MSG \
diff --git a/lib/server-check.sh b/lib/server-check.sh
index ab9e09e..8372913 100755
--- a/lib/server-check.sh
+++ b/lib/server-check.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Check to see if production environment is online and running web server
 ###############################################################################
-trace "Loading server checks"
 
 function server_check() {
   if [[ "${SERVERCHECK}" == "TRUE" ]]; then
diff --git a/lib/slack.sh b/lib/slack.sh
index 5ad3331..f3bb37d 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Integration with Slack
 ###############################################################################
-trace "Loading Slack integration"
 
 function slackPost () {
   trace "${DIGESTSLACK}"
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index 8fb32cf..fa6d6e2 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Tries to create "Smart Commit" messages based on parsing output from wp-cli
 ###############################################################################
-trace "Loading smart commit functions"
 
 # Constructing smart *cough* commit messages
 function smrtCommit() {
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 5c95ada..121936a 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Generate HTML statistics pages
 ###############################################################################
-trace "Loading statistics functions"
 
 # Initialize variables
 read -r DB_API_TOKEN DB_BACKUP_PATH LAST_BACKUP BACKUP_STATUS CODE_STATS \
diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh
index 1b704dd..252c3ef 100755
--- a/lib/user-feedback.sh
+++ b/lib/user-feedback.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles console feedback components
 ###############################################################################
-trace "Loading interface"
 
 # Initialize variables 
 read -r pid delay spinstr temp <<< ""
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 77ddc20..3164fbd 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Handles various setup, logging, and option flags
 ###############################################################################
-trace "Loading utilities"
 
 # Initialize variables
 read -r integer_check <<< ""
diff --git a/lib/validate.sh b/lib/validate.sh
index c54b77d..026df0b 100755
--- a/lib/validate.sh
+++ b/lib/validate.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Check project's variables for special characters that may cause issues
 ###############################################################################
-trace "Loading validation tests"
 
 function validate_conf() {
   array=( "${PROJNAME}" "${PROJCLIENT}" )
diff --git a/lib/webhook.sh b/lib/webhook.sh
index 22fb329..c29e1e7 100755
--- a/lib/webhook.sh
+++ b/lib/webhook.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Webhook POST functionality
 ###############################################################################
-trace "Loading webhooks"
 
 function postWebhook {
   if [[ -n "${POSTURL}" ]]; then
diff --git a/lib/wp.sh b/lib/wp.sh
index 5b698ce..0525770 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # Checks for Wordpress upgrades, and executes upgrades if needed
 ###############################################################################
-trace "Loading Wordpress functions"
 
 function wpPkg() {
   # Make sure we are allowed to update
diff --git a/lib/yes-no.sh b/lib/yes-no.sh
index 0284dd9..7935e0b 100755
--- a/lib/yes-no.sh
+++ b/lib/yes-no.sh
@@ -5,7 +5,6 @@
 ###############################################################################
 # A simple Yes/No function
 ###############################################################################
-trace "Loading input functions"
 
 function yesno() {
   local ans

From fd0923f1b001c7ba58ced39a755cffcdf6b75502 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 23 Oct 2018 19:14:32 -0700
Subject: [PATCH 120/334] Configuration work

---
 deploy.sh        | 17 +++++++++++++++++
 lib/configure.sh | 13 ++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 53dd699..f763091 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -450,6 +450,23 @@ if [[ -n "${project_config}" ]]; then
   # shellcheck disable=1090 
   source "${project_config}"
   APPRC="1"
+else
+  # Make sure app directory is writable
+  if [[ -w "${WORKPATH}/${APP}" ]]; then
+    empty_line; info "Project configuration not found, creating."; sleep 2
+    cp "${deployPath}"/deploy.sh "${WORKPATH}/${APP}/.deploy.sh"
+    APPRC="${WORKPATH}/${APP}/.deploy.sh"
+    if [[ -x "$(command -v nano)" ]]; then
+      if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then
+        nano "${APPRC}"
+        clear; sleep 1
+        $(basename ${APP}) && quietExit
+        # exec "/usr/local/bin/deploy ${STARTUP} ${APP}"
+      fi
+    fi
+    info "You can change configuration later by editing ${APPRC}"
+    quietExit
+  fi
 fi
 
 # Make sure variables are set up correctly
diff --git a/lib/configure.sh b/lib/configure.sh
index 22f75d3..becf888 100755
--- a/lib/configure.sh
+++ b/lib/configure.sh
@@ -7,19 +7,23 @@
 ###############################################################################
 
 # Initialize variables
-read -r value <<< ""
-echo "${value}" > /dev/null
+read -r value remote_origin config_file <<< ""
+echo "${value} ${remote_origin} ${config_file}" > /dev/null
 
 function configure_project() {
   empty_line
   arg="${PROJNAME}"; read -rp "Project name:" -e -i "${arg}" value; set_value "${value}"
   arg="${PROJCLIENT}"; read -rp "Client name:" -e -i "${arg}" value; set_value "${value}"
+  remote_origin="$(git ls-remote --get-url)"
+  REPOHOST=$(echo ${remote_origin%/*})
+  arg="${REPOHOST}"; read -rp "Repo root URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}"
   arg="${DEVURL}"; read -rp "Staging URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}"
   arg="${PRODURL}"; read -rp "Production URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}"
 }
 
 function configure_user() {
   empty_line
+  config_file="$HOME/.deployrc"
   #target_file="/tmp/.deployrc"
   #cp "${deployPath}"/.deployrc "${target_file}"
   arg="CLEARSCREEN"
@@ -52,12 +56,11 @@ function configure_global() {
 function set_value() {
   value="$1"
   sed -i -e "s^{{${arg}}}^${value}^g" \
-    -e "s^# ${arg}^${arg}^g" \
-    ~/.deployrc      
+    -e "s^# ${arg}^${arg}^g" "${config_file}"      
 }
 
 function unset_value() {
-  sed -i -e "s^{{${arg}}}^FALSE^g" ~/.deployrc      
+  sed -i -e "s^{{${arg}}}^FALSE^g" "${config_file}"      
 }
 
 function clear_user() {

From c65423a039cbd4ce03f961967e070f7ff94edc22 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 23 Oct 2018 19:58:22 -0700
Subject: [PATCH 121/334] Starting name change

---
 .gitignore                                    |  1 +
 ...{deploy.cron.example => stir.cron.example} |  0
 etc/{deploy-example.conf => stir-global.conf} |  0
 etc/{deploy.sh => stir-project.sh}            |  0
 etc/{.deployrc => stir-user.rc}               |  0
 install/doinst.sh                             | 36 +++++-----
 lib/configure.sh                              |  4 +-
 lib/env-check.sh                              | 44 ++++++------
 deploy.sh => stir.sh                          | 69 ++++++++++---------
 9 files changed, 77 insertions(+), 77 deletions(-)
 rename etc/cron/{deploy.cron.example => stir.cron.example} (100%)
 rename etc/{deploy-example.conf => stir-global.conf} (100%)
 rename etc/{deploy.sh => stir-project.sh} (100%)
 rename etc/{.deployrc => stir-user.rc} (100%)
 rename deploy.sh => stir.sh (93%)

diff --git a/.gitignore b/.gitignore
index 9c3bcee..dfe7923 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 /*.sublime-workspace
 .DS_Store
 .deploy.sh
+.stir.sh
 theme.conf
 *.bak
\ No newline at end of file
diff --git a/etc/cron/deploy.cron.example b/etc/cron/stir.cron.example
similarity index 100%
rename from etc/cron/deploy.cron.example
rename to etc/cron/stir.cron.example
diff --git a/etc/deploy-example.conf b/etc/stir-global.conf
similarity index 100%
rename from etc/deploy-example.conf
rename to etc/stir-global.conf
diff --git a/etc/deploy.sh b/etc/stir-project.sh
similarity index 100%
rename from etc/deploy.sh
rename to etc/stir-project.sh
diff --git a/etc/.deployrc b/etc/stir-user.rc
similarity index 100%
rename from etc/.deployrc
rename to etc/stir-user.rc
diff --git a/install/doinst.sh b/install/doinst.sh
index 95b0e46..8638a0b 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -3,9 +3,9 @@
 # doinst.sh
 #
 ###############################################################################
-# Installs and configures deploy 
+# Installation and configuration
 #
-# https://github.com/EMRL/deploy
+# https://github.com/EMRL/stir
 ###############################################################################
 
 # Set mode
@@ -72,7 +72,7 @@ function check_program() {
 function error_check() {
   EXITCODE=$?; 
   if [[ "${EXITCODE}" != "0" ]]; then 
-    echo "Error ${EXITCODE}: deploy not installed."
+    echo "Error ${EXITCODE}: stir not installed."
     exit "${EXITCODE}"
   fi
 }
@@ -128,30 +128,30 @@ fi
 
 # Start the install
 echo; sleep 1
-if [[ ! -d /etc/deploy ]] || [[ ! -d /etc/deploy/lib ]] || [[ ! -d /etc/deploy/crontab ]]; then
+if [[ ! -d /etc/stir ]] || [[ ! -d /etc/stir/lib ]] || [[ ! -d /etc/stir/crontab ]]; then
   echo "Creating directories"
-  if [[ ! -d /etc/deploy ]]; then
-    sudo mkdir /etc/deploy; error_check
+  if [[ ! -d /etc/stir ]]; then
+    sudo mkdir /etc/stir; error_check
   fi
 
-  if [[ ! -d /etc/deploy/lib ]]; then
-    sudo mkdir /etc/deploy/lib; error_check
+  if [[ ! -d /etc/stir/lib ]]; then
+    sudo mkdir /etc/stir/lib; error_check
   fi
 
-  if [[ ! -d /etc/deploy/lib/crontab ]]; then
-    sudo mkdir /etc/deploy/lib/crontab; error_check
+  if [[ ! -d /etc/stir/lib/crontab ]]; then
+    sudo mkdir /etc/stir/lib/crontab; error_check
   fi
 fi
 
 echo "Installing configuration files"
-sudo cp -R etc/* /etc/deploy; error_check
-sudo cp etc/.deployrc /etc/deploy; error_check
+sudo cp -R etc/* /etc/stir; error_check
+sudo cp etc/stir-user.rc /etc/stir; error_check
 
-if [[ ! -f /etc/deploy/deploy.conf ]]; then
-  cp /etc/deploy/deploy-example.conf /etc/deploy/deploy.conf; error_check
+if [[ ! -f /etc/stir/stir.conf ]]; then
+  cp /etc/stir/stir-global.conf /etc/stir/stir.conf; error_check
 fi
 
-cp -R lib/* /etc/deploy/lib || error_check
-cp deploy.sh /usr/local/bin/deploy || error_check
-sudo chmod 755 /usr/local/bin/deploy || error_check
-echo "Successfully installed, try typing 'deploy' for help."
+cp -R lib/* /etc/stir/lib || error_check
+cp stir.sh /usr/local/bin/stir || error_check
+sudo chmod 755 /usr/local/bin/stir || error_check
+echo "Successfully installed, try typing 'stir' for help."
diff --git a/lib/configure.sh b/lib/configure.sh
index becf888..4e9ffc5 100755
--- a/lib/configure.sh
+++ b/lib/configure.sh
@@ -23,9 +23,7 @@ function configure_project() {
 
 function configure_user() {
   empty_line
-  config_file="$HOME/.deployrc"
-  #target_file="/tmp/.deployrc"
-  #cp "${deployPath}"/.deployrc "${target_file}"
+  config_file="$HOME/.stirrc"
   arg="CLEARSCREEN"
   if yesno --default yes "Clear screen on startup? [Y/n] "; then
     set_value TRUE
diff --git a/lib/env-check.sh b/lib/env-check.sh
index ff4f2db..43a64c3 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -26,13 +26,13 @@ function env_check() {
     local_version="${VERSION//-*}"
     
     # Compare version numbers
-    local_version="${GLOBAL_VERSION}"; source "${deployPath}"/deploy-example.conf
+    local_version="${GLOBAL_VERSION}"; source "${deployPath}"/stir-global.conf
     [[ "${GLOBAL_VERSION}" != "${local_version}" ]] && update_global="1";
     
-    local_version="${USER_VERSION}"; source "${deployPath}"/.deployrc
+    local_version="${USER_VERSION}"; source "${deployPath}"/stir-user.rc
     [[ "${USER_VERSION}" != "${local_version}" ]] && update_user="1";
     
-    local_version="${PROJECT_VERSION}"; source "${deployPath}"/deploy.sh 
+    local_version="${PROJECT_VERSION}"; source "${deployPath}"/stir-project.sh 
     [[ "${PROJECT_VERSION}" != "${local_version}" ]] && update_project="1"
 
     if [[ "${update_global}" == "1" ]] || [[ "${update_user}" == "1" ]] || [[ "${update_project}" == "1" ]]; then
@@ -40,8 +40,8 @@ function env_check() {
     fi
 
     # Reload environment variables, from global > user > project
-    source "${deployPath}"/deploy.conf
-    source ~/.deployrc
+    source "${deployPath}"/stir.conf
+    source ~/.stirrc
     source "${project_config}"
 
     # Restore workpath value
@@ -69,7 +69,7 @@ function update_config() {
 }
 
 function update_global() {
-  info "Updating ${deployPath}/deploy.conf..."
+  info "Updating ${deployPath}/stir.conf..."
   env_settings=(CLEARSCREEN WORKPATH CONFIGDIR SERVERCHECK ACTIVECHECK \
     CHECKTIME REPOHOST SMARTCOMMIT GITSTATS STASH GARBAGE WPCLI WFCHECK \
     FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP FIXINDEX \
@@ -81,52 +81,52 @@ function update_global() {
 
   if [[ ! -w "${deployPath}" ]]; then
     info "Requesting sudo access..."
-    sudo cp "${deployPath}"/deploy.conf "${deployPath}"/deploy.conf.bak
+    sudo cp "${deployPath}"/stir.conf "${deployPath}"/stir.conf.bak
   else
-    cp "${deployPath}"/deploy.conf "${deployPath}"/deploy.conf.bak
+    cp "${deployPath}"/stir.conf "${deployPath}"/stir.conf.bak
   fi
-  info "Global configuration backup created at ${deployPath}/deploy.conf.bak"
+  info "Global configuration backup created at ${deployPath}/stir.conf.bak"
   
-  cp "${deployPath}"/deploy-example.conf "${trshFile}"
+  cp "${deployPath}"/stir-global.conf "${trshFile}"
 
   # Reload global values
-  source "${deployPath}"/deploy.conf
+  source "${deployPath}"/stir.conf
   
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
-    current_setting=$(grep "^${i}=" "${deployPath}"/deploy.conf.bak)
+    current_setting=$(grep "^${i}=" "${deployPath}"/stir.conf.bak)
     insert_values
   done
 
   # Install new files
   env_cleanup
   if [[ ! -w "${deployPath}" ]]; then
-    sudo cp "${trshFile}" "${deployPath}"/deploy.conf
+    sudo cp "${trshFile}" "${deployPath}"/stir.conf
   else
-    cp "${trshFile}" "${deployPath}"/deploy.conf
+    cp "${trshFile}" "${deployPath}"/stir.conf
   fi
 }
 
 function update_user() {
-  info "Updating ~/.deployrc..."
+  info "Updating ~/.stirrc..."
   env_settings=(CLEARSCREEN VERBOSE GITSTATS)
   
-  info "User configuration backup created at ~/.deployrc.bak"
-  cp ~/.deployrc ~/.deployrc.bak
-  cp "${deployPath}"/.deployrc "${trshFile}"
+  info "User configuration backup created at ~/.stirrc.bak"
+  cp ~/.stirrc ~/.stirrc.bak
+  cp "${deployPath}"/.stirrc "${trshFile}"
 
   # Reload user values
-  source ~/.deployrc
+  source ~/.stirrc
 
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
-    current_setting=$(grep "^${i}=" ~/.deployrc)
+    current_setting=$(grep "^${i}=" ~/.stirrc)
     insert_values
   done
 
   # Install new files
   env_cleanup
-  cp "${trshFile}" ~/.deployrc
+  cp "${trshFile}" ~/.stirrc
 }
 
 function update_project() { 
@@ -147,7 +147,7 @@ function update_project() {
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
-  cp "${deployPath}"/deploy.sh "${trshFile}"
+  cp "${deployPath}"/stir.sh "${trshFile}"
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
     current_setting=$(grep "^${i}=" "${project_config}")
diff --git a/deploy.sh b/stir.sh
similarity index 93%
rename from deploy.sh
rename to stir.sh
index f763091..dda10c5 100755
--- a/deploy.sh
+++ b/stir.sh
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 #
-# deploy.sh
+# stir.sh
 #
 ###############################################################################
-# A shell script designed to speed up and automate deployment of (primarily) 
-# Wordpress websites, while integrating with third-party communication tools.
+# A shell script designed to speed up and automate management and deployment of
+# (primarily) Wordpress websites, while integrating with third-party 
+# communication tools.
 #
-# https://github.com/EMRL/deploy
+# https://github.com/EMRL/stir
 ###############################################################################
 
 IFS=$'\n\t'
@@ -88,7 +89,8 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \
   STASH MAILPATH REQUIREAPPROVAL ADDTIME SCPPORT TASKUSER CLIENTID \
   CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \
   PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \
-  INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE <<< ""
+  INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE \
+  NOTIFYCLIENT <<< ""
 echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} 
   ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} 
   ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} 
@@ -104,7 +106,8 @@ echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI}
   ${ADDTIME} ${TASKUSER} ${SCPPORT} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI}
   ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} 
   ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING} 
-  ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION} ${TERSE}" > /dev/null
+  ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION} ${TERSE} 
+  ${NOTIFYCLIENT}" > /dev/null
 # Internal variables
 read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \
   urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \
@@ -136,7 +139,7 @@ echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile
 
 # Display command options
 function flags() {
-  echo -n "Usage: deploy [options] [target] ...
+  echo -n "Usage: stir [options] [target] ...
 
 Options:
   -F, --force            Skip all user interaction, forces 'Yes' to all actions
@@ -153,7 +156,7 @@ Options:
   -v, --version          Output version information and exit
 
 Other Options:
-  --automate             For unattended deployment via cron
+  --automate             For unattended execution via cron
   --approve              Approve and deploy queued code changes
   --deny                 Deny queued code changes
   --build                Build project assets
@@ -176,7 +179,7 @@ Other Options:
   --function-list        Output a list of all functions()
   --variable-list        Output a project's declared variables
 
-More information at https://github.com/EMRL/deploy
+More information at https://github.com/EMRL/stir
 "
 }
 
@@ -298,15 +301,15 @@ if [[ "${CURRENT}" != "1" ]] && [[ -z "${*}" ]]; then
 fi
 
 # Path of the script; I should flip this check to make it more useful
-if [ -d "/etc/deploy" ]; then
-  deployPath="/etc/deploy"
+if [ -d "/etc/stir" ]; then
+  deployPath="/etc/stir"
 else
   deployPath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 fi
 
 # Load external configuration & functions
 libLocation="${deployPath}/lib/loader.sh"
-etcLocation="${deployPath}/deploy.conf"
+etcLocation="${deployPath}/stir.conf"
 
 # System wide configuration files
 if [[ -f "${etcLocation}" ]]; then
@@ -338,9 +341,9 @@ if [[ "${CURRENT}" != "1" ]]; then
 fi
 
 # Load per-user configuration, if it exists
-if [[ -r ~/.deployrc ]]; then
+if [[ -r ~/.stirrc ]]; then
   # shellcheck disable=1090
-  source ~/.deployrc; USERRC=1
+  source ~/.stirrc; USERRC=1
 fi
 
 # Load libraries, or die
@@ -367,7 +370,7 @@ coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /d
 
 # Start writing the logfile
 echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}"
-echo -e "Launching deploy${STARTUP}\n" >> "${logFile}"
+echo -e "Launching stir${STARTUP}\n" >> "${logFile}"
 
 # More crappy tmp files
 postFile="/tmp/${APP}.wtf-${RANDOM}.log"; (umask 077 && touch "${postFile}" &> /dev/null) || log_fail
@@ -401,45 +404,44 @@ fi
 # Does a user configuration exit?
 if [[ "${USERRC}" == "1" ]]; then
   if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading user configuration from ~/.deployrc"
+    trace "Loading user configuration from ~/.stirrc"
   fi
 else
   trace "User configuration not found, creating"
-  cp "${deployPath}"/.deployrc ~/.deployrc
-  console "User configuration file missing, creating ~/.deployrc"
+  cp "${deployPath}"/.stirrc ~/.stirrc
+  console "User configuration file missing, creating ~/.stirrc"
   if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then
-    # nano ~/.deployrc
     configure_user; sleep 1
     console "Loading user configuration."
     # shellcheck source=/dev/null
-    source ~/.deployrc
+    source ~/.stirrc
     # quickExit
   else
-    info "You can change configuration later by editing ~/.deployrc"
+    info "You can change configuration later by editing ~/.stirrc"
     clear_user
   fi
 fi
 
 # Load per-project configuration, if it exists
-if [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh" ]]; then
+if [[ -n "${CONFIGDIR}" ]] && [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/stir.sh" ]]; then
   if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading project configuration from ${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh"
+    trace "Loading project configuration from ${WORKPATH}/${APP}/${CONFIGDIR}/stir.sh"
   fi
-  project_config="${WORKPATH}/${APP}/${CONFIGDIR}/deploy.sh"
+  project_config="${WORKPATH}/${APP}/${CONFIGDIR}/stir.sh"
   # Fallback to configuration file in the root directory if it exists
-elif [[ -f "${WORKPATH}/${APP}/.deploy.sh" ]]; then
+elif [[ -f "${WORKPATH}/${APP}/.stir.sh" ]]; then
   if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading project configuration from ${WORKPATH}/${APP}/.deploy.sh"
+    trace "Loading project configuration from ${WORKPATH}/${APP}/.stir.sh"
   fi
-  project_config="${WORKPATH}/${APP}/.deploy.sh"
+  project_config="${WORKPATH}/${APP}/.stir.sh"
   # Zero out the global configdir variable
   CONFIGDIR=""
-elif [[ -f "${WORKPATH}/${APP}/deploy.sh" ]]; then
+elif [[ -f "${WORKPATH}/${APP}/stir.sh" ]]; then
   if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading project configuration from ${WORKPATH}/${APP}/deploy.sh"
+    trace "Loading project configuration from ${WORKPATH}/${APP}/stir.sh"
   fi
   # shellcheck disable=1090
-  project_config="${WORKPATH}/${APP}/deploy.sh"
+  project_config="${WORKPATH}/${APP}/stir.sh"
   # Zero out the global configdir variable
   CONFIGDIR=""
 else
@@ -454,14 +456,13 @@ else
   # Make sure app directory is writable
   if [[ -w "${WORKPATH}/${APP}" ]]; then
     empty_line; info "Project configuration not found, creating."; sleep 2
-    cp "${deployPath}"/deploy.sh "${WORKPATH}/${APP}/.deploy.sh"
-    APPRC="${WORKPATH}/${APP}/.deploy.sh"
+    cp "${deployPath}"/deploy.sh "${WORKPATH}/${APP}/.stir.sh"
+    APPRC="${WORKPATH}/${APP}/.stir.sh"
     if [[ -x "$(command -v nano)" ]]; then
       if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then
         nano "${APPRC}"
         clear; sleep 1
         $(basename ${APP}) && quietExit
-        # exec "/usr/local/bin/deploy ${STARTUP} ${APP}"
       fi
     fi
     info "You can change configuration later by editing ${APPRC}"
@@ -607,7 +608,7 @@ if [[ "${MERGE}" == "1" ]] && [[ -z "${PRODUCTION}" ]]; then
   quietExit
 fi
 
-# Execute the deploy process
+# Execute the main process
 main
 
 # All done

From 69353c0fc4b35735c6d346ff4f5794ba75b45bb1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 23 Oct 2018 20:33:08 -0700
Subject: [PATCH 122/334] More name change work

---
 .travis.yml          |  2 +-
 lib/configure.sh     |  5 +++--
 lib/env-check.sh     |  2 +-
 lib/mail-log.sh      |  8 ++++----
 lib/release-check.sh |  4 ++--
 lib/slack.sh         |  2 +-
 lib/webhook.sh       |  2 +-
 stir.sh              | 23 ++++-------------------
 8 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 717c107..789d832 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,4 +9,4 @@ script:
     - bash test/test.sh
     - bash test/extended.sh
     - sudo bash install/doinst.sh
-    - bash /usr/local/bin/deploy --version
+    - bash /usr/local/bin/stir --version
diff --git a/lib/configure.sh b/lib/configure.sh
index 4e9ffc5..84c178b 100755
--- a/lib/configure.sh
+++ b/lib/configure.sh
@@ -12,8 +12,9 @@ echo "${value} ${remote_origin} ${config_file}" > /dev/null
 
 function configure_project() {
   empty_line
-  arg="${PROJNAME}"; read -rp "Project name:" -e -i "${arg}" value; set_value "${value}"
-  arg="${PROJCLIENT}"; read -rp "Client name:" -e -i "${arg}" value; set_value "${value}"
+  config_file="${APPRC}"
+  arg="${PROJNAME}"; read -rp "Project name:" -e -i "${arg} " value; set_value "${value}"
+  arg="${PROJCLIENT}"; read -rp "Client name:" -e -i "${arg} " value; set_value "${value}"
   remote_origin="$(git ls-remote --get-url)"
   REPOHOST=$(echo ${remote_origin%/*})
   arg="${REPOHOST}"; read -rp "Repo root URL (including http:// or https://)" -e -i "${arg}" value; set_value "${value}"
diff --git a/lib/env-check.sh b/lib/env-check.sh
index 43a64c3..c7fb6f2 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -113,7 +113,7 @@ function update_user() {
   
   info "User configuration backup created at ~/.stirrc.bak"
   cp ~/.stirrc ~/.stirrc.bak
-  cp "${deployPath}"/.stirrc "${trshFile}"
+  cp "${deployPath}"/.stir-user.rc "${trshFile}"
 
   # Reload user values
   source ~/.stirrc
diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index e4d3f47..b802ae0 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -86,7 +86,7 @@ function email_test() {
     echo "Subject: [TESTING] ${SUBJECT} - ${APP}"
     echo "Content-Type: text/html"
     echo
-    echo "This is a test HTML email from deploy ${VERSION}.
                          "
+    echo "This is a test HTML email from stir ${VERSION}.
                          "
     echo "Current user is ${DEV}

                          ";
     echo
     echo "Project Information
                          "
@@ -225,7 +225,7 @@ function email_test() {
     echo "Subject: [TESTING] ${SUBJECT} - ${APP}"
     echo "Content-Type: text/plain"
     echo
-    echo "This is a test TEXT email from deploy ${VERSION} (https://github.com/EMRL/deploy/)"
+    echo "This is a test TEXT email from stir ${VERSION} (https://github.com/EMRL/stir/)"
     echo "Current user is ${DEV}";
     echo
     echo "Project Information"
@@ -384,8 +384,8 @@ function email_test() {
       echo "Subject: [TESTING] ${SUBJECT} - ${APP}"
       echo "Content-Type: text/plain"
       echo
-      echo "This is a test email integration from deploy ${VERSION}"
-      echo "(https://github.com/EMRL/deploy/)"
+      echo "This is a test email integration from stir ${VERSION}"
+      echo "(https://github.com/EMRL/stir/)"
       echo
       [[ -n "${PROJNAME}" ]] && echo "Name: ${PROJNAME}"
       [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}"
diff --git a/lib/release-check.sh b/lib/release-check.sh
index dbba475..6a6ad58 100755
--- a/lib/release-check.sh
+++ b/lib/release-check.sh
@@ -14,7 +14,7 @@ function release_check() {
   # Only check for a newer release when someone is at the console
   if [[ "${FORCE}" != "1" ]]; then
     # Get the release tag
-    trace "Checking for deploy updates..."
+    trace "Checking for updates..."
     release="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep \"tag_name\")"
     # Remove the extra garbage
     release="${release#*v}"
@@ -39,7 +39,7 @@ function release_check() {
         release_url="$(curl -s https://api.github.com/repos/emrl/deploy/releases/latest | grep tarball_url | cut -d '"' -f 4)"
         curl -Ls "${release_url}" -o "deploy-${release}.tar.gz"
         # Eventually I'll have a full install here but for now we'll bail
-        console "Try 'tar zxvf deploy-${release}.tar.gz' and then 'sudo doinst.sh' from the archive root directory."
+        console "Try 'tar zxvf stir-${release}.tar.gz' and then 'sudo doinst.sh' from the archive root directory."
         quietExit
       fi
     fi
diff --git a/lib/slack.sh b/lib/slack.sh
index f3bb37d..d840935 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -154,7 +154,7 @@ function slackTest {
     warning "No Slack configuration found."; empty_line
     clean_up; exit 1
   else
-    curl -X POST --data "payload={\"text\": \"${slack_icon} Testing Slack integration of ${APP} from deploy ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${SLACKURL}"
+    curl -X POST --data "payload={\"text\": \"${slack_icon} Testing Slack integration of ${APP} from stir ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${SLACKURL}"
     empty_line
   fi
 }
diff --git a/lib/webhook.sh b/lib/webhook.sh
index c29e1e7..2209063 100755
--- a/lib/webhook.sh
+++ b/lib/webhook.sh
@@ -32,7 +32,7 @@ function postTest {
     warning "No webhook URL found."; empty_line
     clean_up; exit 1
   else
-    curl -X POST --data "payload={\"text\": \"Testing POST integration of ${APP} from deploy ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${POSTURL}"
+    curl -X POST --data "payload={\"text\": \"Testing POST integration of ${APP} from stir ${VERSION}\nhttps://github.com/EMRL/stir\"}" "${POSTURL}"
     empty_line
   fi
 }
diff --git a/stir.sh b/stir.sh
index dda10c5..5865da5 100755
--- a/stir.sh
+++ b/stir.sh
@@ -408,7 +408,7 @@ if [[ "${USERRC}" == "1" ]]; then
   fi
 else
   trace "User configuration not found, creating"
-  cp "${deployPath}"/.stirrc ~/.stirrc
+  cp "${deployPath}"/stir-user.rc ~/.stirrc
   console "User configuration file missing, creating ~/.stirrc"
   if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then
     configure_user; sleep 1
@@ -423,27 +423,13 @@ else
 fi
 
 # Load per-project configuration, if it exists
-if [[ -n "${CONFIGDIR}" ]] && [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/stir.sh" ]]; then
-  if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading project configuration from ${WORKPATH}/${APP}/${CONFIGDIR}/stir.sh"
-  fi
-  project_config="${WORKPATH}/${APP}/${CONFIGDIR}/stir.sh"
-  # Fallback to configuration file in the root directory if it exists
-elif [[ -f "${WORKPATH}/${APP}/.stir.sh" ]]; then
+if [[ -f "${WORKPATH}/${APP}/.stir.sh" ]]; then
   if [[ "${INCOGNITO}" != "TRUE" ]]; then
     trace "Loading project configuration from ${WORKPATH}/${APP}/.stir.sh"
   fi
   project_config="${WORKPATH}/${APP}/.stir.sh"
   # Zero out the global configdir variable
   CONFIGDIR=""
-elif [[ -f "${WORKPATH}/${APP}/stir.sh" ]]; then
-  if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading project configuration from ${WORKPATH}/${APP}/stir.sh"
-  fi
-  # shellcheck disable=1090
-  project_config="${WORKPATH}/${APP}/stir.sh"
-  # Zero out the global configdir variable
-  CONFIGDIR=""
 else
   trace "No project configuration file found"
 fi
@@ -456,18 +442,17 @@ else
   # Make sure app directory is writable
   if [[ -w "${WORKPATH}/${APP}" ]]; then
     empty_line; info "Project configuration not found, creating."; sleep 2
-    cp "${deployPath}"/deploy.sh "${WORKPATH}/${APP}/.stir.sh"
+    cp "${deployPath}"/stir-project.sh "${WORKPATH}/${APP}/.stir.sh"
     APPRC="${WORKPATH}/${APP}/.stir.sh"
     if [[ -x "$(command -v nano)" ]]; then
       if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then
         nano "${APPRC}"
         clear; sleep 1
-        $(basename ${APP}) && quietExit
       fi
     fi
     info "You can change configuration later by editing ${APPRC}"
-    quietExit
   fi
+  source "${APPRC}"
 fi
 
 # Make sure variables are set up correctly

From fc1f9de66b7f653dd19d73082223f48d93220725 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 24 Oct 2018 09:59:09 -0700
Subject: [PATCH 123/334] Uninstall script

---
 install/uninst.sh | 127 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/utilities.sh  |   2 +-
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100755 install/uninst.sh

diff --git a/install/uninst.sh b/install/uninst.sh
new file mode 100755
index 0000000..a13292d
--- /dev/null
+++ b/install/uninst.sh
@@ -0,0 +1,127 @@
+#!/usr/bin/env bash
+#
+# uninst.sh
+#
+###############################################################################
+# Completely uninstall stir
+#
+# https://github.com/EMRL/stir
+###############################################################################
+
+# Set mode
+set -uo pipefail
+
+# Initialize variables 
+read -r OS VER EXITCODE dependencies option message fg_green fg_red reset \
+  YES NO NOT i k <<< ""
+echo "${OS} ${VER} ${EXITCODE} ${dependencies} ${option} ${message} ${fg_green} 
+  ${fg_red} ${reset} ${YES} ${NO} ${NOT} ${i} ${k}" > /dev/null
+
+# No root, no fun
+if [[ "${EUID}" -ne 0 ]]; then
+  echo "You must have root access to uninstall - try 'sudo install/uninst.sh'" 2>&1
+  exit 1
+fi
+
+function error_check() {
+  EXITCODE=$?; 
+  if [[ "${EXITCODE}" != "0" ]]; then 
+    echo "Error ${EXITCODE}: stir not uninstalled."
+    exit "${EXITCODE}"
+  fi
+}
+
+function yesno() {
+  local ans
+  local ok=0
+  local timeout=0
+  local default
+  local t
+
+  while [[ "$1" ]]
+  do
+    case "$1" in
+
+    --default)
+      shift
+      default=$1
+      if [[ ! "$default" ]]; then error "Missing default value"; fi
+      t=$(tr '[:upper:]' '[:lower:]' <<< "${default}")
+
+      if [[ "$t" != 'y'  &&  "$t" != 'yes'  &&  "$t" != 'n'  &&  "$t" != 'no' ]]; then
+        error "Illegal default answer: $default"
+      fi
+      default=$t
+      shift
+      ;;
+
+    --timeout)
+      shift
+      timeout=$1
+      if [[ ! "$timeout" ]]; then error "Missing timeout value"; fi
+      if [[ ! "$timeout" =~ ^[0-9][0-9]*$ ]]; then error "Illegal timeout value: $timeout"; fi
+      shift
+      ;;
+
+    -*)
+      error "Unrecognized option: $1"
+      ;;
+
+    *)
+      break
+      ;;
+    esac
+  done
+
+  if [[ $timeout -ne 0  &&  ! "$default" ]]; then
+    error "Non-zero timeout requires a default answer"
+  fi
+
+  if [[ ! "$*" ]]; then error "Missing question"; fi
+
+  while [[ $ok -eq 0 ]]
+  do
+    if [[ "${timeout}" -ne 0 ]]; then
+      if ! read -rt "${timeout}" -p "$*" ans; then
+        ans=$default
+      else
+        # Turn off timeout if answer entered.
+        timeout=0
+        if [[ ! "${ans}" ]]; then ans=$default; fi
+      fi
+    else
+      read -rp "$*" ans
+      if [[ ! "${ans}" ]]; then
+        ans=$default
+      else
+        ans=$(tr '[:upper:]' '[:lower:]' <<< "${ans}")
+      fi 
+    fi
+
+    if [[ "$ans" == 'y'  ||  "$ans" == 'yes'  ||  "$ans" == 'n'  ||  "$ans" == 'no' ]]; then
+      ok=1
+    fi
+
+    if [[ $ok -eq 0 ]]; then warning "Valid answers are: yes, y, no, n"; fi
+  done
+  [[ "$ans" = "y" || "$ans" == "yes" ]]
+}
+
+# Start the uninstall
+echo; sleep 1
+if [[ -f /usr/local/bin/stir ]]; then
+  echo "Removing stir"
+  sudo rm /usr/local/bin/stir; error_check
+
+  if [[ ! -d /etc/stir/lib ]]; then
+    sudo rm -rf /etc/stir/lib; error_check
+  fi
+
+  if yesno --default yes "Remove global configuration files? [Y/n] "; then
+    if [[ -d /etc/stir ]]; then 
+      sudo rm -rf /etc/stir; error_check
+    fi
+  fi
+  echo "Successfully uninstalled."
+  exit 0
+fi
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 3164fbd..f1472b8 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -25,7 +25,7 @@ function go() {
   scan_check
   check_backup
 
-  console "deploy ${VERSION}"
+  console "stir ${VERSION}"
 
   # Build only
   if [[ "${BUILD}" == "1" ]]; then

From d7f641e9c1bea2dbdf4212c05b6996dc6368fc41 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 24 Oct 2018 10:23:35 -0700
Subject: [PATCH 124/334] Improving variable initialization

---
 lib/slack.sh |   2 +-
 stir.sh      | 103 +++++++++++++++++++++++----------------------------
 2 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/lib/slack.sh b/lib/slack.sh
index d840935..dc1439e 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -22,7 +22,7 @@ function slackPost () {
   fi
 
   # Setup the payload w/ the baseline language
-  slack_message="*${SLACKUSER}* deployed updates to ${APP}"
+  slack_message="*${SLACKUSER}* pushed updates to ${APP}"
 
   # Is this a simple publish of existing code to live?
   if [[ "${PUBLISH}" == "1" ]]; then
diff --git a/stir.sh b/stir.sh
index 5865da5..c562be3 100755
--- a/stir.sh
+++ b/stir.sh
@@ -51,33 +51,42 @@ function ctrl_c() {
   fi
 }
 
-# Initialize variables 
+# Initialize variables
+# Loop
+function init_loop {
+  for i in "${var[@]}" ; do
+    read -r "${i}" <<< ""
+    echo "${i}" > /dev/null
+  done
+}
+
 # Startup switches
-read -r APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \
-  SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \
-  DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST BUILD PROJSTATS UNLOCK  \
-  SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN \
-  CHECK_BACKUP <<< ""
-echo "${APP} ${UPGRADE} ${SKIPUPDATE} ${CURRENT} ${VERBOSE} ${QUIET} ${STRICT}  
-  ${DEBUG} ${FORCE} ${SLACKTEST} ${FUNCTIONLIST} ${VARIABLELIST}
-  ${AUTOMATE} ${EMAILTEST} ${APPROVE} ${DENY} ${PUBLISH} ${DIGEST}
-  ${ANALYTICS} ${ANALYTICSTEST} ${PROJSTATS} ${UNLOCK} ${SSHTEST} ${TIME} 
-  ${UPDATEONLY} ${POSTTEST} ${REPORT} ${REPAIR} ${CREATE_INVOICE} 
-  ${SCAN} ${CHECK_BACKUP}" > /dev/null
+function init_startup() {
+  var=(APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \
+    SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \
+    DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST BUILD PROJSTATS UNLOCK  \
+    SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN \
+    CHECK_BACKUP)
+  init_loop
+}
 
 # Temp files
-read -r logFile wpFile coreFile postFile trshFile scanFile statFile \
-  urlFile <<< ""
-echo "${logFile} ${wpFile} ${coreFile} ${postFile} ${trshFile} ${statFile}
-  ${scanFile} ${urlFile}" > /dev/null
+function init_temp() {
+  var=(logFile wpFile coreFile postFile trshFile scanFile statFile \
+    urlFile)
+  init_loop
+}
+
 # Console Colors
-read -r black red green yellow blue magenta cyan white endColor bold \
-  underline reset purple tan <<< ""
-echo "${black} ${red} ${green} ${yellow} ${blue} ${magenta} ${cyan} ${white}
-  ${endColor} ${bold} ${underline} ${reset} ${purple} ${tan}" > /dev/null
+function init_color() {
+  var=(black red green yellow blue magenta cyan white endColor bold \
+  underline reset purple tan)
+  init_loop
+}
 
 # Constants and environment variables
-read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \
+function init_env() {
+  var=(CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \
   EMAILHTML NOPHP FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP TO \
   FROM SUBJECT EMAILERROR EMAILSUCCESS EMAILQUIT FROMDOMAIN FROMUSER \
   POSTEMAILHEAD POSTEMAILTAIL POSTTOSLACK SLACKURL SLACKERROR POSTURL NOKEY \
@@ -90,26 +99,13 @@ read -r CLEARSCREEN WORKPATH CONFIGDIR REPOHOST WPCLI SMARTCOMMIT GITSTATS \
   CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \
   PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \
   INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE \
-  NOTIFYCLIENT <<< ""
-echo "${CLEARSCREEN} ${WORKPATH} ${CONFIGDIR} ${REPOHOST} ${WPCLI} 
-  ${SMARTCOMMIT} ${GITSTATS} ${EMAILHTML} ${NOPHP} ${FIXPERMISSIONS} ${DEVUSER} 
-  ${DEVGROUP} ${APACHEUSER} ${APACHEGROUP} ${TO} ${FROM} ${SUBJECT} ${EMAILERROR} 
-  ${EMAILSUCCESS} ${EMAILQUIT} ${FROMDOMAIN} ${FROMUSER} ${POSTEMAILHEAD} 
-  ${POSTEMAILTAIL} ${POSTTOSLACK} ${SLACKURL} ${SLACKERROR} ${POSTURL} ${NOKEY} 
-  ${PROJNAME} ${PROJCLIENT} ${DEVURL} ${PRODURL} ${REPO} ${MASTER} ${PRODUCTION} 
-  ${COMMITMSG} ${DEPLOY} ${DONOTDEPLOY} ${TASK} ${CHECKBRANCH} ${ACTIVECHECK} 
-  ${CHECKTIME} ${GARBAGE} ${WFCHECK} ${ACFKEY} ${WFOFF} ${REMOTELOG} 
-  ${REMOTETEMPLATE} ${LOCALHOSTPOST} ${LOCALHOSTPATH} ${DIGESTEMAIL} 
-  ${DIGESTSLACK} ${DIGESTURL} ${CLIENTLOGO} ${REMOTEURL} ${SCPPOST} ${SCPUSER}
-  ${SCPHOST} ${SCPHOSTPATH} ${SCPPORT} ${SCPPASS} ${SCPCMD} ${SSHCMD} ${LOGMSG}
-  ${EXPIRELOGS} ${SERVERCHECK} ${STASH} ${MAILPATH} ${REQUIREAPPROVAL} 
-  ${ADDTIME} ${TASKUSER} ${SCPPORT} ${CLIENTID} ${CLIENTSECRET} ${REDIRECTURI}
-  ${AUTHORIZATIONCODE} ${ACCESSTOKEN} ${REFRESHTOKEN} ${PROFILEID} ${ALLOWROOT} 
-  ${SHORTEMAIL} ${INCOGNITO} ${REPORTURL} ${CLIENTCONTACT} ${INCLUDEHOSTING} 
-  ${GLOBAL_VERSION} ${USER_VERSION} ${PROJECT_VERSION} ${TERSE} 
-  ${NOTIFYCLIENT}" > /dev/null
+  NOTIFYCLIENT FIXINDEX HTMLTEMPLATE)
+  init_loop
+}
+
 # Internal variables
-read -r var optstring options logFile wpFile coreFile postFile trshFile statFile \
+function init_internal() {
+  var=(optstring options logFile wpFile coreFile postFile trshFile statFile \
   urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail deployPath \
   etcLocation libLocation POSTEMAIL current_branch error_msg notes \
   UPDCORE TASKLOG PCA PCB PCC PCD PLUGINS slack_icon APPRC USERRC message_state \
@@ -120,22 +116,17 @@ read -r var optstring options logFile wpFile coreFile postFile trshFile statFile
   MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE  LOGSUFFIX \
   DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile \
   TMP MONITORURL MONITORUSER MONITORPASS SERVERID \
-  MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI <<< ""
-echo "${var} ${optstring} ${options} ${logFile} ${wpFile} ${coreFile} ${postFile} 
-  ${trshFile} ${statFile} ${urlFile} ${htmlFile} ${htmlSendmail} ${htmlEmail} 
-  ${clientEmail} ${textSendmail} ${deployPath} ${etcLocation} ${libLocation} 
-  ${POSTEMAIL} ${current_branch} ${error_msg} ${notes} ${UPDCORE} 
-  ${TASKLOG} ${PCA} ${PCB} ${PCC} ${PCD} ${PLUGINS} ${slack_icon} ${APPRC} ${USERRC} 
-  ${message_state} ${COMMITURL} ${COMMITHASH} ${UPD1} ${UPD2} ${UPDATE} ${gitLock} 
-  ${AUTOMERGE} ${MERGE} ${EXITCODE} ${currentStash} ${deploy_cmd} ${deps} 
-  ${start_branch} ${postSendmail} ${SLACKUSER} ${NOCHECK} ${VIEWPORT} 
-  ${VIEWPORTPRE} ${LOGTITLE} ${LOGURL} ${TIMESTAMP} ${STARTUP} ${WPROOT} ${WPAPP} 
-  ${WPSYSTEM} ${DONOTUPDATEWP} ${gitHistory} ${digestSendmail} ${MINAUSER} 
-  ${MINADOMAIN} ${SSHTARGET} ${SSHSTATUS} ${REMOTEFILE} ${LOGSUFFIX} 
-  ${DISABLESSHCHECK} ${URL} ${CODE} ${DEPLOYPID} ${DEPLOYTEST} ${payload} 
-  ${reportFile} ${TMP} ${MONITORURL} ${MONITORUSER} ${MONITORPASS} 
-  ${SERVERID} ${MONITORHOURS} ${LATENCY} ${UPTIME} ${MONITORTEST} 
-  ${MONITORAPI}" > /dev/null
+  MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI)
+  init_loop
+}
+
+# Go!
+init_startup
+init_temp
+init_color
+init_env
+init_internal
+
 
 # Display command options
 function flags() {

From e7e22bce5b34e78292a8b96c21ca984deaa8ac27 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 24 Oct 2018 18:54:28 -0700
Subject: [PATCH 125/334] Variable cleanup

---
 README.md              | 22 +++++++++++-----------
 install/doinst.sh      |  2 +-
 lib/active-check.sh    |  4 ++--
 lib/analytics.sh       |  8 +++-----
 lib/approval.sh        |  4 ++--
 lib/configure.sh       |  4 ++--
 lib/deployment.sh      |  4 ++--
 lib/digest.sh          |  7 +++----
 lib/env-check.sh       | 30 ++++++++++++++----------------
 lib/git.sh             |  4 ++--
 lib/invoice.sh         |  7 +++----
 lib/package-manager.sh |  4 ++--
 lib/post-log.sh        |  4 ++--
 lib/process-html.sh    |  8 +++-----
 lib/release-check.sh   |  4 ++--
 lib/report.sh          |  4 ++--
 lib/scan.sh            |  7 +++----
 lib/scp.sh             |  7 +++----
 lib/statistics.sh      | 12 +++---------
 lib/user-feedback.sh   |  6 +++---
 lib/utilities.sh       |  3 +++
 lib/wp-acf.sh          |  4 ++--
 stir.sh                |  2 +-
 23 files changed, 74 insertions(+), 87 deletions(-)
 mode change 100644 => 100755 README.md

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index ca027d8..181b8d7
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
-# Deploy
+# Stir
 
 [![release](https://img.shields.io/badge/release-v3.7.2-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
 
-`deploy` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
+`stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 
 [Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md)
 
-This script is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us.
+`stir` is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us.
 
 Please note that our documentation here is nearly useless, and there is quite a bit of setup involved in getting this running reliably. A full setup guide is coming soon™.
 
 ## Startup Options
 
 ```
-Usage: deploy [options] [target] ...
+Usage: stir [options] [target] ...
 
 Options:
   -F, --force            Skip all user interaction, forces 'Yes' to all actions
@@ -59,30 +59,30 @@ Other Options:
 
 ## How It Works
 
-`deploy` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. 
+`stir` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. 
 
-`deploy` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
+`stir` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
 
 ## Installation
 
-`deploy` can be run from wherever you've installed it, but if you'd like it to be installed server-wide, follow the instructions below. 
+`stir` can be run from anywhere, but if you'd like it to be installed server-wide follow the instructions below. 
 
-1. In the `deploy` directory, type `sudo ./install/doinst.sh` and enter your sudo password when/if asked
+1. In the `stir` directory, type `sudo ./install/doinst.sh` and enter your sudo password when/if asked
 2. That's it. By default `deploy` is installed to `/usr/local/bin/` and support files are installed to `/etc/deploy/`
 
 ## Configuration
 
-Configuration is handled globally in the `etc/deploy.conf` file. Individual users also have their own settings in `~/.deployrc`
+Configuration is handled globally in the `etc/stir/global.conf` file. Individual users also have their own settings in `~/.stirrc`
 
 Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/deploy/blob/master/etc/deploy.sh).
 
 ## Slack
 
-For workgroups and teams that use it, `deploy` is able to integrate with Slack. You'll need to set up an "Incoming Webhook" custom integration on the Slack side to get this ready to roll. See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get going. Once you think you've got Slack configured, run `deploy --slack-test [project]` to test.
+For workgroups and teams that use it, `stir` is able to integrate with Slack. You'll need to set up an "Incoming Webhook" custom integration on the Slack side to get this ready to roll. See https://YOURTEAMNAME.slack.com/apps/manage/custom-integrations to get going. Once you think you've got Slack configured, run `stir --slack-test [project]` to test.
 
 ## Autopilot
 
-`deploy --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/deploy/blob/master/etc/cron/deploy.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed.
+`stir --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/deploy/blob/master/etc/cron/deploy.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed.
 
 ## Contact
 
diff --git a/install/doinst.sh b/install/doinst.sh
index 8638a0b..3427bde 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -148,7 +148,7 @@ sudo cp -R etc/* /etc/stir; error_check
 sudo cp etc/stir-user.rc /etc/stir; error_check
 
 if [[ ! -f /etc/stir/stir.conf ]]; then
-  cp /etc/stir/stir-global.conf /etc/stir/stir.conf; error_check
+  cp /etc/stir/stir-global.conf /etc/stir/global.conf; error_check
 fi
 
 cp -R lib/* /etc/stir/lib || error_check
diff --git a/lib/active-check.sh b/lib/active-check.sh
index 0d5f6b3..739c567 100755
--- a/lib/active-check.sh
+++ b/lib/active-check.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r active_files <<< ""
-echo "${active_files}" > /dev/null
+var=(active_files)
+init_loop
 
 function check_active() { 
   if [[ "${FORCE}" == "1" ]] && [[ "${UPGRADE}" == "1" ]] && [[ "${QUIET}" == "1" ]] && [[ "${ACTIVECHECK}" = "TRUE" ]]; then
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 05e73ed..6c01b50 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -12,11 +12,9 @@
 ###############################################################################
 
 # Initialize variables
-read -r SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
-  GA_SOCIAL ANALYTICSMSG ga_day ga_sequence max_value n a GA_TOTAL <<< ""
-echo "${SIZE} ${RND} ${METRIC} ${RESULT} ${GA_HITS} ${GA_PERCENT} 
-  ${GA_SEARCHES} ${GA_DURATION} ${GA_SOCIAL} ${ANALYTICSMSG} ${ga_sequence} 
-  ${max_value} ${n} ${a} ${GA_TOTAL}" > /dev/null
+var=(SIZE RND METRIC RESULT GA_HITS GA_PERCENT GA_SEARCHES GA_DURATION \
+  GA_SOCIAL ANALYTICSMSG ga_day ga_sequence max_value n a GA_TOTAL)
+init_loop
 
 ga_var=(users newUsers percentNewSessions sessionsPerUser sessions 
     bounceRate avgSessionDuration hits organicSearches pageviews avgTimeOnPage
diff --git a/lib/approval.sh b/lib/approval.sh
index ccc968d..d9822c8 100755
--- a/lib/approval.sh
+++ b/lib/approval.sh
@@ -7,8 +7,8 @@
 ############################################################################### 
 
 # Initialize variables
-read -r QUEUED <<< ""
-echo "${QUEUED}" > /dev/null
+var=(QUEUED)
+init_loop
 
 function queue() {
 	# Make sure there's something to do
diff --git a/lib/configure.sh b/lib/configure.sh
index 84c178b..7885f2a 100755
--- a/lib/configure.sh
+++ b/lib/configure.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r value remote_origin config_file <<< ""
-echo "${value} ${remote_origin} ${config_file}" > /dev/null
+var=(value remote_origin config_file)
+init_loop
 
 function configure_project() {
   empty_line
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 5c34239..69a8703 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -7,8 +7,8 @@
 ############################################################################### 
 
 # Initializa needed variables
-read -r start_deploy <<< ""
-echo "${start_deploy}" > /dev/null
+var=(start_deploy)
+init_loop
 
 # Housekeeping tasks to run before final deployment
 function preDeploy() {
diff --git a/lib/digest.sh b/lib/digest.sh
index b33f597..9aea7ff 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -7,10 +7,9 @@
 ###############################################################################
 
 # Initializa needed variables
-read -r AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP \
-  GREETING <<< ""
-echo "${AUTHOR} ${AUTHOREMAIL} ${AUTHORNAME} ${GRAVATAR} ${IMGFILE} 
-  ${DIGESTWRAP} ${GREETING}" > /dev/null
+var=(AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP \
+  GREETING)
+init_loop
 
 function get_avatars() {
   for AUTHOR in $(git log --pretty=format:"%ae|%an" | sort | uniq); do
diff --git a/lib/env-check.sh b/lib/env-check.sh
index c7fb6f2..d2f1951 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -7,12 +7,10 @@
 ###############################################################################
 
 # Initialize variables
-read -r update_global update_user update_project env_settings project_config \
+var=(update_global update_user update_project env_settings project_config \
   sed_hack short_version global_project_version local_version \
-  tmp_workpath <<< ""
-echo "${update_global} ${update_user} ${update_project} ${project_config} 
-  ${sed_hack} ${short_version} ${global_project_version} 
-  ${local_version} ${tmp_workpath}" > /dev/null
+  tmp_workpath)
+init_loop
 
 function env_check() {
   # Only check when someone is at the console
@@ -40,7 +38,7 @@ function env_check() {
     fi
 
     # Reload environment variables, from global > user > project
-    source "${deployPath}"/stir.conf
+    source "${deployPath}"/global.conf
     source ~/.stirrc
     source "${project_config}"
 
@@ -50,7 +48,7 @@ function env_check() {
     # Trying to continue if global configuration has been changed is buggy
     # if using --current switch
     if [[ "${update_global}" == "1" ]]; then
-      console "Global configuration changed - restart your deployment."
+      console "Global configuration changed - restart stir to continue."
       quietExit
     fi
   fi
@@ -69,7 +67,7 @@ function update_config() {
 }
 
 function update_global() {
-  info "Updating ${deployPath}/stir.conf..."
+  info "Updating ${deployPath}/global.conf..."
   env_settings=(CLEARSCREEN WORKPATH CONFIGDIR SERVERCHECK ACTIVECHECK \
     CHECKTIME REPOHOST SMARTCOMMIT GITSTATS STASH GARBAGE WPCLI WFCHECK \
     FIXPERMISSIONS DEVUSER DEVGROUP APACHEUSER APACHEGROUP FIXINDEX \
@@ -81,29 +79,29 @@ function update_global() {
 
   if [[ ! -w "${deployPath}" ]]; then
     info "Requesting sudo access..."
-    sudo cp "${deployPath}"/stir.conf "${deployPath}"/stir.conf.bak
+    sudo cp "${deployPath}"/global.conf "${deployPath}"/global.conf.bak
   else
-    cp "${deployPath}"/stir.conf "${deployPath}"/stir.conf.bak
+    cp "${deployPath}"/global.conf "${deployPath}"/global.conf.bak
   fi
-  info "Global configuration backup created at ${deployPath}/stir.conf.bak"
+  info "Global configuration backup created at ${deployPath}/global.conf.bak"
   
   cp "${deployPath}"/stir-global.conf "${trshFile}"
 
   # Reload global values
-  source "${deployPath}"/stir.conf
+  source "${deployPath}"/global.conf
   
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
-    current_setting=$(grep "^${i}=" "${deployPath}"/stir.conf.bak)
+    current_setting=$(grep "^${i}=" "${deployPath}"/global.conf.bak)
     insert_values
   done
 
   # Install new files
   env_cleanup
   if [[ ! -w "${deployPath}" ]]; then
-    sudo cp "${trshFile}" "${deployPath}"/stir.conf
+    sudo cp "${trshFile}" "${deployPath}"/global.conf
   else
-    cp "${trshFile}" "${deployPath}"/stir.conf
+    cp "${trshFile}" "${deployPath}"/global.conf
   fi
 }
 
@@ -147,7 +145,7 @@ function update_project() {
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
-  cp "${deployPath}"/stir.sh "${trshFile}"
+  cp "${deployPath}"/stir-project.sh "${trshFile}"
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
     current_setting=$(grep "^${i}=" "${project_config}")
diff --git a/lib/git.sh b/lib/git.sh
index 713e602..ef2f73b 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r FULLUSER <<< ""
-echo "${FULLUSER}" > /dev/null
+var=(FULLUSER)
+init_loop
 
 # Assign a variable to represent .git/index.lock
 gitLock="${WORKPATH}/${APP}/.git/index.lock"
diff --git a/lib/invoice.sh b/lib/invoice.sh
index 2ca1024..827d8a8 100755
--- a/lib/invoice.sh
+++ b/lib/invoice.sh
@@ -7,10 +7,9 @@
 ###############################################################################
 
 # Initialize variables
-read -r IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \
-  IN_NOTES IN_EMAIL invoice_hack current_invoice <<< ""
-echo "${IN_HOST} ${IN_TOKEN} ${IN_CLIENT_ID} ${IN_PRODUCT} ${IN_ITEM_COST}
-  ${IN_ITEM_QTY} ${IN_NOTES} ${IN_EMAIL} ${invoice_hack} ${current_invoice}" > /dev/null
+var=(IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \
+  IN_NOTES IN_EMAIL invoice_hack current_invoice)
+init_loop
 
 function create_invoice() {
   # Will create the invoice payload
diff --git a/lib/package-manager.sh b/lib/package-manager.sh
index c20dcb6..d533bc3 100755
--- a/lib/package-manager.sh
+++ b/lib/package-manager.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r deploy_config SKIP_BUILD npm_json <<< ""
-echo "${deploy_config} ${SKIP_BUILD} ${npm_json}" > /dev/null
+var=(deploy_config SKIP_BUILD npm_json)
+init_loop
 
 function pkgMgr() {
   if [[ "${FORCE}" != "1" ]] || [[ "${BUILD}" == "1" ]]; then
diff --git a/lib/post-log.sh b/lib/post-log.sh
index f46c8d7..9c8832c 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r SCPPORT <<< ""
-echo "${SCPPORT}" > /dev/null
+var=(SCPPORT)
+init_loop
 
 # Remote log function; this really needs to be rewritten
 function postLog() {
diff --git a/lib/process-html.sh b/lib/process-html.sh
index b0d651e..924342b 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -7,12 +7,10 @@
 ###############################################################################
 
 # Initialize variables 
-read -r DEFAULTC PRIMARYC SECONDARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID \
+var=(DEFAULTC PRIMARYC SECONDARYC SUCCESSC INFOC WARNINGC DANGERC SMOOCHID \
   COVER SCANC UPTIMEC LATENCYC LOGC LOGBC sed_commits sed_scan sed_backup \
-  process_var v i <<< ""
-echo "${DEFAULTC} ${PRIMARYC} ${SUCCESSC} ${INFOC} ${WARNINGC} ${DANGERC} 
-  ${SMOOCHID} ${COVER} ${SCANC} ${UPTIMEC} ${LATENCYC} ${sed_commits} 
-  ${sed_scan} ${sed_backup} ${process_var} ${v} ${i}" > /dev/null
+  process_var v i)
+init_loop
 
 function process_html() {
   # Clean out the stuff we don't need
diff --git a/lib/release-check.sh b/lib/release-check.sh
index 6a6ad58..963ea1a 100755
--- a/lib/release-check.sh
+++ b/lib/release-check.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r release release_notes release_url <<< ""
-echo "${active_files}" > /dev/null
+var=(release release_notes release_url)
+init_loop
 
 function release_check() {
   # Only check for a newer release when someone is at the console
diff --git a/lib/report.sh b/lib/report.sh
index f33227e..a6de4ac 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-read -r CURMTH CURYR PRVMTH PRVYR LASTDY <<< ""
-echo "${CURMTH} ${CURYR} ${PRVMTH} ${PRVYR} ${LASTDY}" > /dev/null
+var=(CURMTH CURYR PRVMTH PRVYR LASTDY)
+init_loop
 
 function create_report() {
 
diff --git a/lib/scan.sh b/lib/scan.sh
index 4a6edaf..25eac19 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -7,10 +7,9 @@
 ###############################################################################
 
 # Initialize variables
-read -r NIKTO NIKTO_CONFIG NIKTO_PROXY scan_html SCAN_RESULT SCAN_MSG \
-  SCAN_URL <<< ""
-echo "${NIKTO} ${NIKTO_CONFIG} ${scan_html} ${SCAN_RESULT} ${SCAN_MSG}
-  ${SCAN_URL}" > /dev/null
+var=(NIKTO NIKTO_CONFIG NIKTO_PROXY scan_html SCAN_RESULT SCAN_MSG \
+  SCAN_URL)
+init_loop
 
 function scan_check() {
   if [[ -n "${PRODURL}" ]] || [[ -n "${NIKTO}" ]]; then
diff --git a/lib/scp.sh b/lib/scp.sh
index 968092c..b2649e7 100755
--- a/lib/scp.sh
+++ b/lib/scp.sh
@@ -7,10 +7,9 @@
 ###############################################################################
 
 # Initialize variables
-read -r STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH \
-  SCP_DEPLOY_USER SCP_DEPLOY_PASS <<< ""
-echo "${STAGING_DEPLOY_PATH} ${PRODUCTION_DEPLOY_HOST} ${PRODUCTION_DEPLOY_PATH} 
-  ${SCP_DEPLOY_USER} ${SCP_DEPLOY_PASS}" > /dev/null
+var=(STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH \
+  SCP_DEPLOY_USER SCP_DEPLOY_PASS)
+init_loop
 
 function deploy_scp() {
   # This is ghetto
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 121936a..7496b69 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -7,19 +7,13 @@
 ###############################################################################
 
 # Initialize variables
-read -r DB_API_TOKEN DB_BACKUP_PATH LAST_BACKUP BACKUP_STATUS CODE_STATS \
+var=(DB_API_TOKEN DB_BACKUP_PATH LAST_BACKUP BACKUP_STATUS CODE_STATS \
   BACKUP_BTN LATENCY_BTN UPTIME_BTN SCAN_BTN COMMITS_RECENT  \
   repo_charts ACTIVITY_NAV STATISTICS_NAV SCAN_NAV ENGAGEMENT_NAV \
   FIREWALL_NAV BACKUP_NAV SCAN_STATS FIREWALL_STATUS BACKUP_MSG \
   BACKUP_FILES TOTAL_COMMITS RSS_URL ga_hits ga_users ga_newUsers ga_sessions \
-  ga_organicSearches ga_pageviews <<< ""
-echo "${DB_API_TOKEN} ${DB_BACKUP_PATH} ${LAST_BACKUP} ${BACKUP_STATUS} 
-  ${CODE_STATS} ${BACKUP_BTN} ${LATENCY_BTN} ${UPTIME_BTN} ${SCAN_BTN}
-  ${COMMITS_RECENT} ${repo_charts} ${ACTIVITY_NAV} ${STATISTICS_NAV} 
-  ${SCAN_NAV} ${ENGAGEMENT_NAV} ${FIREWALL_NAV} ${BACKUP_NAV} 
-  ${FIREWALL_STATUS} ${BACKUP_MSG} ${BACKUP_FILES} ${TOTAL_COMMITS} 
-  ${RSS_URL} ${ga_hits} ${ga_users} ${ga_newUsers} ${ga_sessions} 
-  ${ga_organicSearches} ${ga_pageviews}" > /dev/null
+  ga_organicSearches ga_pageviews)
+init_loop
 
 function project_stats() {
   hash gitchart 2>/dev/null || {
diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh
index 252c3ef..65458b6 100755
--- a/lib/user-feedback.sh
+++ b/lib/user-feedback.sh
@@ -6,9 +6,9 @@
 # Handles console feedback components
 ###############################################################################
 
-# Initialize variables 
-read -r pid delay spinstr temp <<< ""
-echo "${pid} ${delay} ${spinstr} %{temp}" > /dev/null
+# Initialize variables
+var=(pid delay spinstr temp)
+init_loop
 
 # Progress spinner; we'll see if this works
 function spinner() {
diff --git a/lib/utilities.sh b/lib/utilities.sh
index f1472b8..37d9a0d 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -7,6 +7,9 @@
 ###############################################################################
 
 # Initialize variables
+var=(integer_check)
+init_loop
+
 read -r integer_check <<< ""
 echo "${integer_check}" > /dev/null
 
diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh
index 0e5fd4c..7d5c6a5 100755
--- a/lib/wp-acf.sh
+++ b/lib/wp-acf.sh
@@ -7,8 +7,8 @@
 ###############################################################################
 
 # Declare needed variables
-read -r ACFFILE <<< ""
-echo "${ACFFILE}" > /dev/null
+var=(ACFFILE)
+init_loop
 
 function acf_update() {
   if grep -q "advanced-custom-fields-pro" "${wpFile}"; then
diff --git a/stir.sh b/stir.sh
index c562be3..3eaa64b 100755
--- a/stir.sh
+++ b/stir.sh
@@ -300,7 +300,7 @@ fi
 
 # Load external configuration & functions
 libLocation="${deployPath}/lib/loader.sh"
-etcLocation="${deployPath}/stir.conf"
+etcLocation="${deployPath}/global.conf"
 
 # System wide configuration files
 if [[ -f "${etcLocation}" ]]; then

From b1e2c1018da9c5740000a0478792c901a597061e Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 25 Oct 2018 20:48:14 -0700
Subject: [PATCH 126/334] Clean up invoicing and analytics

---
 CHANGELOG.md        |  2 ++
 etc/stir-project.sh |  3 +++
 lib/analytics.sh    |  1 -
 lib/invoice.sh      | 10 ++++++----
 lib/slack.sh        |  5 ++---
 lib/statistics.sh   | 10 +++++-----
 stir.sh             |  2 +-
 7 files changed, 19 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
index c507621..c724021
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Wordpress projects can now be managed using either `composer` or `wp-cli` (or both) transparently
 - ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
 ### Changed
+- `deploy` is now `stir`
+- Invoice creation will now exit gracefully if project is not correctly configured
 - Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory (This is the equivalent of setting `DONOTDEPLOY="TRUE"` in `.deploy.sh`)
 ### Fixed
 - Fixed a bug that occasionally caused successful deployment to be incorrectly reported
diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 09222b2..07dea3a 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -305,6 +305,9 @@ PROJECT_VERSION="3.7.1"
 # Default item notes
 # IN_NOTES="{{IN_NOTES}}"
 
+# Should the invoices immediately be emailed upon creation?
+# IN_EMAIL="{{IN_EMAIL}}"
+
 
 ###############################################################################
 # Google Analytics
diff --git a/lib/analytics.sh b/lib/analytics.sh
index 6c01b50..b6f41ce 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -26,7 +26,6 @@ for i in "${ga_var[@]}" ; do
   echo "ga_${i}" > /dev/null
 done
 
-
 function ga_metrics() {
   array[0]="hits"
   array[1]="percentNewSessions"
diff --git a/lib/invoice.sh b/lib/invoice.sh
index 827d8a8..dd7c7db 100755
--- a/lib/invoice.sh
+++ b/lib/invoice.sh
@@ -12,6 +12,10 @@ var=(IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \
 init_loop
 
 function create_invoice() {
+  if [[ -z "${IN_HOST}" || -z "${IN_TOKEN}" || -z "${IN_CLIENT_ID}" || -z "${IN_PRODUCT}" || -z "${IN_ITEM_COST}" || -z "${IN_ITEM_QTY}" ]]; then
+    console "Invoicing not configured correctly, can not create payload."; quietExit
+  fi    
+
   # Will create the invoice payload
   trace "Creating invoice..."
   invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\", \"cost\":${IN_ITEM_COST}, \"qty\":1}]}' -H \"X-Ninja-Token: ${IN_TOKEN}\"")
@@ -23,12 +27,10 @@ function create_invoice() {
     send_invoice
   fi 
 
-  notes="${IN_NOTES} invoice (#${current_invoice}) created"
   safeExit
 }
 
 function get_current_invoice() {
-  trace "This is an empty function"
   curl -X GET "${IN_HOST}/api/v1/clients/${IN_CLIENT_ID}?include=invoices" -H "X-Ninja-Token: ${IN_TOKEN}" > "${trshFile}"
 
   # Many sedtastic things
@@ -42,9 +44,9 @@ function get_current_invoice() {
 }
 
 function send_invoice() {
+  # This does not seem to work as advertised. Ugh.
   # curl -X POST ninja.test/api/v1/email_invoice -d '{"id":1}' -H "Content-Type:application/json" -H "X-Ninja-Token: TOKEN"
-  trace "This is an empty function"
-  invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/email_invoice\"  -d '{\"id\":\"${current_invoice}\"}' -H "Content-Type:application/json" -H \"X-Ninja-Token: ${IN_TOKEN}\"")
+  invoice_hack=$(echo "curl -X POST ${IN_HOST}/api/v1/email_invoice -d '{\"id\":${current_invoice}}' -H "Content-Type:application/json" -H \"X-Ninja-Token: ${IN_TOKEN}\"")
   trace "Trying ${invoice_hack}"
   eval "${invoice_hack}" &>> "${logFile}"; error_check
 }
diff --git a/lib/slack.sh b/lib/slack.sh
index dc1439e..3e70d42 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -80,13 +80,12 @@ function slackPost () {
     if [[ -n "${PRODURL}" ]]; then 
       slack_message="${IN_NOTES} invoice (#${current_invoice}) created for <${PRODURL}|${PROJNAME}>"
     else 
-      slack_message="${IN_NOTES} invoice (#${current_invoice}) created *${PROJNAME}*"               
+      slack_message="${IN_NOTES} invoice (#${current_invoice}) created for *${PROJNAME}*"               
     fi    
   fi
 
-
   # Add a details link to online logfiles if they exist
-  if [[ -n "${REMOTEURL}" ]] && [[ -n "${REMOTELOG}" ]]; then
+  if [[ -n "${REMOTEURL}" ]] && [[ -n "${REMOTELOG}" ]] && [[ "${CREATE_INVOICE}" != "1" ]]; then
     slack_message="${slack_message} (<${LOGURL}|Details>)"
   fi
 
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 7496b69..fc11647 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -181,26 +181,26 @@ function check_backup() {
       do 
       var="$(date -d "${i} day ago" +"%Y-%m-%d")"
       if [[ $(grep "${var}" "${trshFile}") ]]; then
+        # Assume success
+        BACKUP_STATUS="${SUCCESSC}"
+        BACKUP_BTN="btn-success"
         if [[ "${i}" == "0" ]]; then 
           LAST_BACKUP="Today"
           BACKUP_STATUS="${SUCCESSC}"
           BACKUP_BTN="btn-success"
         elif [[ "${i}" == "1" ]]; then
           LAST_BACKUP="Yesterday" 
-          BACKUP_STATUS="${SUCCESSC}"
-          BACKUP_BTN="btn-success"
         else
           LAST_BACKUP="${i} days ago"
-          if [[ "${i}" < "5" ]]; then
+          if [[ "${i}" -lt "5" ]]; then
             BACKUP_STATUS="${SUCCESSC}"
-          elif [[ "${i}" > "4" && "${i}" < "11" ]]; then
+          elif [[ "${i}" -gt "4" && "${i}" -lt "11" ]]; then
             BACKUP_STATUS="${WARNINGC}"
             BACKUP_BTN="btn-warning"
           else
             BACKUP_STATUS="${DANGERC}"
             BACKUP_BTN="btn-danger"
           fi
- 
         fi
         BACKUP_MSG="Last backup: ${LAST_BACKUP} (${var}) in ${DB_BACKUP_PATH}"
         trace "${BACKUP_MSG}"
diff --git a/stir.sh b/stir.sh
index 3eaa64b..3ca6dd3 100755
--- a/stir.sh
+++ b/stir.sh
@@ -231,7 +231,7 @@ while [[ ${1:-unset} = -?* ]]; do
     --monitor-test) MONITORTEST="1" ;;
     --stats) PROJSTATS="1" ;;
     --build) BUILD="1"; NOCHECK="1"; FORCE="1" ;;
-    --invoice) CREATE_INVOICE="1" ;;
+    --invoice) CREATE_INVOICE="1"; FORCE="1" ;;
     --unlock) UNLOCK="1" ;;
     --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;;
     --scan) SCAN="1" ;;

From bfeb6592e5c5f2ed1b47a4c8594eef7cd460283f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 26 Oct 2018 13:23:29 -0700
Subject: [PATCH 127/334] Some more cleanup

---
 etc/html/active/digest/commit.html            |   1 -
 etc/html/active/digest/footer.html            |  34 ---
 etc/html/active/digest/header.html            | 102 -------
 etc/html/active/digest/mockup.html            | 139 ---------
 etc/html/active/digest/scan-pass.png          | Bin 2132 -> 0 bytes
 etc/html/active/digest/speed.png              | Bin 3155 -> 0 bytes
 etc/html/active/digest/uptime.png             | Bin 3468 -> 0 bytes
 etc/html/active/digest/wrap.html              |   1 -
 etc/html/active/scan/index.html               |  96 ------
 etc/html/active/stats/activity.html           | 122 --------
 etc/html/active/stats/backup.html             | 115 -------
 etc/html/active/stats/css/bootstrap.min.css   |   5 -
 etc/html/active/stats/css/styles.css          | 116 -------
 etc/html/active/stats/engagement.html         | 220 --------------
 etc/html/active/stats/firewall.html           | 113 -------
 .../fonts/glyphicons-halflings-regular.eot    | Bin 20290 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.svg    | 229 --------------
 .../fonts/glyphicons-halflings-regular.ttf    | Bin 41236 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff   | Bin 23292 -> 0 bytes
 .../fonts/glyphicons-halflings-regular.woff2  | Bin 18028 -> 0 bytes
 etc/html/active/stats/index.html              | 210 -------------
 etc/html/active/stats/js/bootstrap.min.js     |   7 -
 etc/html/active/stats/js/scripts.js           |   9 -
 etc/html/active/stats/scan.html               | 125 --------
 etc/html/active/stats/stats.html              | 165 ----------
 etc/html/civil/approval.php                   | 136 ---------
 etc/html/civil/approve.html                   |  23 --
 etc/html/civil/client.html                    |  30 --
 etc/html/civil/digest/commit.html             |   1 -
 etc/html/civil/digest/footer.html             |  34 ---
 etc/html/civil/digest/header.html             |  81 -----
 etc/html/civil/digest/reference.html          | 145 ---------
 etc/html/civil/digest/wrap.html               |   1 -
 etc/html/civil/error.html                     |  19 --
 etc/html/civil/footer.html                    |  24 --
 etc/html/civil/header.html                    |  68 -----
 etc/html/civil/remote/index.html              | 108 -------
 etc/html/civil/remote/nolog.html              |  97 ------
 etc/html/civil/stats/_analytics.html          | 166 ----------
 etc/html/civil/stats/index.html               | 126 --------
 etc/html/civil/success.html                   |  20 --
 etc/html/civil/theme-default.conf             |  17 --
 etc/html/civil/theme.conf                     |  18 --
 .../{theme.conf => theme-example.conf}        |   1 -
 etc/html/minimal/approval.php                 | 136 ---------
 etc/html/minimal/approve.html                 |  23 --
 etc/html/minimal/client.html                  |  30 --
 etc/html/minimal/digest/commit.html           |   1 -
 etc/html/minimal/digest/footer.html           |  34 ---
 etc/html/minimal/digest/header.html           | 102 -------
 etc/html/minimal/digest/mockup.html           | 139 ---------
 etc/html/minimal/digest/scan-pass.png         | Bin 2132 -> 0 bytes
 etc/html/minimal/digest/speed.png             | Bin 3155 -> 0 bytes
 etc/html/minimal/digest/uptime.png            | Bin 3468 -> 0 bytes
 etc/html/minimal/digest/wrap.html             |   1 -
 etc/html/minimal/error.html                   |  19 --
 etc/html/minimal/footer.html                  |  24 --
 etc/html/minimal/header.html                  |  81 -----
 etc/html/minimal/remote/backup.png            | Bin 2056 -> 0 bytes
 etc/html/minimal/remote/backup.svg            |  12 -
 etc/html/minimal/remote/index.html            | 108 -------
 etc/html/minimal/remote/nolog.html            |  97 ------
 etc/html/minimal/remote/scan.png              | Bin 2132 -> 0 bytes
 etc/html/minimal/remote/scan.svg              |   9 -
 etc/html/minimal/remote/speed.png             | Bin 3155 -> 0 bytes
 etc/html/minimal/remote/speed.svg             |  13 -
 etc/html/minimal/remote/uptime.png            | Bin 3468 -> 0 bytes
 etc/html/minimal/remote/uptime.svg            |  10 -
 etc/html/minimal/remote/warning.png           | Bin 1857 -> 0 bytes
 etc/html/minimal/report/css/print.css         |   7 -
 etc/html/minimal/report/css/style.css         | 228 --------------
 etc/html/minimal/report/footer.html           |  14 -
 etc/html/minimal/report/header.html           |  53 ----
 etc/html/minimal/report/js/edit.js            | 139 ---------
 etc/html/minimal/scan/footer.html             |  20 --
 etc/html/minimal/scan/header.html             |  76 -----
 etc/html/minimal/stats/index.html             | 285 ------------------
 etc/html/minimal/success.html                 |  20 --
 img/dashboard.png                             | Bin 0 -> 121356 bytes
 79 files changed, 4605 deletions(-)
 delete mode 100755 etc/html/active/digest/commit.html
 delete mode 100755 etc/html/active/digest/footer.html
 delete mode 100755 etc/html/active/digest/header.html
 delete mode 100755 etc/html/active/digest/mockup.html
 delete mode 100755 etc/html/active/digest/scan-pass.png
 delete mode 100755 etc/html/active/digest/speed.png
 delete mode 100755 etc/html/active/digest/uptime.png
 delete mode 100755 etc/html/active/digest/wrap.html
 delete mode 100755 etc/html/active/scan/index.html
 delete mode 100755 etc/html/active/stats/activity.html
 delete mode 100755 etc/html/active/stats/backup.html
 delete mode 100755 etc/html/active/stats/css/bootstrap.min.css
 delete mode 100755 etc/html/active/stats/css/styles.css
 delete mode 100755 etc/html/active/stats/engagement.html
 delete mode 100755 etc/html/active/stats/firewall.html
 delete mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.eot
 delete mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.svg
 delete mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.ttf
 delete mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.woff
 delete mode 100755 etc/html/active/stats/fonts/glyphicons-halflings-regular.woff2
 delete mode 100755 etc/html/active/stats/index.html
 delete mode 100755 etc/html/active/stats/js/bootstrap.min.js
 delete mode 100755 etc/html/active/stats/js/scripts.js
 delete mode 100755 etc/html/active/stats/scan.html
 delete mode 100755 etc/html/active/stats/stats.html
 delete mode 100755 etc/html/civil/approval.php
 delete mode 100755 etc/html/civil/approve.html
 delete mode 100755 etc/html/civil/client.html
 delete mode 100755 etc/html/civil/digest/commit.html
 delete mode 100755 etc/html/civil/digest/footer.html
 delete mode 100755 etc/html/civil/digest/header.html
 delete mode 100755 etc/html/civil/digest/reference.html
 delete mode 100755 etc/html/civil/digest/wrap.html
 delete mode 100755 etc/html/civil/error.html
 delete mode 100755 etc/html/civil/footer.html
 delete mode 100755 etc/html/civil/header.html
 delete mode 100755 etc/html/civil/remote/index.html
 delete mode 100755 etc/html/civil/remote/nolog.html
 delete mode 100755 etc/html/civil/stats/_analytics.html
 delete mode 100755 etc/html/civil/stats/index.html
 delete mode 100755 etc/html/civil/success.html
 delete mode 100755 etc/html/civil/theme-default.conf
 delete mode 100755 etc/html/civil/theme.conf
 rename etc/html/default/{theme.conf => theme-example.conf} (91%)
 delete mode 100755 etc/html/minimal/approval.php
 delete mode 100755 etc/html/minimal/approve.html
 delete mode 100755 etc/html/minimal/client.html
 delete mode 100755 etc/html/minimal/digest/commit.html
 delete mode 100755 etc/html/minimal/digest/footer.html
 delete mode 100755 etc/html/minimal/digest/header.html
 delete mode 100755 etc/html/minimal/digest/mockup.html
 delete mode 100755 etc/html/minimal/digest/scan-pass.png
 delete mode 100755 etc/html/minimal/digest/speed.png
 delete mode 100755 etc/html/minimal/digest/uptime.png
 delete mode 100755 etc/html/minimal/digest/wrap.html
 delete mode 100755 etc/html/minimal/error.html
 delete mode 100755 etc/html/minimal/footer.html
 delete mode 100755 etc/html/minimal/header.html
 delete mode 100755 etc/html/minimal/remote/backup.png
 delete mode 100755 etc/html/minimal/remote/backup.svg
 delete mode 100755 etc/html/minimal/remote/index.html
 delete mode 100755 etc/html/minimal/remote/nolog.html
 delete mode 100755 etc/html/minimal/remote/scan.png
 delete mode 100755 etc/html/minimal/remote/scan.svg
 delete mode 100755 etc/html/minimal/remote/speed.png
 delete mode 100755 etc/html/minimal/remote/speed.svg
 delete mode 100755 etc/html/minimal/remote/uptime.png
 delete mode 100755 etc/html/minimal/remote/uptime.svg
 delete mode 100755 etc/html/minimal/remote/warning.png
 delete mode 100755 etc/html/minimal/report/css/print.css
 delete mode 100755 etc/html/minimal/report/css/style.css
 delete mode 100755 etc/html/minimal/report/footer.html
 delete mode 100755 etc/html/minimal/report/header.html
 delete mode 100755 etc/html/minimal/report/js/edit.js
 delete mode 100755 etc/html/minimal/scan/footer.html
 delete mode 100755 etc/html/minimal/scan/header.html
 delete mode 100755 etc/html/minimal/stats/index.html
 delete mode 100755 etc/html/minimal/success.html
 create mode 100755 img/dashboard.png

diff --git a/etc/html/active/digest/commit.html b/etc/html/active/digest/commit.html
deleted file mode 100755
index a753414..0000000
--- a/etc/html/active/digest/commit.html
+++ /dev/null
@@ -1 +0,0 @@
-
            
-						  
-
-						
-							
-						
-					
            
\ No newline at end of file
diff --git a/etc/html/active/digest/footer.html b/etc/html/active/digest/footer.html
deleted file mode 100755
index 5d22d9a..0000000
--- a/etc/html/active/digest/footer.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-							
-							
            
-								
-									
-										
-										
-								
            
-											Looking for more? Check out your project's stats page.
-										
            
-							
            
-
-					
-						
-							
-						
-					
-			  	
            
-
- - - diff --git a/etc/html/active/digest/header.html b/etc/html/active/digest/header.html deleted file mode 100755 index 051cbd2..0000000 --- a/etc/html/active/digest/header.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - -
-

Your Weekly Digest

- -

- {{WEEKOF}} – {{NOW}}

- -
{{PROJCLIENT}}
- - - -
-

{{SCAN_MSG}} ◢
- -

{{UPTIME}}% uptime ◢
- -

{{LATENCY}}s latency ◢
-
- - -

{{GREETING}}

-

{{ANALYTICSMSG}}

Analytics Chart

- -

Here's a summary of code updates made to your website last week:

-
\ No newline at end of file diff --git a/etc/html/active/digest/mockup.html b/etc/html/active/digest/mockup.html deleted file mode 100755 index 950dd79..0000000 --- a/etc/html/active/digest/mockup.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - -
-

Your Weekly Digest

- -

- March 30, 2018 – April 06, 2018

- -
EMRL
- - - -
-

Scan passed ◢
-

100% uptime ◢
-

1.54s latency ◢
-
- - -

Happy Monday and welcome back!

-

You had 215 hits in the last week.

- -

Here's a summary of code updates made to your website last week:

-
-
-commit 8a8dff7
-Author: Joe Horning
-Date: Thu, 5 Apr 2018 02:05:46 -0700 (2 days ago)

-Updated 2 of 2 plugins (advanced-custom-fields-pro 5.6.10, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)
- -
- - - - -
- Looking for more? Check out your project's stats page. -
-
- - - - - - -
-
- - - diff --git a/etc/html/active/digest/scan-pass.png b/etc/html/active/digest/scan-pass.png deleted file mode 100755 index 4974672a415771b5e3a05a946a1e1870fd2fc1aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2132 zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf; zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~ zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi- z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9 zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z( z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J zVrAsF0Y(IWSfehi@f10wLt5&!@I diff --git a/etc/html/active/digest/speed.png b/etc/html/active/digest/speed.png deleted file mode 100755 index 551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3155 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 VCxh58{^z{{40Q22)mn~`{|BIsV&nh- diff --git a/etc/html/active/digest/wrap.html b/etc/html/active/digest/wrap.html deleted file mode 100755 index cae2bc8..0000000 --- a/etc/html/active/digest/wrap.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/etc/html/active/scan/index.html b/etc/html/active/scan/index.html deleted file mode 100755 index 824c362..0000000 --- a/etc/html/active/scan/index.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- - Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > Malware Scan -
-
-
-
-
-
-

Most recent scan results

-
-
-
-

{{SCAN_RESULT}}

- {{SCAN_RECENT}} -
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/active/stats/activity.html b/etc/html/active/stats/activity.html deleted file mode 100755 index 5797017..0000000 --- a/etc/html/active/stats/activity.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- - Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > Activity -
-
-
-
-
-
-

Activity history ({{TOTAL_COMMITS}} entries)

-
-
-
- {{COMMITS_RECENT}} -
-
-
-
-
-
-
-

About activity

-
-
-
-

- Every time we update your code, it is "committed" to a development system where it is stored, tracked with a uniqe ID, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong. -

-
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/active/stats/backup.html b/etc/html/active/stats/backup.html deleted file mode 100755 index 1948ddc..0000000 --- a/etc/html/active/stats/backup.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > System Backup -
-
-
-
-
-
-

{{BACKUP_MSG}}

-
-
-
-

{{BACKUP_FILES}}

-
-
-
-
-
-
-

About the backup -

-
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/active/stats/css/bootstrap.min.css b/etc/html/active/stats/css/bootstrap.min.css deleted file mode 100755 index 28f154d..0000000 --- a/etc/html/active/stats/css/bootstrap.min.css +++ /dev/null @@ -1,5 +0,0 @@ -/*! - * Bootstrap v3.3.2 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none;visibility:hidden}.collapse.in{display:block;visibility:visible}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none;visibility:hidden}.tab-content>.active{display:block;visibility:visible}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:absolute;top:0;right:0;left:0;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file diff --git a/etc/html/active/stats/css/styles.css b/etc/html/active/stats/css/styles.css deleted file mode 100755 index 56e5926..0000000 --- a/etc/html/active/stats/css/styles.css +++ /dev/null @@ -1,116 +0,0 @@ -@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700'); - -body { - font-family: 'Roboto', sans-serif !important; -} - -p, td { - font-weight: 400; -} - -.navbar-static-top { - margin-bottom:20px; -} - -i { - font-size:16px; -} - -.nav > li > a { - color:#787878; -} - -footer { - margin-top:20px; - padding-top:20px; - padding-bottom:20px; - background-color:#efefef; -} - -/* count indicator near icons */ -.nav>li .count { - position: absolute; - bottom: 12px; - right: 6px; - font-size: 9px; - background: rgba(51,200,51,0.55); - color: rgba(255,255,255,0.9); - line-height: 1em; - padding: 2px 4px; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - -ms-border-radius: 10px; - -o-border-radius: 10px; - border-radius: 10px; -} - -textarea.form-control { - height: 8.0em !important; -} - -.stat-label { - font-weight: 700; - font-size: 0.8em; -} - -.nav > li > a > span { - padding: 0 10px; -} - -.caret { - padding: 0 !important; -} - -.mauticform-post-success .mauticform-message { - color: white; - background-color: green; - padding: 20px; - text-align: center; - margin-bottom: 20px; - margin-top: 5px; - font-weight: 700; - font-size: 20px; -} - -.mauticform-post-success .mauticform-innerform { - display: none; -} - -@media (min-width: 768px) { - .modal-dialog { - width: 800px !important; - } -} - -.rss-items { - list-style-type: none; - -webkit-padding-start: 0px; -} - -.rss-item { - margin-bottom: 1.4em; -} - -.text-white { - color: #ffffff; -} - -.progress-bar-vertical { - width: calc(86% / 7); - min-height: 340px; - display: flex; - align-items: flex-end; - float: left; -} - -.progress-bar-vertical-margin { - margin-right: 2%; -} - -.progress-bar-vertical .progress-bar { - width: 100%; - height: 0; - -webkit-transition: height 0.6s ease; - -o-transition: height 0.6s ease; - transition: height 0.6s ease; -} diff --git a/etc/html/active/stats/engagement.html b/etc/html/active/stats/engagement.html deleted file mode 100755 index ae2bab6..0000000 --- a/etc/html/active/stats/engagement.html +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > Audience Engagement -
-
-
- -
-
-
-

{{GA_HITS}} hits (Last 7 days)

-
-
-
-
-
- {{hits_6}}
{{hits_date_6}} -
-
- -
-
- {{hits_5}}
{{hits_date_5}} -
-
- -
-
- {{hits_4}}
{{hits_date_4}} -
-
- -
-
- {{hits_3}}
{{hits_date_3}} -
-
- -
-
- {{hits_2}}
{{hits_date_2}} -
-
- -
-
- {{hits_1}}
Yesterday -
-
- -
-
- {{hits_0}}
Today -
-
-
-
- -
-
-
-

{{GA_SEARCHES}} organic searches (Last 7 days)

-
-
-
-
-
- {{organicSearches_6}}
{{organicSearches_date_6}} -
-
- -
-
- {{organicSearches_5}}
{{organicSearches_date_5}} -
-
- -
-
- {{organicSearches_4}}
{{organicSearches_date_4}} -
-
- -
-
- {{organicSearches_3}}
{{organicSearches_date_3}} -
-
- -
-
- {{organicSearches_2}}
{{organicSearches_date_2}} -
-
- -
-
- {{organicSearches_1}}
Yesterday -
-
- -
-
- {{organicSearches_0}}
Today -
-
-
-
- - - - - -
- - -
-
-
-
-

About these charts

-
-
-
-

- blahblah -

-
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/active/stats/firewall.html b/etc/html/active/stats/firewall.html deleted file mode 100755 index a2ecdf6..0000000 --- a/etc/html/active/stats/firewall.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > Firewall & Security -
-
-
-
-
-
-

Not yet functional

-
-
-
-
-
-
-
-
-
-

About the firewall

-
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/active/stats/fonts/glyphicons-halflings-regular.eot b/etc/html/active/stats/fonts/glyphicons-halflings-regular.eot deleted file mode 100755 index 423bd5d3a20b804f596e04e5cd02fb4f16cfcbc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20290 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/etc/html/active/stats/fonts/glyphicons-halflings-regular.ttf b/etc/html/active/stats/fonts/glyphicons-halflings-regular.ttf deleted file mode 100755 index a498ef4e7c8b556fc36f580c5ff524025bb11c84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41236 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 diff --git a/etc/html/active/stats/index.html b/etc/html/active/stats/index.html deleted file mode 100755 index 6dfa9dd..0000000 --- a/etc/html/active/stats/index.html +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard -
-
-
-
- -
{{SCAN_MSG}}
 -
{{UPTIME}}% uptime
 -
{{LATENCY}}s latency
 -
{{LAST_BACKUP}}
 -
- - -
-
-
-
-

Engagement (Last 7 days)

-
-
-
-
-

{{GA_HITS}}

-

hits from visitors

-
-
-

{{GA_PERCENT}}%

-

traffic from new users

-
-
-

{{GA_SEARCHES}}

-

organic searches

-
-
-
- - -
-
-
-
- -

Recent Activity

-
-
-
- {{COMMITS_RECENT}} -

- View all -

-
-
-
-
-
-
-
- -

Project Stats

-
-
-
-
-

- Project: {{PROJNAME}}
- Development: {{DEVURL}}
- Production: {{PRODURL}} -

-

{{CODE_STATS}}

-
-
- {{PROJCLIENT}} -
-
- -
- -
-

- View all -

-
-
-
-
-
-
- -

Support Request

-
-
-
- -
-
-
-
-
-
-
- - - - - -
- - - - - - \ No newline at end of file diff --git a/etc/html/active/stats/js/bootstrap.min.js b/etc/html/active/stats/js/bootstrap.min.js deleted file mode 100755 index c6d3692..0000000 --- a/etc/html/active/stats/js/bootstrap.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/*! - * Bootstrap v3.3.2 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ -if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.2",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.2",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.2",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&"show"==b&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a(this.options.trigger).filter('[href="#'+b.id+'"], [data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.2",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0,trigger:'[data-toggle="collapse"]'},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":a.extend({},e.data(),{trigger:this});c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.2",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('
').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.divider):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j').prependTo(this.$element).on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.options.backdrop&&this.adjustBackdrop(),this.adjustDialog()},c.prototype.adjustBackdrop=function(){this.$backdrop.css("height",0).css("height",this.$element[0].scrollHeight)},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){this.bodyIsOverflowing=document.body.scrollHeight>document.documentElement.clientHeight,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||"destroy"!=b)&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.3.2",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-mp.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||"destroy"!=b)&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.2",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.2",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.2",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e() -}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.2",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a("body").height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file diff --git a/etc/html/active/stats/js/scripts.js b/etc/html/active/stats/js/scripts.js deleted file mode 100755 index 445a9e0..0000000 --- a/etc/html/active/stats/js/scripts.js +++ /dev/null @@ -1,9 +0,0 @@ - -$(document).ready(function(){$(".alert").addClass("in").fadeOut(4500); - -/* swap open/close side menu icons */ -$('[data-toggle=collapse]').click(function(){ - // toggle icon - $(this).find("i").toggleClass("glyphicon-chevron-right glyphicon-chevron-down"); -}); -}); \ No newline at end of file diff --git a/etc/html/active/stats/scan.html b/etc/html/active/stats/scan.html deleted file mode 100755 index d27c97f..0000000 --- a/etc/html/active/stats/scan.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- - Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > Malware Scan -
-
-
-
-
-
-

Malware scan: {{SCAN_MSG}}

-
-
-
- {{SCAN_STATS}} -
-
-
-
-
-
-
-

About the scan

-
-
-
-

- Our system performs comprehensive tests against your web server for multiple items, including over 6700 potentially dangerous files and programs, checks for outdated versions of over 1250 servers, and version specific problems on over 270 servers. -

-

- It also checks for server configuration items such as the presence of multiple index files, HTTP server options, and will attempt to identify installed web servers and software. Scan items and plugins are frequently updated and are automatically updated. -

-
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/active/stats/stats.html b/etc/html/active/stats/stats.html deleted file mode 100755 index 2f51bd5..0000000 --- a/etc/html/active/stats/stats.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - {{PROJNAME}} • {{PROJCLIENT}} - - - - - - - - - - - - - - -
-
-
- Reports -
- -
- -

 

-
- -
-
    -
  • Updated {{NOW}}
    • -
- My Dashboard > Statistics -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
-

About these charts

-
-
-
-

- These charts represent when, how many, and by who code changes to your website are being made. -

- What is a commit? -

- Your website code uses version control systems which allow rolling back to previous versions easily. In this context, a commit within a version control system is protected as it is easily rolled back, even after the commit has been applied. -

-

- More information about this type of workflow can be found here. -

-
-
-
-
-
-
-
- -
- - - - - diff --git a/etc/html/civil/approval.php b/etc/html/civil/approval.php deleted file mode 100755 index 7820028..0000000 --- a/etc/html/civil/approval.php +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - -

{{LOGTITLE}}

- - {{PROJCLIENT}} -

Date: {{NOW}}
- Project: {{PROJNAME}} ({{PROJCLIENT}})
- Staging URL: {{DEVURL}}
- Production URL: {{PRODURL}} -

- -

Proposed commit from {{USER}}
- {{NOTES}}

- - - - - - - - -
Deny Approve
- - '; -} elseif ($approved) { - echo 'You have approved this commit and it will be deployed soon.'; -} else { - echo 'You have denied this commit and it will not be deployed.'; -} -?> - - -
- - - - - - - - - - - 

diff --git a/etc/html/civil/approve.html b/etc/html/civil/approve.html
deleted file mode 100755
index e658d7e..0000000
--- a/etc/html/civil/approve.html
+++ /dev/null
@@ -1,23 +0,0 @@
-		
Proposed commit from {{USER}}

-			{{NOTES}}

-
-		
-		
-			
-				
-				
-				
-				
-				
-			
-		
 Review  Deny  Approve 

-
- - - - - - - 

diff --git a/etc/html/civil/client.html b/etc/html/civil/client.html
deleted file mode 100755
index 36a6a13..0000000
--- a/etc/html/civil/client.html
+++ /dev/null
@@ -1,30 +0,0 @@
-          
Message:  Updates have been deployed to your website.

-          {{NOTES}}

-          
-          
-          
-            
-              
-            
-          
 Learn More 

-
- - - - - - - - - - - - - - diff --git a/etc/html/civil/digest/commit.html b/etc/html/civil/digest/commit.html deleted file mode 100755 index a753414..0000000 --- a/etc/html/civil/digest/commit.html +++ /dev/null @@ -1 +0,0 @@ -
- - - - - -
\ No newline at end of file diff --git a/etc/html/civil/digest/footer.html b/etc/html/civil/digest/footer.html deleted file mode 100755 index 9312e64..0000000 --- a/etc/html/civil/digest/footer.html +++ /dev/null @@ -1,34 +0,0 @@ - - -
- - - - -
- Looking for more? Check out your project's stats page. -
-
- - - - - - -
-
- - - diff --git a/etc/html/civil/digest/header.html b/etc/html/civil/digest/header.html deleted file mode 100755 index 73b7a07..0000000 --- a/etc/html/civil/digest/header.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - -
- - - -
{{PROJCLIENT}}
- -
-

Your Weekly Digest

- -

- {{WEEKOF}} – {{NOW}}

-

{{GREETING}}

-

{{ANALYTICSMSG}}

-

Here's a summary of code updates in the last week:

-
diff --git a/etc/html/civil/digest/reference.html b/etc/html/civil/digest/reference.html deleted file mode 100755 index d16edc4..0000000 --- a/etc/html/civil/digest/reference.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - -
-

What is this digest and why am I receiving it?

-
-
-
-
- - - - - - - - - - - - - - - - - -
- - - -
{{PROJCLIENT}}
- -
-

Your Weekly Digest

- -

- {{WEEKOF}} – {{NOW}}

-
{{PROJCLIENT}}
-

{{GREETING}}

-

{{ANALYTICSMSG}}

-

Here's a summary of code updates made to your website last week:

-
- - -
- - - - -commit 5a117e3
-Author: Joe Horning
-Date: Sun, 30 Jul 2017 02:02:24 -0700 (30 hours ago)

-Updated 3 of 3 plugins (codepress-admin-columns 3.0.3, advanced-custom-fields-pro 5.6.0, wordfence 6.3.15, wordpress-seo 5.1)
- - - - -
- - - - -
- Looking for more? Check out your project's stats page. -
-
- - - - - - -
-
- - - - diff --git a/etc/html/civil/digest/wrap.html b/etc/html/civil/digest/wrap.html deleted file mode 100755 index cae2bc8..0000000 --- a/etc/html/civil/digest/wrap.html +++ /dev/null @@ -1 +0,0 @@ -
- - - - - -
\ No newline at end of file diff --git a/etc/html/civil/error.html b/etc/html/civil/error.html deleted file mode 100755 index 2c3e39a..0000000 --- a/etc/html/civil/error.html +++ /dev/null @@ -1,19 +0,0 @@ -

ERROR: - {{NOTES}}

- - - - - - - - -
- - - - - 

diff --git a/etc/html/civil/footer.html b/etc/html/civil/footer.html
deleted file mode 100755
index 0fe4e6f..0000000
--- a/etc/html/civil/footer.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- - - - - - -
-
- - diff --git a/etc/html/civil/header.html b/etc/html/civil/header.html deleted file mode 100755 index 43412e8..0000000 --- a/etc/html/civil/header.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - -

{{LOGTITLE}}

- - - {{PROJCLIENT}} - -

Date: {{NOW}}
- Project: {{PROJNAME}} ({{PROJCLIENT}})
- Staging URL: {{DEVURL}}
- Production URL: {{PRODURL}} -

diff --git a/etc/html/civil/remote/index.html b/etc/html/civil/remote/index.html deleted file mode 100755 index 0389094..0000000 --- a/etc/html/civil/remote/index.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - -
-

About Your Weekly Digest

- - -

Hey there!

- -

If you found this page, you must have received a weekly digest about your website! That's part of our ongoing effort to be as transparent as possible and let our clients in on the stuff that happens with their website development and maintenance.

- -

Every time we update your code, it is "committed" to a development system where it is stored, tracked, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong. This is an industry-standard approach to software development, and if you're feeling nerdy you can learn more about it on Wikipedia.

- -

The weekly digest will include notes on code changes we have made at your request, as well as system updates and security patches.

- -

Scheduled Updates & Maintenance

-

Security Patches: Every Sunday & Thursday at 2:00am

-

System Updates: Every Sunday & Thursday at 2:00am

-

- Off-site Backup: Every Sunday at 3am

- -

Any Questions?

-

If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

- - - - - - - -
- - - - - - -
-
- - - - diff --git a/etc/html/civil/remote/nolog.html b/etc/html/civil/remote/nolog.html deleted file mode 100755 index bfb9843..0000000 --- a/etc/html/civil/remote/nolog.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - -
- - - - - -

Darn it, there doesn't appear to be a logfile for that commit.

- -

If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

- - - - - - - -
- - - - - - -
-
- - - - diff --git a/etc/html/civil/stats/_analytics.html b/etc/html/civil/stats/_analytics.html deleted file mode 100755 index 212c305..0000000 --- a/etc/html/civil/stats/_analytics.html +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - -
-

Project Statistics BETA

- - -

Report generated June 27, 2017

-

CAA Website - (https://caanet.org/) -

- -
California Apartment Association
- -

3,456

Hits

-
- - - - - - - -
- - - - - - -
-
- - - diff --git a/etc/html/civil/stats/index.html b/etc/html/civil/stats/index.html deleted file mode 100755 index c02a1de..0000000 --- a/etc/html/civil/stats/index.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - -
-

Project Statistics BETA

- - -

Report generated {{NOW}}

-

{{PROJNAME}} - ({{PRODURL}}) -

- -
{{PROJCLIENT}}
- - -

Commits by day of week

-

- -

Commits by hour of week

-

- -

Commits by hour of day

-

- -

Commits by month of year

-

- -

Commits by year

-

- -

Commits by year/month

-

-

- -

- - -

- -

Any Questions?

-

If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

- - - - - - - -

-
- - - - - - -
-
- - - diff --git a/etc/html/civil/success.html b/etc/html/civil/success.html deleted file mode 100755 index 7c9c872..0000000 --- a/etc/html/civil/success.html +++ /dev/null @@ -1,20 +0,0 @@ -

Commit {{COMMITHASH}} by {{USER}} -
Notes: {{NOTES}} -

- - - - - - - -
- - - " >> "${stat_file}" fi - trace "git log --all --no-merges --first-parent --before=\"${current_year}-${current_month}-1 00:00\" --after=\"${previous_year}-${previous_month}-${last_day} 00:00\" --pretty=format:\"\"" git log --all --no-merges --first-parent --before="${current_year}-${current_month}-1 00:00" --after="${previous_year}-${previous_month}-${last_day} 00:00" --pretty=format:"" >> "${stat_file}" # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know. @@ -66,4 +64,12 @@ function create_report() { # Filter and replace template variables process_html + + # Set URL + REMOTEFILE="${current_year}-${current_month}.php" + REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" + + #if [[ "${CREATE_INVOICE}" == "1" ]]; then + # return + #fi } diff --git a/lib/slack.sh b/lib/slack.sh index b36e640..246caad 100755 --- a/lib/slack.sh +++ b/lib/slack.sh @@ -89,7 +89,7 @@ function post_slack () { fi # Create payload for reports - if [[ "${REPORT}" == "1" ]]; then + if [[ "${REPORT}" == "1" ]] || [[ "${CREATE_INVOICE}" == "1" && "${}" ]]; then if [[ -n "${PRODURL}" ]]; then slack_message="Monthly report for <${PRODURL}|${PROJNAME}> created (<${REPORTURL}|View>)" else diff --git a/lib/utilities.sh b/lib/utilities.sh index 3cbfe4a..a64a2b5 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -366,6 +366,8 @@ function show_settings() { [[ -n "${IN_ITEM_COST}" ]] && echo "Item cost: ${IN_ITEM_COST}" [[ -n "${IN_ITEM_QTY}" ]] && echo "Item quantity: ${IN_ITEM_QTY}" [[ -n "${IN_NOTES}" ]] && echo "Notes: ${IN_NOTES}" + [[ -n "${IN_EMAIL}" ]] && echo "Send email: ${IN_EMAIL}" + [[ -n "${IN_INCLUDE_REPORT}" ]] && echo "Include report: ${IN_INCLUDE_REPORT}" fi # Google Analytics if [[ -n "${CLIENTID}" ]] || [[ -n "${CLIENTSECRET}" ]] || [[ -n "${REDIRECTURI}" ]] || [[ -n "${AUTHORIZATIONCODE}" ]] || [[ -n "${ACCESSTOKEN}" ]] || [[ -n "${REFRESHTOKEN}" ]] || [[ -n "${PROFILEID}" ]]; then diff --git a/stir.sh b/stir.sh index 848e35b..239f021 100755 --- a/stir.sh +++ b/stir.sh @@ -73,7 +73,8 @@ function init_env() { SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION \ USER_VERSION PROJECT_VERSION TERSE NOTIFYCLIENT HTMLTEMPLATE PREPARE \ PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH PREPARE_CONFIG \ - GRAVITY_FORMS_LICENSE NEWS_URL BUGSNAG_AUTH USE_SMTP INCLUDE_DETAILS) + GRAVITY_FORMS_LICENSE NEWS_URL BUGSNAG_AUTH USE_SMTP INCLUDE_DETAILS \ + NO_LOG) init_loop } @@ -90,7 +91,7 @@ function init_internal() { MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE LOGSUFFIX \ DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile \ TMP MONITORURL MONITORUSER MONITORPASS SERVERID \ - MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI) + MONITORHOURS LATENCY UPTIME MONITORTEST MONITORAPI IN_HOST IN_TOKEN) init_loop } @@ -281,24 +282,24 @@ while [[ ${1:-unset} = -?* ]]; do --report) REPORT="1"; FORCE="1"; QUIET="1" ;; --automate) FORCE="1"; UPGRADE="1"; QUIET="1"; MERGE="1"; AUTOMATE="1" ;; --update-acf) UPDATE_ACF="1" ;; - --test-ssh) SSHTEST="1" ;; - --test-slack) SLACKTEST="1" ;; - --test-email) EMAILTEST="1" ;; - --test-webhook) test_webhook="1" ;; - --test-analytics) ANALYTICSTEST="1" ;; - --test-monitor) MONITORTEST="1" ;; - --test-bugsnag) test_bugsnag="1" ;; + --test-ssh) SSHTEST="1"; NO_LOG="1" ;; + --test-slack) SLACKTEST="1"; NO_LOG="1" ;; + --test-email) EMAILTEST="1"; NO_LOG="1" ;; + --test-webhook) test_webhook="1"; NO_LOG="1" ;; + --test-analytics) ANALYTICSTEST="1"; NO_LOG="1" ;; + --test-monitor) MONITORTEST="1"; NO_LOG="1" ;; + --test-bugsnag) test_bugsnag="1"; NO_LOG="1" ;; --stats) PROJSTATS="1" ;; --build) BUILD="1"; NOCHECK="1"; FORCE="1" ;; - --invoice) CREATE_INVOICE="1"; FORCE="1" ;; - --unlock) UNLOCK="1" ;; + --invoice) CREATE_INVOICE="1"; NO_LOG="1"; FORCE="1" ;; + --unlock) UNLOCK="1"; NO_LOG="1" ;; --repair) REPAIR="1"; FORCE="1"; STASH="TRUE"; VERBOSE="TRUE" ;; --scan) SCAN="1" ;; --no-check) NOCHECK="1" ;; - --show-settings) SHOW_SETTINGS="1" ;; - --function-list) FUNCTION_LIST="1"; CURRENT="1" ;; # Spoofs --current - --variable-list) VARIABLE_LIST="1"; CURRENT="1" ;; # Spoofs --current - --unit-test) UNIT_TEST="1" ;; + --show-settings) SHOW_SETTINGS="1"; NO_LOG="1" ;; + --function-list) FUNCTION_LIST="1"; CURRENT="1"; NO_LOG="1" ;; # Spoofs --current + --variable-list) VARIABLE_LIST="1"; CURRENT="1"; NO_LOG="1" ;; # Spoofs --current + --unit-test) UNIT_TEST="1"; NO_LOG="1" ;; --endopts) shift; break ;; *) echo "Invalid option: '$1'" 1>&2 ; exit 1 ;; esac From 742898774aeec468ef6dafcac4e3a44114b4c82b Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 12 Nov 2020 10:51:10 -0800 Subject: [PATCH 329/334] Release 3.8.3 --- CHANGELOG.md | 7 ++++--- README.md | 2 +- etc/stir-user.rc | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f05552..ddc8887 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [3.8.3] - 11-12-2020 ### Added - If there are analytics to report, digest emails will now be sent even if there are no code updates to report - Monthly PDF format reports can now be attached to invoices when using the `--invoice` switch @@ -304,8 +304,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Old monolithic script rewritten -[Unreleased]: https://github.com/EMRL/deploy/compare/v3.8.2...HEAD -[3.8]: https://github.com/EMRL/deploy/compare/v3.8...v3.8.2 +[Unreleased]: https://github.com/EMRL/deploy/compare/v3.8.3...HEAD +[3.8.3]: https://github.com/EMRL/deploy/compare/v3.8.2...v3.8.3 +[3.8.2]: https://github.com/EMRL/deploy/compare/v3.8...v3.8.2 [3.8]: https://github.com/EMRL/deploy/compare/v3.7.4...v3.8 [3.7.4]: https://github.com/EMRL/deploy/compare/v3.7.3...v3.7.4 [3.7.3]: https://github.com/EMRL/deploy/compare/v3.7.2...v3.7.3 diff --git a/README.md b/README.md index 298a91d..f127575 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ `stir` is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us. -Please note that our documentation here is nearly useless, and there is quite a bit of setup involved in getting this running reliably. A full setup guide is coming soon™. +Please note that there is quite a bit of setup involved in getting this running reliably. A full setup guide is coming soon™ but for now check out what we've got started in the [wiki documentation](https://github.com/EMRL/stir/wiki). ## Startup Options diff --git a/etc/stir-user.rc b/etc/stir-user.rc index dee779f..d3b8b06 100755 --- a/etc/stir-user.rc +++ b/etc/stir-user.rc @@ -11,7 +11,7 @@ # This value indicates the version number when this file was last changed: # it does not necessarily reflect stir's current version number. # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP -USER_VERSION="3.8.2" +USER_VERSION="3.8.3" # Clear screen on startup, when not running with --quiet or --verbose switch # CLEARSCREEN="{{CLEARSCREEN}}" From 55691d04f13be79d0f4a6b3675ea314b3b655b81 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 12 Nov 2020 10:58:39 -0800 Subject: [PATCH 330/334] Release 3.8.3 for real this time --- etc/stir-global.conf | 2 +- stir.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/stir-global.conf b/etc/stir-global.conf index 47046a5..a51b316 100755 --- a/etc/stir-global.conf +++ b/etc/stir-global.conf @@ -7,7 +7,7 @@ # This value indicates the version number when this file was last changed: # it does not necessarily reflect stir's current version number. # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP -GLOBAL_VERSION="3.8.2" +GLOBAL_VERSION="3.8.3" ############################################################################### diff --git a/stir.sh b/stir.sh index 239f021..d437044 100755 --- a/stir.sh +++ b/stir.sh @@ -11,7 +11,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.8.2-dev" +VERSION="3.8.3" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" last_month="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" From c35b5fb0a618b94ea7a556d23d83aa3f5b712bef Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 22 Nov 2020 12:28:06 -0800 Subject: [PATCH 331/334] Resolve #187 --- lib/analytics.sh | 4 ++++ lib/error-check.sh | 4 ++-- lib/main.sh | 4 +--- stir.sh | 8 +++++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/analytics.sh b/lib/analytics.sh index c725895..238262f 100755 --- a/lib/analytics.sh +++ b/lib/analytics.sh @@ -168,6 +168,10 @@ function ga_data_loop() { for i in "${ga_var[@]}" ; do RESULT=$(${curl_cmd} -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${i}&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n\n' | grep -a "\"ga:${i}\":" | cut -d'"' -f4); dot + if [[ -z "${RESULT}" ]]; then + RESULT="0" + fi + # Workaround for buggy Google shit until [[ "${RESULT}" =~ ^[0-9]+([.][0-9]+)?$ ]]; do diff --git a/lib/error-check.sh b/lib/error-check.sh index 2e00049..e3f011f 100755 --- a/lib/error-check.sh +++ b/lib/error-check.sh @@ -7,7 +7,7 @@ ############################################################################### # Initialize variables -var=(error_detail) +var=(error_detail last_command) init_loop # Try to get exit/error code, with a hard stop on fail @@ -15,7 +15,7 @@ function error_check() { EXITCODE=$?; if [[ "${EXITCODE}" != 0 ]]; then if [[ -z "${error_detail}" ]]; then - error_detail="An unspecified error occurred" + error_detail="Operation fault" fi warning "${error_detail} (Error ${EXITCODE})" error_msg="${error_detail} (Error ${EXITCODE})" diff --git a/lib/main.sh b/lib/main.sh index 52f1aec..df5104c 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -6,9 +6,7 @@ # The main application ############################################################################### -function main() { - get_fullpath # Get full path to internal commands - check_dependencies # Check that all dependencies are available +function main() { user_tests # Run tests if specified by the user release_check # Check for newer version at Github env_check # Check for configuration files that need updating diff --git a/stir.sh b/stir.sh index d437044..81afe25 100755 --- a/stir.sh +++ b/stir.sh @@ -11,7 +11,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.8.3" +VERSION="3.8.4-dev" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" last_month="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" @@ -519,6 +519,12 @@ fi # Validate configuration setings validate_conf +# Get full path to all commands +get_fullpath + +# Check that all dependencies are available +check_dependencies + # Are we using "smart" *cough* commits? if [[ "${SMARTCOMMIT}" == "TRUE" ]]; then trace "Smart commits enabled" From 1556dcec03092cf8595909e3e0eefba357259e30 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Thu, 17 Dec 2020 16:43:02 -0800 Subject: [PATCH 332/334] Resolve #188 --- lib/mail-log.sh | 2 -- lib/main.sh | 9 +++++---- lib/post-log.sh | 15 --------------- lib/scp.sh | 7 +------ lib/utilities.sh | 10 +++++++++- stir.sh | 4 ++-- 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/lib/mail-log.sh b/lib/mail-log.sh index c1dba4a..6ff1e79 100755 --- a/lib/mail-log.sh +++ b/lib/mail-log.sh @@ -152,7 +152,6 @@ function email_test() { [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}
" [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}
" [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}
" - [[ -n "${SCPHOSTPORT}" ]] && echo "Remote log path: ${SCPHOSTPORT}
" [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}
" [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH
" echo "
" @@ -298,7 +297,6 @@ function email_test() { [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}" [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}" [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}" - [[ -n "${SCPHOSTPORT}" ]] && echo "Remote log path: ${SCPHOSTPORT}" [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}" [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH" echo diff --git a/lib/main.sh b/lib/main.sh index df5104c..38d4a6e 100755 --- a/lib/main.sh +++ b/lib/main.sh @@ -7,10 +7,11 @@ ############################################################################### function main() { - user_tests # Run tests if specified by the user - release_check # Check for newer version at Github - env_check # Check for configuration files that need updating - wp_check # Check for Wordpress + user_tests # Run tests if specified by the user + release_check # Check for newer version at Github + env_check # Check for configuration files that need updating + set_fallback_values # Set undefined variables to something useful + wp_check # Check for Wordpress if [[ "${RESET}" == "1" ]]; then reset_local diff --git a/lib/post-log.sh b/lib/post-log.sh index 4460af0..a9659ca 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -81,12 +81,6 @@ function post_log() { if [[ "${DIGEST}" == "1" ]]; then REMOTEFILE="digest-${EPOCH}.html" DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}" - #eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar" - #eval "${SCPCMD} -r" "/tmp/avatar/" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}" - # Clean up your mess - #if [[ -d "/tmp/avatar" ]]; then - # rm -R "/tmp/avatar" - #fi fi if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" && -f "${stat_dir}/*" ]]; then @@ -94,10 +88,6 @@ function post_log() { eval "${SCPCMD} -r" "${stat_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar" eval "${SCPCMD} -r" "${avatar_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/avatar/" - # Clean up your mess - #if [[ -d "${stat_dir}" ]]; then - # rm -R "${stat_dir}" - #fi if [[ -d "${avatar_dir}" ]]; then rm -R "${avatar_dir}" fi @@ -109,14 +99,9 @@ function post_log() { eval "${SCPCMD} -r" "${scan_html}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/scan/index.html" # This stuff is for the new dashboard method eval "${SCPCMD} -r" "${stat_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/" - # Clean up your mess - #if [[ -d "${stat_dir}" ]]; then - # rm -R "${stat_dir}" - #fi fi if [[ "${REPORT}" == "1" ]]; then - trace "Running \"${SSHCMD}\" \"${SCPUSER}\"@\"${SCPHOST}\" \"mkdir -p ${SCPHOSTPATH}/${APP}/report\"" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css" eval "${SCPCMD} -r" "${stir_path}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" diff --git a/lib/scp.sh b/lib/scp.sh index 6f06610..a89dcbf 100755 --- a/lib/scp.sh +++ b/lib/scp.sh @@ -7,17 +7,12 @@ ############################################################################### # Initialize variables -var=(STAGING_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS) +var=(STAGING_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS SCP_DEPLOY_PORT) init_loop function deploy_scp() { # This is ghetto if [[ -n "${PRODUCTION_DEPLOY_PATH}" ]]; then - # if SCPPORT is empty, set it to 22 - if [[ -z "${SCP_DEPLOY_PORT}" ]]; then - SCP_DEPLOY_PORT="22" - fi - # TODO: Modernize this for compatability with multple non-master branches # Checkout production branch if [[ -n "${PRODUCTION}" ]]; then diff --git a/lib/utilities.sh b/lib/utilities.sh index a64a2b5..7abc4a6 100755 --- a/lib/utilities.sh +++ b/lib/utilities.sh @@ -146,6 +146,15 @@ function get_json_value() { fi } +############################################################################### +# set_fallback_values() +# Set defaults for things liks SSH ports if missing +############################################################################### +function set_fallback_values() { + [[ -z "${SCPPORT}" ]] && SCPPORT="22" + [[ -z "${SCP_DEPLOY_PORT}" ]] && SCP_DEPLOY_PORT="22" +} + # User tests function user_tests() { if [[ "${SHOW_SETTINGS}" == "1" ]]; then @@ -338,7 +347,6 @@ function show_settings() { [[ -n "${SCPUSER}" ]] && echo "SCP user: ${SCPUSER}" [[ -n "${SCPHOST}" ]] && echo "Remote log host: ${SCPHOST}" [[ -n "${SCPHOSTPATH}" ]] && echo "Remote log path: ${SCPHOSTPATH}" - [[ -n "${SCPHOSTPORT}" ]] && echo "Remote log path: ${SCPHOSTPORT}" [[ -n "${LOCALHOSTPOST}" ]] && echo "Save logs locally: ${LOCALHOSTPOST}" [[ -n "${LOCALHOSTPATH}" ]] && echo "Path to local logs: ${}LOCALHOSTPATH" fi diff --git a/stir.sh b/stir.sh index 81afe25..a67289b 100755 --- a/stir.sh +++ b/stir.sh @@ -67,7 +67,7 @@ function init_env() { ACTIVECHECK CHECKTIME GARBAGE WFCHECK ACFKEY ACF_LOCK WFOFF REMOTELOG \ REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL DIGESTSLACK \ DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST SCPHOSTPATH \ - SCPHOSTPORT SCPPASS SCPCMD SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH \ + SCPPASS SCPCMD SSHCMD LOGMSG EXPIRELOGS SERVERCHECK STASH \ REQUIREAPPROVAL ADDTIME SCPPORT TASKUSER CLIENTID CLIENTSECRET \ REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN PROFILEID ALLOWROOT \ SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION \ @@ -279,7 +279,7 @@ while [[ ${1:-unset} = -?* ]]; do --reset) RESET="1" ;; --prepare-with-reset) PREPARE_WITH_RESET="1"; PREPARE="1" ;; --digest) DIGEST="1"; FORCE="1" ;; - --report) REPORT="1"; FORCE="1"; QUIET="1" ;; + --report) REPORT="1"; FORCE="1";; #QUIET="1" ;; --automate) FORCE="1"; UPGRADE="1"; QUIET="1"; MERGE="1"; AUTOMATE="1" ;; --update-acf) UPDATE_ACF="1" ;; --test-ssh) SSHTEST="1"; NO_LOG="1" ;; From 9ac38a58344ca6c5bdda53bfdb3c5f941ad426d3 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 14 Feb 2021 12:25:11 -0800 Subject: [PATCH 333/334] Fix for report filenames, resolve #190 --- lib/post-log.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/post-log.sh b/lib/post-log.sh index a9659ca..5f1040d 100755 --- a/lib/post-log.sh +++ b/lib/post-log.sh @@ -36,7 +36,7 @@ function post_log() { # Post the report if [[ "${REPORT}" == "1" ]]; then - REMOTEFILE="${EPOCH}.php" + REMOTEFILE="${current_year}-${current_month}.php" cp "${html_file}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" chmod a+rw "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" &> /dev/null REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}" @@ -102,6 +102,7 @@ function post_log() { fi if [[ "${REPORT}" == "1" ]]; then + REMOTEFILE="${current_year}-${current_month}.php" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report" eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css" eval "${SCPCMD} -r" "${stir_path}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report" From 511651fae90ad16c9c5d5bc705a136b7502bbee1 Mon Sep 17 00:00:00 2001 From: Floyd Diebel Date: Sun, 14 Feb 2021 12:30:10 -0800 Subject: [PATCH 334/334] Release 3.8.4 --- CHANGELOG.md | 7 ++++++- stir.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddc8887..385e05c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.8.4] - 14-2-2020 +### Fixed +- Fixed issues generating monthly reports + ## [3.8.3] - 11-12-2020 ### Added - If there are analytics to report, digest emails will now be sent even if there are no code updates to report @@ -304,7 +308,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Old monolithic script rewritten -[Unreleased]: https://github.com/EMRL/deploy/compare/v3.8.3...HEAD +[Unreleased]: https://github.com/EMRL/deploy/compare/v3.8.4...HEAD +[3.8.4]: https://github.com/EMRL/deploy/compare/v3.8.3...v3.8.4 [3.8.3]: https://github.com/EMRL/deploy/compare/v3.8.2...v3.8.3 [3.8.2]: https://github.com/EMRL/deploy/compare/v3.8...v3.8.2 [3.8]: https://github.com/EMRL/deploy/compare/v3.7.4...v3.8 diff --git a/stir.sh b/stir.sh index a67289b..923a342 100755 --- a/stir.sh +++ b/stir.sh @@ -11,7 +11,7 @@ ############################################################################### IFS=$'\n\t' -VERSION="3.8.4-dev" +VERSION="3.8.4" EPOCH="$(date +%s)" NOW="$(date +"%B %d, %Y")" last_month="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')" 

\ No newline at end of file
diff --git a/etc/html/civil/theme-default.conf b/etc/html/civil/theme-default.conf
deleted file mode 100755
index ee6b89c..0000000
--- a/etc/html/civil/theme-default.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# theme.conf
-#
-# Configuration options for HTML theme
-
-# Setup theme colors
-DEFAULTC="#555555"
-PRIMARYC="#000000"
-SUCCESSC="#47ACDF"
-INFOC="#5D6D7E"
-WARNINGC="#E37222"
-DANGERC="#CC2233"
-
-# If you'd like to add Smooch.io live chat to your digest and statistics pages, 
-# enter your App ID below
-# SMOOCHID="########################"
diff --git a/etc/html/civil/theme.conf b/etc/html/civil/theme.conf
deleted file mode 100755
index ad3f742..0000000
--- a/etc/html/civil/theme.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# theme.conf
-#
-# Configuration options for HTML theme
-
-# Setup theme colors
-DEFAULTC="#555555"
-PRIMARYC="#E37222"
-SUCCESSC="#47ACDF"
-INFOC="#5D6D7E"
-WARNINGC="#E37222"
-DANGERC="#CC2233"
-
-# If you'd like to add Smooch.io live chat to your digest and statistics pages, 
-# enter your App ID below
-# SMOOCHID="########################"
-SMOOCHID="9pobrmwccxk3fozbbdyy9q0eh"
diff --git a/etc/html/default/theme.conf b/etc/html/default/theme-example.conf
similarity index 91%
rename from etc/html/default/theme.conf
rename to etc/html/default/theme-example.conf
index 1535ad0..e073f94 100755
--- a/etc/html/default/theme.conf
+++ b/etc/html/default/theme-example.conf
@@ -18,4 +18,3 @@ LOGBC="#272727"
 # If you'd like to add Smooch.io live chat to your digest and statistics pages, 
 # enter your App ID below
 # SMOOCHID="########################"
-SMOOCHID="55ba69c672bbe71900c4ee44"
diff --git a/etc/html/minimal/approval.php b/etc/html/minimal/approval.php
deleted file mode 100755
index bc57500..0000000
--- a/etc/html/minimal/approval.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-			

-				
 
-				 
-				  
-					
-							
-								
-							
-							
-
-							
-							
-								
+						
+						
+						
+						
+							
{{LOGTITLE}}

-									
-									{{PROJCLIENT}}
-									
Date: {{NOW}}

-									Project: {{PROJNAME}} ({{PROJCLIENT}}) 

-									Staging URL: {{DEVURL}}

-									Production URL: {{PRODURL}}
-									

-
-									
Proposed commit from {{USER}}

-									{{NOTES}}

-									
-
-					
-						
-							
-							
-							
-						
-					
 Deny  Approve 

-					
-		';
-} elseif ($approved) {
-		echo 'You have approved this commit and it will be deployed soon.';
-} else {
-		echo 'You have denied this commit and it will not be deployed.';
-}
-?>
-								
-								
-								

-									
-										
-							  				
-	
-	
-
-	
-	
-		
-		
-	

diff --git a/etc/html/minimal/approve.html b/etc/html/minimal/approve.html
deleted file mode 100755
index f75aacf..0000000
--- a/etc/html/minimal/approve.html
+++ /dev/null
@@ -1,23 +0,0 @@
-		
Proposed commit from {{USER}}

-			{{NOTES}}

-
-		
-		
-			
-				
-				
-				
-				
-				
-			
-		
 Review  Deny  Approve 

-		

-			
-				
-			  		
-      
-       
-            
-    

diff --git a/etc/html/minimal/client.html b/etc/html/minimal/client.html
deleted file mode 100755
index 36a6a13..0000000
--- a/etc/html/minimal/client.html
+++ /dev/null
@@ -1,30 +0,0 @@
-          
Message:  Updates have been deployed to your website.

-          {{NOTES}}

-          
-          
-          
-            
-              
-            
-          
 Learn More 

-          

-     
-    
-    
-    
-      
-        
-      
-    
-     
-    
-  
-
-
-
diff --git a/etc/html/minimal/digest/commit.html b/etc/html/minimal/digest/commit.html
deleted file mode 100755
index a753414..0000000
--- a/etc/html/minimal/digest/commit.html
+++ /dev/null
@@ -1 +0,0 @@
-

-						  
-
-						
-							
-						
-					

\ No newline at end of file
diff --git a/etc/html/minimal/digest/footer.html b/etc/html/minimal/digest/footer.html
deleted file mode 100755
index 5d22d9a..0000000
--- a/etc/html/minimal/digest/footer.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-							
-							

-								
-									
-										
-										
-								

-											Looking for more? Check out your project's stats page.
-										

-							

-
-					
-						
-							
-						
-					
-			  	

-			

-
-
-
diff --git a/etc/html/minimal/digest/header.html b/etc/html/minimal/digest/header.html
deleted file mode 100755
index 051cbd2..0000000
--- a/etc/html/minimal/digest/header.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-		
-			
-											
-										
-										
-											
+									
+								

-				
 
-				 
-				 	
-					
-					  	
-							
-		
-	

-								
Your Weekly Digest

-								
-								

-								{{WEEKOF}} – {{NOW}}

-								
-								
{{PROJCLIENT}}

-								
-								
-								 
-								

-									

{{SCAN_MSG}} ◢

-
-									

{{UPTIME}}% uptime ◢

-
-									

{{LATENCY}}s latency ◢

-                				

-								 
-
-								
{{GREETING}}

-								
{{ANALYTICSMSG}}
Analytics Chart

-
-								
Here's a summary of code updates made to your website last week:

-								

\ No newline at end of file
diff --git a/etc/html/minimal/digest/mockup.html b/etc/html/minimal/digest/mockup.html
deleted file mode 100755
index 950dd79..0000000
--- a/etc/html/minimal/digest/mockup.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-		
-			
-		
-	

-				
 
-				 
-				 	
-					
-					  	
-							
-						  
-
-						
-							
-						
-					

-								
Your Weekly Digest

-								
-								

-								March 30, 2018 – April 06, 2018

-								
-								
EMRL

-								
-
-								 
-								

-									

Scan passed ◢

-									

100% uptime ◢

-									

1.54s latency ◢

-                				

-								 
-
-								
Happy Monday and welcome back!

-								
You had 215 hits in the last week.

-
-								
Here's a summary of code updates made to your website last week:

-								

-

-commit 8a8dff7 

-Author: Joe Horning 

-Date: Thu, 5 Apr 2018 02:05:46 -0700 (2 days ago) 


-Updated 2 of 2 plugins (advanced-custom-fields-pro 5.6.10, wordfence 7.1.2, wordpress-seo 7.2) and system (wp-core 4.9.5)

-							
-							

-								
-									
-										
-										
-								

-											Looking for more? Check out your project's stats page.
-										

-							

-
-					
-						
-							
-						
-					
-			  	

-			

-
-
-
diff --git a/etc/html/minimal/digest/scan-pass.png b/etc/html/minimal/digest/scan-pass.png
deleted file mode 100755
index 4974672a415771b5e3a05a946a1e1870fd2fc1aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2132
zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt
zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre
z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V
z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh
zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa
zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec
zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY
z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y
z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A
zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn
zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP
zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf;
zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q
z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu
zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv
z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO
zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E
z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~
zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t
z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi-
z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9
zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM
z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm
z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml
z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O
zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z(
z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J
zVrAsF0Y(IWSfehi@f10wLt5&!@I

diff --git a/etc/html/minimal/digest/speed.png b/etc/html/minimal/digest/speed.png
deleted file mode 100755
index 551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3155
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
VCxh58{^z{{40Q22)mn~`{|BIsV&nh-

diff --git a/etc/html/minimal/digest/wrap.html b/etc/html/minimal/digest/wrap.html
deleted file mode 100755
index cae2bc8..0000000
--- a/etc/html/minimal/digest/wrap.html
+++ /dev/null
@@ -1 +0,0 @@
-								

-			
-			
-				
-						
-						
-					

\ No newline at end of file
diff --git a/etc/html/minimal/error.html b/etc/html/minimal/error.html
deleted file mode 100755
index 73087db..0000000
--- a/etc/html/minimal/error.html
+++ /dev/null
@@ -1,19 +0,0 @@
-					
ERROR: 
-					{{NOTES}}

-
-					
-					
-						
-							
-						
-					
-					  
-				

-					
-						
-							
-									
-					  			

diff --git a/etc/html/minimal/footer.html b/etc/html/minimal/footer.html
deleted file mode 100755
index ec82169..0000000
--- a/etc/html/minimal/footer.html
+++ /dev/null
@@ -1,24 +0,0 @@
-											

-										

-					  		

-					
-					
-						
-							
-						
-					
-			  	

-			

-
-
diff --git a/etc/html/minimal/header.html b/etc/html/minimal/header.html
deleted file mode 100755
index c022d06..0000000
--- a/etc/html/minimal/header.html
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-		
-			
-		
-	

-				
 
-				 	
-					
-					  	
-							
-		    
-		  		
-		
{{LOGTITLE}}

-								
-								
-								{{PROJCLIENT}}
-								
-								
Date: {{NOW}}

-								Project: {{PROJNAME}} ({{PROJCLIENT}})

-								Staging URL: {{DEVURL}}

-								Production URL: {{PRODURL}}
-								

-								
Uptime: {{UPTIME}}% ◢

-								
Latency: {{LATENCY}}s ◢

-								
\ No newline at end of file
diff --git a/etc/html/minimal/remote/backup.png b/etc/html/minimal/remote/backup.png
deleted file mode 100755
index 91e60ff48cf06c909d83647d29c56992a9f3b333..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2056
zcmb7Fi#yYc8~^TNE^Qdn@N+qvP#ts2CD&oOP|P-aWHu32)+%+L7~&ig#?`*}Xk=lMME^L(E7dEWeEf!+ueT@?TT
z5WYV6pdIA=+e)yV8T2keaR+orhY6(Mq_ZSS)TLO!JtiqS*2wol6frg^HYz6lVo$6y
z04V;>@c_x~=$py$JG+J!Hv=hyeFHH%JG=iw5oYG*>i0Cbn*U>PC?Huq
zs-P}IIREnkq2t;5CbqBBcG%4gyOp^r{qXXTc_AoTBg6jPxBaA6ikb}5n;h^4HGG<0
z{D20k(B7(7k+*=jl4yE93SAb(8|DIvy`!CC=kO~k_5QyV#NoRf`IiP8J|Vr_)W07gr-%c5Nl5p65S
z6=Yn{L(`56DNjZv_tvg;%edvGd$n6NrE9Y*2Oi*w1}f9M>~&UmrkCtyaJAwECwNiQ
zdTheBs*9vQ;#_BZ5c6P{1<#Nv3`OOU&e1{YZYCUnZm4+-!oRbOk#|}R*_nXxW^#~1
z(wXjuQWS)b$Ewke4b~Cdl20ouz6(PY)r052t!BrCt)T`C2
zBd3}!yAz%DN?}7|r@S&ntkQ8OXu5}p$UA_zukLz;Wh6I`=B~A{OTi0A+ru=s2@;5B
zRb2DaNn0edZEDZN^)>ykC5?Us2&^#BL}eODm!so9oz6Gw>Uga^;=gn#SG;Fg8!z}r
zG4q#=|Mf<02IX66mIzY}qG;QO4fM?Wao0yZQWx}oc;T
    s>n;YnsaGkZj?5iGKF
z*SDk>Uarfn3rfte^Wib@h!a_*Bgc##7#nx9ML3=$Z(;9pvmi?>ve#C|hO=;fw+B;g
z(nhf=UjE7RXocwIv7fqL@zutnsz~K91g@FEvffIim@~$;1q|C{6q!T=7Y*4yCFs
z`!H=PPyf}y&E}AAN$rEnr-Fk#B?@7_0
zx%n}kZ^0wJe#xn)tD0a`!`OD2y9?yH+=mIQ0ryn_`A)UDD(=-Om&;_o6{>hCx
z{fV%l9|c&^OQ@H+xj>QtJZSImlR83e!Dz~~
z6fWtT>Px%Vw2w@fUXb?&*Yz#9vT|#{s43gsp@G?N7Zjge{9F$M2rM?iJakBVs>Brr
z3|{5|I4Dz}bHG};5X2#Cae%3EH%lO`wgAMjae)Jsb97K`3nVR93HXdy^0A>2A$@VM
zr39KzKahwRTJ?PoSZQ&~fN(vU2g=#n6ig$Y6(E>opvHab+NE@Kf=33;=DE4v)B!PQ
zpzOIWZkSnY2eP1lIynkPDsTcM7TZ7Cau8y0V4AE8Xp0n;{RvX^pJV_$;yA1@7_0gU
zJ81?#QVpPHQl)uh3x0U4e_?jSDW~-(851dq0Acs`m+XCdY7`}tw4TeA25PB?ULB;K
zQE8#oJWs@>MBOtSOK~7}d74qzLiG3QLj(v~K{W4Y^r#I&2=CEOo
z@w<&Yj6ZHHoe(~yKnV<}CmMvu%748e5=;PP0D9(p^LUEhMg}#=C(n3yTTTCW8dpPq
z|IB~N_8v8S;SAyzt%hh&&5@_~X^=X_uHi0~3N0neCr>pOjc(nBVlFGQ{VJ6Y{!EuA
zl;*IJkUHgWp?gT_uF1GW(xdUo={%YEE32X)nVfdw7>4y}b9gPQMmE$DXPHfpd{qq^
zM9j~wbgrboAFrH+Hw78rummsm5OO0&HUgGw-EzI4`-%takxX+T`z+0#5o^WUM+QHf
zUVlvP`Kuws^a$ix6s-07it6*CoK=ffiA`nIGtdaC`oS+kLPw$1EAOAamal#hge(pJ
ynN{xm@z!fzg(LbB*M6)9@*f@~0O0?og5f||NgoB{^0fG0tMB1Je1pg7oc{yjh@kBN

diff --git a/etc/html/minimal/remote/backup.svg b/etc/html/minimal/remote/backup.svg
deleted file mode 100755
index b677891..0000000
--- a/etc/html/minimal/remote/backup.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-	
-	
-
-
diff --git a/etc/html/minimal/remote/index.html b/etc/html/minimal/remote/index.html
deleted file mode 100755
index ce60ec6..0000000
--- a/etc/html/minimal/remote/index.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-			
-		
-	
    
-				
     
-				 
-				 	
-					
-					  	
-							
-						  
-					
    
-								
    About Your Weekly Digest
    
-								
-								
-								
    Hey there!
    
-								
-								
    If you found this page, you must have received a weekly digest about your website! That's part of our ongoing effort to be as transparent as possible and let our clients in on the stuff that happens with their website development and maintenance.
    
-								
-								
    Every time we update your code, it is "committed" to a development system where it is stored, tracked, and logged. That way, if anything ever breaks, we can easily diagnose how things went wrong. This is an industry-standard approach to software development, and if you're feeling nerdy you can learn more about it on Wikipedia.
    
-
-								
    The weekly digest will include notes on code changes we have made at your request, as well as system updates and security patches.
    
-
-								
    Scheduled Updates & Maintenance
    
-								
    Security Patches: Every Sunday & Thursday at 2:00am
    
-								
    System Updates: Every Sunday & Thursday at 2:00am
    
-								
    
-								 Off-site Backup: Every Sunday at 3am
    
-
-								
    Any Questions?
    
-								
    If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!
    
-								
-								
-									
-										
-									
-								
-								
-							
    
-
-					
-						
-							
-						
-					
-			  	
    
-			
    
-
-
-
-
diff --git a/etc/html/minimal/remote/nolog.html b/etc/html/minimal/remote/nolog.html
deleted file mode 100755
index 52969a2..0000000
--- a/etc/html/minimal/remote/nolog.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-			
-		
-	
    
-				
     
-				 
-				 	
-					
-					  	
-							
-						  
-					
    
-
-							
-
-								
-								
-								
    Darn it, there doesn't appear to be a logfile for that commit.
    
-
-								
    If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!
    
-								
-								
-									
-										
-									
-								
-								
-							
    
-
-					
-						
-							
-						
-					
-			  	
    
-			
    
-
-
-
-
diff --git a/etc/html/minimal/remote/scan.png b/etc/html/minimal/remote/scan.png
deleted file mode 100755
index 4974672a415771b5e3a05a946a1e1870fd2fc1aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2132
zcmah~cTkgg8vZ^)LcmZWQgad@iVDgC7EnrHB?1Z(B6Sy}tW*USL|7oi7(qe$M%Drt
zR6xo}KLrsIFccf1SQ6j}!GZ|V1VTx^Ts;4{o4cFacjhhgJkR{*o%y}h4vGre
z3IG5oIyu^tq?z^2kqBudjh>N{CapMvcif5Skhp}v*kHi!RCG|Vu2W=SXfP=_@Kj>V
z(_kwAkXv!Gw{!n(c&1noIpV02cJ09?qWoipK5z*i2hTUE^R=5%h^=D9!#xetNf)Lh
zGJRehm9p{U?}m>Rja%gWWlutA2vb=_R#qMt!yid(^d((ZDhW_J2&aO82>>9zb)^Xa
zFo63p{Y2iaEO!=<*TOZtYWdXxqQ+9t+HKBec
zV>hkKqDl_&duTQwtfEg?Um~SHf3;4LLFn>_b_4*6e^y$qQE-np-t!8bvLYAC>aafpCxO%OGm0v@MbOZ~;?$`&BKL6xgNSeu*qu_R@EY
z0QRQ*SVmlpSQO{*9a=$mp?rb9p!&HmP0KczL6p~M`%Lz)0Nt163y6ZkUSS%>mLP>y
z+bhYr;Crc9MNs%csA)@K5QDe0t$hbQ5CRSQoGDdgbNlE{(Zr%PB9FhrT^`ZQ{m$>A
zV8-1t*#~PX3dyS~#!ZC=w4KENq$8M$`^iTfCFbrIk8DLFkCqw898Abn
zGNHPEA%X$UP^pZCkg9a$gZHC&l4i+aIeXp8VXeOdLsLxzxesVhD*N;f4`o|5T`2vP
zvmvZs?rM*N;>`}gL|qZF$~fPD*lmq(&Qw*rd0U3c=J7q@pIQ@9M0G|}n8AmFadkf;
zSQ@^)4CJc1AAzFv-%FA+5xNNUd3JajQnvm^_~219*piEjgPIBUyy!JQiO<7_b@{^Q
z$qokP2Zze@U;R^UAHJ;;?3}eZ(9O%jyQHoTm5o^!z00Xni`9c12aYI7+u|0A#g8Pu
zcMrsBQf*i|XYUU?Mp5h71XM%UB(lf5+!uP`16uhHWZhWZdp72lguY!n)YNt^&L8wv
z3|hf{q8U6hv8~C$-r+#mnTc5#2L9Lr@wI_A;K|XJw?H)i-ULTKHZ??iy?B@WO
zDym@=t`91lP*m|QF;Z)kq-6@Lf6(vtO$9rh`}Iu+CTejZl7dv8KM7u<&^!6;i=agIkt=E
z9|6})0&A2;GHr_4Hm*frC#s{XUL<|qfq@BcWWG`uZ<+PSoVs2RjlRn<$f|q-w0c~~
zxnwatGk47@7pJpmCcK4>R10X1Y#`)3?ZVITjrDaJUY={c8v&E;3s0wC;d9o#(8|0t
z(>Tp>AttCsJ*+@X2Wrph2FT8dKAIp=!vhUN^*%FoRzCfz@;C6-VXAgT_qBXi-
z1Oj*RmU#TyW%GPxBb)WGYT)pei2O5g3mhCazD#euVlUw4n6}zgyIyg?w)uMO6*A$9
zB%JnpQpfY7aLrjv2{vyBlvbJowUTz}I5J~Rhm3nq?(?|wb^pvX_Fd81Xl;WTcITTM
z&P`t|*H4sy%aGXpJZm0Ey-%T*uSPCxEQ^_bqvxP6?#|hbipQ%wr?84MljZ21g15%dn@exm
z%%)%4mHvt%YvxUNcHuFmbIQIyqnY>2cGBwKwDg!osR=A|Ti7kx=c_JOHYWzW1Olml
z)TnfB^_A#Dv}EdAXO$#cOQ1kGA$q?&WJ#YeKMg!LK*mfO3WR1x6gv7-fkjiDz6e_O
zO1G?JGwXI!=q~e^gKM4@PSsmO$daoF$;DUnRP2}0!3ftF^ry7mOVhGm8HA?X@Y6z(
z734F)5iL2FZ)W>D!+#sF7;`e~c&?yQ_1fpo$CdpH4DaU7OmOU$Pft5(-58d-$(v#J
zVrAsF0Y(IWSfehi@f10wLt5&!@I

diff --git a/etc/html/minimal/remote/scan.svg b/etc/html/minimal/remote/scan.svg
deleted file mode 100755
index e5aad72..0000000
--- a/etc/html/minimal/remote/scan.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/etc/html/minimal/remote/speed.png b/etc/html/minimal/remote/speed.png
deleted file mode 100755
index 551522ea45ca35d02a6a8b7f9d3a5b4fa79c46ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3155
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
-
-
-
-
-
-
-
diff --git a/etc/html/minimal/remote/uptime.png b/etc/html/minimal/remote/uptime.png
deleted file mode 100755
index 158e8a40e23f3ede2c5cb6ff3811007bf99cfaf1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3468
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
VCxh58{^z{{40Q22)mn~`{|BIsV&nh-

diff --git a/etc/html/minimal/remote/uptime.svg b/etc/html/minimal/remote/uptime.svg
deleted file mode 100755
index 0a98f23..0000000
--- a/etc/html/minimal/remote/uptime.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
diff --git a/etc/html/minimal/remote/warning.png b/etc/html/minimal/remote/warning.png
deleted file mode 100755
index 741aba5532000142c6da9a9e0b09fc65ee8eb879..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1857
zcma)5eK^zW8~<*IO?J(@pO>0cb0l&ozlm*5mY8=crSh`rWh!qWrA(c}*h(zNs>4DZ
zZ;?fbDT-O^crBf?Xk=nKF{T&a8r%8m_xJC*&U0PQb3fPp+|PaApU>xca)ScA^^oRB
z008uSc6o(Bwqs@Ltb*2%H^;Rh^Pf|s@Kd4jhfk$NC&dDu)cBZKjL(VaBe5Z|(bV)r
zQLH-vteWug@(epYJR^~uu<$k#C?=m04;_R{JP%~;zVI^34IK)5mE{|R@X@XAkasvd
zxqH5_rNfSA_2iFbPD#E}sc|7nR9H3cv6vw58~kF0=8PK90RRr@02tu^Zk*G<$(ohp
zy}s`zq7e6t)rtjqC)nSdlNL#cFh-$sKTghm22&qcYND%^V+Teh=NHRH6ch}7i$r}r
zKMT12LA67cSv@kw;$HMmXcQ3IM%6Bl<(avT#m%n8dJ5B80c`)fPfY1tcYle!q4rUp
za;;FFsTa>8;fQhW>%X;Q=u*DA;r%(n1bNhgX+R{q%Rg;}oUQ7HY7YnS#RPc20a5<|
ztn4lgHDe~xYjAgMRrSdM42`fi%b9bk?XxYvjyFwv*FJ~Qq-6thTJT+?%Q*$I-t4i3
z!%L+YdV++jize=ts2@jc`|_LA7ViVxHdP0KX^6}&3Fu4&NcU1_aKG?uVMZg%IsS9A
zD1vWBA&@t#+N`pNcTgACx~WSK?#oEBIe<76xfIv0v=`v4Q9+uOs|D&d>(u>MHK?;H
zq5K<%V%LSm5x1>zUj=6jL#g5svg9r-0;8M1Mi=Hat0Ge_SEIR2h|xMQ`I1NF7L!SU
zpWx5{^828C4LcUcew^YU6+WmdEbaUPpgdJw_x-|p`g}=|F1q7)2*Rc~s8w)1?D(Fg
z9phuW!2tml5oPFWbv7W{-WRA{Ve(NOxEIY`Pk$vDnTNS|xX)N>Ms{hS||L>E^)nWqd6z^iPhIC=95
z(KPDq)1djSI-BT72$GH!cjltWiUc%uc|H2dM7fiBCm%4;BX6Y6c=-L3gQ08YZ=F8bV=O^&MZ&sDr5_%$>F
zHjJ;)l%8VH!W#_>2#>CDWNh}gM0g#=G3F*R>-9c^H
zDZ^L&GO)UmMA(@EPy(rSS;rygl!~_e`q8Q8&gUs-keCYuhYz39T(k$43m%!=(;@cg
z6ACutUmvkmmCZ|f^$F}rIU8r$AvSa@h_!F6g`{wLB3FnWSwWGcSI5vw(!}C<*Js;l$so#9FSZm-u9&>q@U`in}
za?E0R6y){B#f8Ei-mo!f{3^jJUl=2A-Qo2@G%-rVF8J5+VbFJG;$j@PF#}Id0^Oxz
zc5l6Noe7;|^CQnEBS}{~L15bQ-y_B=jz%|pdU)`X>JH8~>J@iimsJUKZ1XZ=0tO2R*MTPYJ2LT;&Jc0-SFhCPP1OIvx
ctMI480Ik2ZH{1{p`2o=IAq9BV{}grMALYMgvH$=8

diff --git a/etc/html/minimal/report/css/print.css b/etc/html/minimal/report/css/print.css
deleted file mode 100755
index 65433c5..0000000
--- a/etc/html/minimal/report/css/print.css
+++ /dev/null
@@ -1,7 +0,0 @@
-table tr {
-	border-bottom: solid 1px black;
-}
-#hiderow,
-.delete {
-    display: none;
-}
\ No newline at end of file
diff --git a/etc/html/minimal/report/css/style.css b/etc/html/minimal/report/css/style.css
deleted file mode 100755
index 37999dc..0000000
--- a/etc/html/minimal/report/css/style.css
+++ /dev/null
@@ -1,228 +0,0 @@
-* {
-    margin: 0;
-    padding: 0;
-}
-body {
-    font: 14px/1.4 Arimo, sans-serif;
-}
-#page-wrap {
-    width: 800px;
-    margin: 6px auto;
-}
-textarea {
-    border: 0;
-    font: 14px Arimo, sans-erif;
-    overflow: hidden;
-    resize: none;
-}
-table {
-    border-collapse: collapse;
-}
-table td,
-table th {
-    border: 1px solid black;
-    padding: 5px;
-}
-table thead {
-    display: table-header-group;
-}
-table tr {
-    page-break-inside: avoid;
-    page-break-after: auto;
-}
-#header {
-    height: 15px;
-    width: 100%;
-    margin: 20px 0;
-    background: #222;
-    text-align: center;
-    color: white;
-    text-decoration: uppercase;
-    letter-spacing: 20px;
-    padding: 8px 0px;
-}
-#address {
-    width: 250px;
-    height: 150px;
-    float: left;
-}
-#customer {
-    overflow: hidden;
-}
-#logo {
-    text-align: right;
-    float: right;
-    position: relative;
-    margin-top: 25px;
-    border: 1px solid #fff;
-    max-width: 540px;
-    max-height: 100px;
-    overflow: hidden;
-}
-#logo:hover,
-#logo.edit {
-    border: 1px solid #000;
-    margin-top: 0px;
-    max-height: 125px;
-}
-#logoctr {
-    display: none;
-}
-#logo:hover #logoctr,
-#logo.edit #logoctr {
-    display: block;
-    text-align: right;
-    line-height: 25px;
-    background: #eee;
-    padding: 0 5px;
-}
-#logohelp {
-    text-align: left;
-    display: none;
-    font-style: italic;
-    padding: 10px 5px;
-}
-#logohelp input {
-    margin-bottom: 5px;
-}
-.edit #logohelp {
-    display: block;
-}
-.edit #save-logo,
-.edit #cancel-logo {
-    display: inline;
-}
-.edit #image,
-#save-logo,
-#cancel-logo,
-.edit #change-logo,
-.edit #delete-logo {
-    display: none;
-}
-#customer-title {
-    font-size: 20px;
-    font-weight: bold;
-    float: left;
-}
-#meta {
-    margin-top: 10px;
-    width: 300px;
-    float: right;
-}
-#meta td {
-    text-align: right;
-}
-#meta td.meta-head {
-    text-align: left;
-    background: #eee;
-}
-#meta td textarea {
-    width: 100%;
-    height: 20px;
-    text-align: right;
-}
-#desc {
-    margin-top: 10px;
-    width: 400px;
-    float: left;
-}
-#items {
-    clear: both;
-    width: 100%;
-    margin: 30px 0 0 0;
-    border: 1px solid black;
-    -webkit-box-decoration-break: clone;
-    box-decoration-break: clone;
-}
-#items th {
-    text-align: left;
-    background: #eee;
-}
-#items textarea {
-    width: 80px;
-    height: 50px;
-}
-#items tr.item-row td {
-    border: 0;
-    vertical-align: top;
-}
-#items td.description {
-    width: 70%;
-}
-#items td.item-name {
-    width: 18%;
-}
-#items td.description textarea,
-#items td.item-name textarea {
-    width: 100%;
-}
-#items td.total-line {
-    border-right: 0;
-    text-align: right;
-}
-#items td.total-value {
-    border-left: 0;
-    padding: 10px;
-}
-#items td.total-value textarea {
-    height: 20px;
-    background: none;
-}
-#items td.balance {
-    background: #eee;
-}
-#items td.blank {
-    border: 0;
-}
-#terms {
-    text-align: center;
-    margin: 40px 0 0 0;
-}
-#terms h5 {
-    text-transform: uppercase;
-    font: 13px;
-    letter-spacing: 10px;
-    border-bottom: 1px solid black;
-    padding: 0 0 8px 0;
-    margin: 0 0 8px 0;
-}
-#terms textarea {
-    width: 100%;
-    text-align: center;
-}
-textarea:hover,
-#items td.total-value textarea:hover,
-#items td.total-value textarea:focus, 
-div.editable:hover {
-    background-color: none;
-    outline: none !important;
-    border-bottom: none;
-    box-shadow: inset 0 -1px 0px 0px #E6E6E6;
-}
-textarea:focus,
-div.editable:focus {
-    outline: none !important;
-    box-shadow: inset 0 -1px 0px 0px #bbb; 
-}
-.delete:hover {
-    color: #ffffff;
-}
-.delete-wpr {
-    position: relative;
-}
-.delete {
-    display: block;
-    color: #000;
-    text-decoration: none;
-    position: absolute;
-    background: #EEEEEE;
-    font-weight: bold;
-    padding: 0px 3px;
-    border: none;
-    top: 0px;
-    left: -22px;
-    font-size: 12px;
-}
-.editable {
-    outline: none;
-}
diff --git a/etc/html/minimal/report/footer.html b/etc/html/minimal/report/footer.html
deleted file mode 100755
index d6d3ffb..0000000
--- a/etc/html/minimal/report/footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-		  
-		  
Add a row

-		
-		

-		  
Thank you

-		  EMRL • 1020 Tenth Street • Sacramento, CA 95814 • (916) 446-2440 • support@emrl.com
-		

-	

-
-
-
diff --git a/etc/html/minimal/report/header.html b/etc/html/minimal/report/header.html
deleted file mode 100755
index e6e0b1f..0000000
--- a/etc/html/minimal/report/header.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-	
-	Monthly Maintenance Report for {{PROJCLIENT}}
-	
-	
-	
-	
-	
-	
-
-
-
-	

-		

-		{{LASTMONTH}} maintenance report for
-		

-			
{{PROJCLIENT}}

-				
-			

-
-			

-				

-					This report for the month of {{LASTMONTH}} includes notes on system updates, security patches, and other code changes on {{PRODURL}}
-				

-			

-
-			
-				
-					
-					
-				
-
-				
-					
-					
-				
-			
Ref. #
Date

-		

-
-		
-			
-				
-					
-					
-				
-			
-			
diff --git a/etc/html/minimal/report/js/edit.js b/etc/html/minimal/report/js/edit.js
deleted file mode 100755
index cf95d27..0000000
--- a/etc/html/minimal/report/js/edit.js
+++ /dev/null
@@ -1,139 +0,0 @@
-function print_today() {
-  // ***********************************************
-  // AUTHOR: WWW.CGISCRIPT.NET, LLC
-  // URL: http://www.cgiscript.net
-  // Use the script, just leave this message intact.
-  // Download your FREE CGI/Perl Scripts today!
-  // ( http://www.cgiscript.net/scripts.htm )
-  // ***********************************************
-  var now = new Date();
-  var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-  var date = ((now.getDate()<10) ? "0" : "")+ now.getDate();
-  function fourdigits(number) {
-    return (number < 1000) ? number + 1900 : number;
-  }
-  var today =  months[now.getMonth()] + " " + date + ", " + (fourdigits(now.getYear()));
-  return today;
-}
-
-// from http://www.mediacollege.com/internet/javascript/number/round.html
-function roundNumber(number,decimals) {
-  var newString;// The new rounded number
-  decimals = Number(decimals);
-  if (decimals < 1) {
-    newString = (Math.round(number)).toString();
-  } else {
-    var numString = number.toString();
-    if (numString.lastIndexOf(".") == -1) {// If there is no decimal point
-      numString += ".";// give it one at the end
-    }
-    var cutoff = numString.lastIndexOf(".") + decimals;// The point at which to truncate the number
-    var d1 = Number(numString.substring(cutoff,cutoff+1));// The value of the last decimal place that we'll end up with
-    var d2 = Number(numString.substring(cutoff+1,cutoff+2));// The next decimal, after the last one we want
-    if (d2 >= 5) {// Do we need to round up at all? If not, the string will just be truncated
-      if (d1 == 9 && cutoff > 0) {// If the last digit is 9, find a new cutoff point
-        while (cutoff > 0 && (d1 == 9 || isNaN(d1))) {
-          if (d1 != ".") {
-            cutoff -= 1;
-            d1 = Number(numString.substring(cutoff,cutoff+1));
-          } else {
-            cutoff -= 1;
-          }
-        }
-      }
-      d1 += 1;
-    } 
-    if (d1 == 10) {
-      numString = numString.substring(0, numString.lastIndexOf("."));
-      var roundedNum = Number(numString) + 1;
-      newString = roundedNum.toString() + '.';
-    } else {
-      newString = numString.substring(0,cutoff) + d1.toString();
-    }
-  }
-  if (newString.lastIndexOf(".") == -1) {// Do this again, to the new string
-    newString += ".";
-  }
-  var decs = (newString.substring(newString.lastIndexOf(".")+1)).length;
-  for(var i=0;i');
-    if ($(".delete").length > 0) $(".delete").show();
-    bind();
-  });
-  
-  bind();
-  
-  $(".delete").live('click',function(){
-    $(this).parents('.item-row').remove();
-    update_total();
-    if ($(".delete").length < 2) $(".delete").hide();
-  });
-  
-  $("#cancel-logo").click(function(){
-    $("#logo").removeClass('edit');
-  });
-  $("#delete-logo").click(function(){
-    $("#logo").remove();
-  });
-  $("#change-logo").click(function(){
-    $("#logo").addClass('edit');
-    $("#imageloc").val($("#image").attr('src'));
-    $("#image").select();
-  });
-  $("#save-logo").click(function(){
-    $("#image").attr('src',$("#imageloc").val());
-    $("#logo").removeClass('edit');
-  });
-  
-  $("#date").val(print_today());
-  
-});
diff --git a/etc/html/minimal/scan/footer.html b/etc/html/minimal/scan/footer.html
deleted file mode 100755
index c392ea8..0000000
--- a/etc/html/minimal/scan/footer.html
+++ /dev/null
@@ -1,20 +0,0 @@
-							
-						  
-					
ItemDescription
Item ID
X
Description

-
-					
-						
-							
-						
-					
-			  	

-			

-
-
-
diff --git a/etc/html/minimal/scan/header.html b/etc/html/minimal/scan/header.html
deleted file mode 100755
index 2a8c822..0000000
--- a/etc/html/minimal/scan/header.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-			
-											
-											
-											
+						
 
-								
-								
		
-									

-				
 
-				 
-				 	
-					
-					  	
-							
-						
-
-						
-							
-	  		
-	  		
-			
-				" >> "${statFile}"
+    echo "" >> "${stat_file}"
   fi
 
   trace "git log --all --no-merges --first-parent --before=\"${current_year}-${current_month}-1 00:00\" --after=\"${previous_year}-${previous_month}-${last_day} 00:00\" --pretty=format:\"\""
-  git log --all --no-merges --first-parent --before="${current_year}-${current_month}-1 00:00" --after="${previous_year}-${previous_month}-${last_day} 00:00" --pretty=format:"" >> "${statFile}"
+  git log --all --no-merges --first-parent --before="${current_year}-${current_month}-1 00:00" --after="${previous_year}-${previous_month}-${last_day} 00:00" --pretty=format:"" >> "${stat_file}"
 
   # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know.
-  if [[ ! -s "${statFile}" ]]; then
-    echo "" > "${statFile}"
+  if [[ ! -s "${stat_file}" ]]; then
+    echo "" > "${stat_file}"
   fi
 
   # Compile full report 
-  cat "${stir_path}/html/${HTMLTEMPLATE}/report/header.html" "${statFile}" "${stir_path}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/report/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}"
 
   # Filter and replace template variables
   process_html
diff --git a/lib/reset.sh b/lib/reset.sh
index 821607e..33612f1 100644
--- a/lib/reset.sh
+++ b/lib/reset.sh
@@ -41,8 +41,8 @@ function reset_local() {
 }
 
 function remove_local_files() {
-  mv "${project_config}" /tmp/"${APP}"-stir.sh &>> "${logFile}"
-  rm -rf ${WORKPATH}/${APP}/* &>> "${logFile}" 
-  rm -rf ${WORKPATH}/${APP}/.* &>> "${logFile}"
-  mv /tmp/"${APP}"-stir.sh "${project_config}" &>> "${logFile}"
+  mv "${project_config}" /tmp/"${APP}"-stir.sh &>> "${log_file}"
+  rm -rf ${WORKPATH}/${APP}/* &>> "${log_file}" 
+  rm -rf ${WORKPATH}/${APP}/.* &>> "${log_file}"
+  mv /tmp/"${APP}"-stir.sh "${project_config}" &>> "${log_file}"
 }
diff --git a/lib/rss.sh b/lib/rss.sh
index fec49d4..61c53e5 100644
--- a/lib/rss.sh
+++ b/lib/rss.sh
@@ -13,7 +13,7 @@ function get_rss() {
 	# Pull RSS feed
 	"${curl_cmd}" --silent "${NEWS_URL}" > /tmp/${APP}.xml; error_check
 	# Strip CDATA stuff
-	"${xmlstarlet_cmd}" fo --omit-decl --nocdata /tmp/${APP}.xml > ${statFile}
+	"${xmlstarlet_cmd}" fo --omit-decl --nocdata /tmp/${APP}.xml > ${stat_file}
 	# Clean up mess
 	rm /tmp/${APP}.xml
 }
@@ -24,7 +24,7 @@ function next_xml() {
 }
 
 function process_xml() {
-	cat ${statFile} | while next_xml ; do
+	cat ${stat_file} | while next_xml ; do
 		case $TAG in
 			'item')
 				title=''
@@ -62,29 +62,29 @@ function create_rss_payload() {
 		return
 	else
 		get_rss
-		process_xml > ${trshFile}
+		process_xml > ${trash_file}
 
 		# Clean up output
-		sed -i 's/\xc2\x91\|\xc2\x92\|\xc2\xa0\|\xe2\x80\x8e//g' "${trshFile}"
+		sed -i 's/\xc2\x91\|\xc2\x92\|\xc2\xa0\|\xe2\x80\x8e//g' "${trash_file}"
 
 		# Centos doesn't have the inplace option 
-		# awk -i inplace '{gsub(/’/, "'"'"'");print}' "${postFile}"
-		awk '{gsub(/’/, "'"'"'");print}' "${trshFile}" > "${postFile}"
+		# awk -i inplace '{gsub(/’/, "'"'"'");print}' "${post_file}"
+		awk '{gsub(/’/, "'"'"'");print}' "${trash_file}" > "${post_file}"
 
 
 		sed -r -i -e '/
The post /d' \
 			-e "s/&#160;/\ /g" \
 			-e "s/&#8230;/\.../g" \
-			"${postFile}"
+			"${post_file}"
 
 		# Escape quotes
-		sed -i "s/'/\'/g" "${postFile}"
+		sed -i "s/'/\'/g" "${post_file}"
 
 		# Remove newlines
-		sed -i ':a;N;$!ba;s/\n//g' "${postFile}"
-		sed -i -e :a -e '$!N;s/\n[[:blank:]]\{1,\}/ /;ta' -e 'P;D' "${postFile}"
+		sed -i ':a;N;$!ba;s/\n//g' "${post_file}"
+		sed -i -e :a -e '$!N;s/\n[[:blank:]]\{1,\}/ /;ta' -e 'P;D' "${post_file}"
 
-		# empty_line; cat "${postFile}"
-		RSS_NEWS="$(<${postFile})"
+		# empty_line; cat "${post_file}"
+		RSS_NEWS="$(<${post_file})"
 	fi
 }
diff --git a/lib/scan.sh b/lib/scan.sh
index 1ef95ca..f3f1d2e 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -56,27 +56,27 @@ function scan_host() {
   trace "Scanning ${PRODURL}..."
   # Spinners commented out for now, causing issues when running from a crontab
   if [[ -z "${NIKTO_PROXY}" ]]; then
-    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" #&
+    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scan_file}" #&
     #spinner $!
   else
-    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scanFile}" #&
+    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scan_file}" #&
     #spinner $!
   fi
 
   # For testing only
-  cp "${scanFile}" ~/verbose_scan.txt
+  cp "${scan_file}" ~/verbose_scan.txt
 
   # Create and clean up the log
-  sed -i -e 's/^.*Running/Running/' "${scanFile}" \
+  sed -i -e 's/^.*Running/Running/' "${scan_file}" \
     -e 's/^.*Loaded/Loaded/' \
     -e '/^V\:/d' \
     -e '/^Running average\: Not enough data/d' \
     -e "s/: currently in plugin 'Nikto Tests'//" \
-    "${scanFile}"
+    "${scan_file}"
   
   # Strip redirects, can get very spammy on a Wordpress project
-  sed -i '/Redirects (301) to/d' "${scanFile}"
-  cat "${scanFile}" >> "${logFile}"
+  sed -i '/Redirects (301) to/d' "${scan_file}"
+  cat "${scan_file}" >> "${log_file}"
 
   # Here's what we need to do to get the HTML ready. Ouch.
   sed -i '/

-								
Site Scan BETA

-								
-								
-								
Report generated {{NOW}}

-								
{{PROJNAME}} 
-								({{PRODURL}})
-								

-								
-								
{{PROJCLIENT}}

-								
-
-								
{{SCAN_RESULT}}

-							

\ No newline at end of file
diff --git a/etc/html/minimal/stats/index.html b/etc/html/minimal/stats/index.html
deleted file mode 100755
index 93081a1..0000000
--- a/etc/html/minimal/stats/index.html
+++ /dev/null
@@ -1,285 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-
-	
-		
-			
-		
-	

-				
 
-				 
-				 	
-					
-					  	
-							
-						
-
-						
-						
-							
-						
-
-						
-							
-						
-						
-
-
-						
-							
-						  
-					

-								
Site Smart BETA

-								
-								
-								
Report generated {{NOW}}

-								
{{PROJNAME}} 
-								({{PRODURL}})
-								

-								
-								
{{PROJCLIENT}}

-								
-
-								
Overview (last 7 days)

-								 
-								

-									

{{SCAN_MSG}} ◢

-
-									

{{UPTIME}}% uptime ◢

-
-									

{{LATENCY}}s latency ◢

-
-									

{{LAST_BACKUP}} ◢

-                				

-								
-							

-								
-								
-									
-										
-									
-								
-								
-							

-								
-								
-									
-										
-									
-								
-								
-							

-								
Commits by day of week

-								

-
-								
Commits by hour of week

-								

-
-								
Commits by hour of day

-								

-
-								
Commits by month of year

-								

-
-								
Commits by year

-								

-
-								
Commits by year/month

-								

-								

-
-								

-								
-								
-								

-
-								
Any Questions?

-								
If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

-								
-								
-									
-										
-									
-								
-								
-								

-							

-
-					
-						
-							
-						
-					
-			  	

-			

-
-
-
diff --git a/etc/html/minimal/success.html b/etc/html/minimal/success.html
deleted file mode 100755
index 53fc33b..0000000
--- a/etc/html/minimal/success.html
+++ /dev/null
@@ -1,20 +0,0 @@
-					
Commit {{COMMITHASH}} by {{USER}}
-						
Notes: {{NOTES}}
-		  			

-					
-					
-						
-							
-						
-					
-					
-				

-					
-						
-				  			

diff --git a/img/dashboard.png b/img/dashboard.png
new file mode 100755
index 0000000000000000000000000000000000000000..dd71837b28170f483c6a7410adb0a6696832dd13
GIT binary patch
literal 121356
zcmcG#WmH_-(kM!jO%g05xC9LnTpHH|cXzjLoCX@#5CQ}b?hxD|SVN=1-J#LO-QDGp
zz0W!K{dnIu#=G}^YxEdhy;fDtvRQLh&DFt53X&M8M5steNEp&mVk$^T$nTJlUdX(D
z{&Xk$I$h%Fi_l42%Sjasa&k3x1R{Ml1DgQJrEQJPfhs^_Gk1qxpuiIarKOsdla{<3
zpDEau+4v6*vzx8`6EzZ&fUujrv8grCiQEKeZfPe-dDzfGNp5K-NU6yw&nj;(3be44
z@^A#IdMK!wdRUwCno$Z1kqfx-Ju$EaIvJC@+1l7a_}m03|K`j01pm3sLP`ENij%b<
zs?EvnzlZ>}bxy#>>n5hX*@5(-Q_0#NE!x
z*p0~!^5Nec#DEY}M@xGrORydJACAT*U}q;m$|p(xQNh;!KWyzF|1#5)!C2gk?OE8E
zS^uc?Z$x?d{~p!W_CMGVCl%oTlK20UF+|PX9>}5sgn*qLO`jYG`tWBcdp=P|ps^F!
zQ4I{X`L`97EWl1+hy~c5TvU~d{G+C&of+5_LiabmygZ+@9mL7l&J-vuCP?|jf!Wg1
zjE@(<&dw{w!6U}YDayts&hwd<1HdB&5dSR3&Cbis&hc+rF|et#Ezr*C-?V1`if_RyNAHgle=CKJ_2*fkGET#
zQN>L9&q{~}Y|ALiRO>eM#WA)~3P&@{$JLM?SOXuq8Z>7aN^u)r7Z2t(6(cNUOQUV4
zL!{}FOQK1?kF|45KBgw6lWEulpS!oXB=JHvJcqo7lN^LLZv_{#jZ92L{+^CVNI!|i
z)t>zeW(WL_1LS}g|BUh90O%icGev`%xyUpYot=Ms`l|Ndo@<;}H9N=dhFmVPc|^Ns
ztA(V!{F~1bXR8~W+kPOwo?o7TEw)pMN=(I@8^BB>lwVmm=M{MHObA{w4`?0DS_olx
zMAKr8h=b5vsg+l~^{;)tkU@@1iW=H5^&oWVj8>A7^Ud2iv(g!>-{n|1e|z(e`)VTG
zuaGt`Ffdty6Pq9X?-76h9AENe_A%!OQg*wDStUfIzcB!DB|=xcbxBUP>?D%6d}>0V
zNj1Mg(3ZlZ6qeNxzHZRMH#VXPLl7Juk`P38gHb=>=aDN-~MzNb|dJjYualbYVp4R@`Yeq_2
z4P^#2MvLK?yz}v4YsWo;Mt(JcS9`SG>7-=9(Y*0k$u@t_)gJUmAXjR`=A-x3)R6c%
zMg|d+a>1!*F78UdaJODhHvjpKD%cm0L7$&R(IbWz(htPNZsk;@SCHRU$tycksh3(8Z}JT
zS-^m!Nlc`TqD7cy4LcV-kxz17X|wtuS{z&w*6-ZJSiNM2vb+r`WQrQEG)yG6l*&=r
zcs)M4<|u16$-Tzj)1Ia4d^P)z;djLxzMWI0^#_xzBvLG@ttN$RQRwgXKfGsK(Ab
L
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�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

literal 0
HcmV?d00001


From 62d6fa746f3f1e97b26c048cd23d31bc5a8646a8 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 26 Oct 2018 13:29:49 -0700
Subject: [PATCH 128/334] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 181b8d7..861d9e2 100755
--- a/README.md
+++ b/README.md
@@ -55,13 +55,13 @@ Other Options:
   --variable-list        Output a project's declared variables
 ```
 
-[![asciicast](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP.png)](https://asciinema.org/a/mMCid9O2BK7JrpocQuSl3CRkP?t=0)
-
 ## How It Works
 
-`stir` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. 
+`stir` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. It also can provide clients with a dashboard of information about their project.
+
+![Dashboard](https://raw.githubusercontent.com/EMRL/deploy/stir/img/dashboard.png)
 
-`stir` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
+`stir` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), `composer`, and  [`mina`](http://nadarei.co/mina/) if they are installed.
 
 ## Installation
 

From 117dd1e2bdc0ee4f395ba7babe8bf6674f536ff1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 26 Oct 2018 17:37:31 -0700
Subject: [PATCH 129/334] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 861d9e2..eb90273 100755
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Other Options:
 
 ![Dashboard](https://raw.githubusercontent.com/EMRL/deploy/stir/img/dashboard.png)
 
-`stir` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), `composer`, and  [`mina`](http://nadarei.co/mina/) if they are installed.
+`stir` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), [`composer`](https://getcomposer.org/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
 
 ## Installation
 

From c83bbd9f1ee782efc497bef7b87ead7b8cdb9b57 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 31 Oct 2018 11:22:34 -0700
Subject: [PATCH 130/334] Starting prepare function

---
 etc/stir-project.sh |  7 ++++++-
 install/doinst.sh   | 12 ++----------
 lib/env-check.sh    |  2 +-
 lib/main.sh         |  5 +++++
 lib/prepare.sh      | 14 ++++++++++++++
 lib/validate.sh     | 10 ++++++++++
 stir.sh             | 40 +++++++++++++++-------------------------
 7 files changed, 53 insertions(+), 37 deletions(-)
 create mode 100755 lib/prepare.sh

diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 07dea3a..473735a 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -9,7 +9,7 @@
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-PROJECT_VERSION="3.7.1"
+PROJECT_VERSION="3.8"
 
 
 ###############################################################################
@@ -33,6 +33,11 @@ PROJECT_VERSION="3.7.1"
 # Git Configuration
 ###############################################################################
 
+# If you will need to execute custom scripts before beginning your session, 
+# insert the command with (full path in the value below. If you won't be 
+# needing to run prepare scripts, leave this value empty or set to FALSE.
+# PREPARE="{{PREPARE}}"
+
 # The URL for this repo's hosting, with no trailing slash. For example, if 
 # you use Github and your repo URL looks like https://github.com/EMRL/deploy
 # your REPOHOST should be set to https://github.com/EMRL (with no trailing 
diff --git a/install/doinst.sh b/install/doinst.sh
index 3427bde..8b41821 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -128,19 +128,11 @@ fi
 
 # Start the install
 echo; sleep 1
-if [[ ! -d /etc/stir ]] || [[ ! -d /etc/stir/lib ]] || [[ ! -d /etc/stir/crontab ]]; then
+if [[ ! -d /etc/stir ]]; then # || [[ ! -d /etc/stir/lib ]] || [[ ! -d /etc/stir/crontab ]]; then
   echo "Creating directories"
   if [[ ! -d /etc/stir ]]; then
     sudo mkdir /etc/stir; error_check
   fi
-
-  if [[ ! -d /etc/stir/lib ]]; then
-    sudo mkdir /etc/stir/lib; error_check
-  fi
-
-  if [[ ! -d /etc/stir/lib/crontab ]]; then
-    sudo mkdir /etc/stir/lib/crontab; error_check
-  fi
 fi
 
 echo "Installing configuration files"
@@ -151,7 +143,7 @@ if [[ ! -f /etc/stir/stir.conf ]]; then
   cp /etc/stir/stir-global.conf /etc/stir/global.conf; error_check
 fi
 
-cp -R lib/* /etc/stir/lib || error_check
+cp -R lib /etc/stir || error_check
 cp stir.sh /usr/local/bin/stir || error_check
 sudo chmod 755 /usr/local/bin/stir || error_check
 echo "Successfully installed, try typing 'stir' for help."
diff --git a/lib/env-check.sh b/lib/env-check.sh
index d2f1951..0a6e4c6 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -141,7 +141,7 @@ function update_project() {
     ACCESSTOKEN REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS \
     SERVERID NIKTO NIKTO_CONFIG STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST \
     PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS SCP_DEPLOY_PORT \
-    NIKTO NIKTO_CONFIG NIKTO_PROXY DB_API_TOKEN DB_BACKUP_PATH)
+    NIKTO NIKTO_CONFIG NIKTO_PROXY DB_API_TOKEN DB_BACKUP_PATH PREPARE)
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
diff --git a/lib/main.sh b/lib/main.sh
index 6ada921..9b66039 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -10,6 +10,11 @@ function main() {
   dependency_check  # Check that required commands are available
   release_check     # Check for newer version at Github
   env_check         # Check for configuration files that need updating
+
+  if [[ -n "${PREPARE}" ]] && [[ "${PREPARE}" != "FALSE" ]]; then
+    prepare
+  fi
+
   gitStart          # Check for a valid git project and get set up
   lock              # Create lock file
   go                # Start a deployment work session
diff --git a/lib/prepare.sh b/lib/prepare.sh
new file mode 100755
index 0000000..184299a
--- /dev/null
+++ b/lib/prepare.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# prepare.sh
+#
+###############################################################################
+# Runs user-defined prepare command
+###############################################################################
+
+function prepare() {
+  trace "This is an empty function"
+  if [[ "${PREPARE_ONLY}" == "1" ]]; then
+    quickExit
+  fi
+}
diff --git a/lib/validate.sh b/lib/validate.sh
index 026df0b..be14402 100755
--- a/lib/validate.sh
+++ b/lib/validate.sh
@@ -7,6 +7,16 @@
 ###############################################################################
 
 function validate_conf() {
+  # Check URLs
+  for var in "${REPOHOST} ${CLIENTLOGO}" "${DEVURL}" "${PRODURL}"; do
+    if [[ -n "${var}" ]]; then
+      if [[ "${var}" != *"http"*"://"* ]]; then
+        error "The URL in your configuration ($var) must be preceded by either http:// or https:// - check your setup."
+      fi
+    fi
+  done
+
+  # Check for bogus characters
   array=( "${PROJNAME}" "${PROJCLIENT}" )
   for i in "${array[@]}"
   do
diff --git a/stir.sh b/stir.sh
index 3ca6dd3..8dc0133 100755
--- a/stir.sh
+++ b/stir.sh
@@ -51,8 +51,7 @@ function ctrl_c() {
   fi
 }
 
-# Initialize variables
-# Loop
+# Variable init loop
 function init_loop {
   for i in "${var[@]}" ; do
     read -r "${i}" <<< ""
@@ -77,7 +76,7 @@ function init_temp() {
   init_loop
 }
 
-# Console Colors
+# Console colors
 function init_color() {
   var=(black red green yellow blue magenta cyan white endColor bold \
   underline reset purple tan)
@@ -99,7 +98,7 @@ function init_env() {
   CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \
   PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \
   INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE \
-  NOTIFYCLIENT FIXINDEX HTMLTEMPLATE)
+  NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE PREPARE_ONLY)
   init_loop
 }
 
@@ -127,6 +126,10 @@ init_color
 init_env
 init_internal
 
+# Log errors
+function log_fail() {
+  echo "Could not create temporary file, exiting."; exit 2
+}
 
 # Display command options
 function flags() {
@@ -151,6 +154,7 @@ Other Options:
   --approve              Approve and deploy queued code changes
   --deny                 Deny queued code changes
   --build                Build project assets
+  --prepare              Prepare project
   --digest               Create and send weekly digest
   --report               Create a monthly activity report
   --no-check             Override active file and server checks
@@ -220,6 +224,7 @@ while [[ ${1:-unset} = -?* ]]; do
     -t|--time) TIME="1" ;;
     --approve) APPROVE="1"; FORCE="1" ;;
     --deny) DENY="1"; FORCE="1" ;;
+    --prepare) PREPARE_ONLY="1" ;;
     --digest) DIGEST="1"; FORCE="1"; QUIET="1" ;;
     --report) REPORT="1"; FORCE="1"; QUIET="1" ;;
     --automate) FORCE="1"; UPGRADE="1"; MERGE="1"; QUIET="1"; AUTOMATE="1" ;;
@@ -308,7 +313,7 @@ if [[ -f "${etcLocation}" ]]; then
   source "${etcLocation}"
 else
   echo "Unable to load configuration file at ${etcLocation}, exiting."
-  exit 1
+  exit 12
 fi
 
 # Check to see if the user is deploying from current working directory
@@ -322,11 +327,11 @@ if [[ "${CURRENT}" != "1" ]]; then
   # if [[ -z "${@}" ]]; then
   if [[ -z "${APP}" ]]; then
     echo "Choose a valid project, or use the --current flag to deploy from the current directory."
-    exit 1
+    exit 13
   else
     if [[ ! -d "${WORKPATH}/${APP}" ]]; then
       echo "${WORKPATH}/${APP} is not a valid project."
-      exit 1
+      exit 17
     fi
   fi
 fi
@@ -343,16 +348,10 @@ if [[ -f "${libLocation}" ]]; then
   source "${libLocation}"
 else
   echo "Unable to load libraries at ${libLocation}, exiting."
-  exit 1
+  exit 19
 fi
 
 # Fire up temporary log files. Consolidate this shit better someday, geez.
-# 
-# Crash and burn
-function log_fail() {
-  echo "Could not create temporary file, exiting."; exit 1
-}
-
 # Main log file
 logFile="/tmp/${APP}.log-$RANDOM.log"
 (umask 077 && touch "${logFile}") || log_fail
@@ -360,7 +359,7 @@ wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/nul
 coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail
 
 # Start writing the logfile
-echo -e "Deployment logfile for ${APP^^} - $NOW\r" >> "${logFile}"
+echo -e "Deployment logfile for ${APP^^} - ${NOW}\r" >> "${logFile}"
 echo -e "Launching stir${STARTUP}\n" >> "${logFile}"
 
 # More crappy tmp files
@@ -446,16 +445,7 @@ else
   source "${APPRC}"
 fi
 
-# Make sure variables are set up correctly
-for var in "${REPOHOST} ${CLIENTLOGO}" "${DEVURL}" "${PRODURL}"; do
-  if [[ -n "${var}" ]]; then
-    if [[ "${var}" != *"http"*"://"* ]]; then
-      error "The URL in your configuration ($var) must be preceded by either http:// or https:// - check your setup."
-    fi
-  fi
-done
-
-# Check variables for weird characters
+# Validate configuration setings
 validate_conf
 
 # Are we using "smart" *cough* commits?

From 572b938cbdf73747d7e7ecee777d3e9d69c5474a Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 1 Nov 2018 20:01:51 -0700
Subject: [PATCH 131/334] Beginning project clone creation

---
 install/doinst.sh      |   9 ++-
 install/uninst.sh      |   8 ++-
 lib/deployment.sh      |   2 +-
 lib/env-check.sh       |   2 +
 lib/git.sh             |  20 +++---
 lib/log-handling.sh    |   3 +-
 lib/main.sh            |  11 ++-
 lib/package-manager.sh |  24 +++----
 lib/prepare.sh         |  17 ++++-
 lib/quit.sh            |   7 ++
 lib/utilities.sh       |   2 +-
 lib/wp-clone.sh        |  68 +++++++++++++++++++
 lib/wp-core.sh         |   6 +-
 lib/wp-plugins.sh      |   8 +--
 lib/wp.sh              | 151 +++++++++++++++++++++++------------------
 stir.sh                |   7 +-
 16 files changed, 236 insertions(+), 109 deletions(-)
 create mode 100755 lib/wp-clone.sh

diff --git a/install/doinst.sh b/install/doinst.sh
index 8b41821..d3cd738 100755
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -139,8 +139,13 @@ echo "Installing configuration files"
 sudo cp -R etc/* /etc/stir; error_check
 sudo cp etc/stir-user.rc /etc/stir; error_check
 
-if [[ ! -f /etc/stir/stir.conf ]]; then
-  cp /etc/stir/stir-global.conf /etc/stir/global.conf; error_check
+if [[ ! -f /etc/stir/global.conf ]]; then
+  echo "Global configuration not found, installing."
+  sudo cp /etc/stir/stir-global.conf /etc/stir/global.conf; error_check
+fi
+
+if [[ ! -f "/etc/stir/html/default/theme.conf" ]]; then
+  sudo cp "/etc/stir/html/default/theme-example.conf" "/etc/stir/html/default/theme.conf"
 fi
 
 cp -R lib /etc/stir || error_check
diff --git a/install/uninst.sh b/install/uninst.sh
index a13292d..a033f94 100755
--- a/install/uninst.sh
+++ b/install/uninst.sh
@@ -113,11 +113,15 @@ if [[ -f /usr/local/bin/stir ]]; then
   echo "Removing stir"
   sudo rm /usr/local/bin/stir; error_check
 
-  if [[ ! -d /etc/stir/lib ]]; then
+  if [[ -d /etc/stir/lib ]]; then
     sudo rm -rf /etc/stir/lib; error_check
   fi
 
-  if yesno --default yes "Remove global configuration files? [Y/n] "; then
+  if [[ -d /etc/stir/html ]]; then
+    sudo rm -rf /etc/stir/html; error_check
+  fi
+
+  if yesno --default yes "Remove configuration files? [Y/n] "; then
     if [[ -d /etc/stir ]]; then 
       sudo rm -rf /etc/stir; error_check
     fi
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 69a8703..60cd15e 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -58,7 +58,7 @@ function pkgDeploy() {
   empty_line
   if [[ -n "${DEPLOY}" ]]; then
     # Add ssh keys and double check directoy
-    cd "${WORKPATH}/${APP}" || error_check
+    cd "${APP_PATH}" || error_check
     if [[ "${INCOGNITO}" != "TRUE" ]]; then
       trace "Launching deployment"
     else
diff --git a/lib/env-check.sh b/lib/env-check.sh
index 0a6e4c6..186a612 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -40,6 +40,8 @@ function env_check() {
     # Reload environment variables, from global > user > project
     source "${deployPath}"/global.conf
     source ~/.stirrc
+    
+    # TODO This throws an error, fix it.
     source "${project_config}"
 
     # Restore workpath value
diff --git a/lib/git.sh b/lib/git.sh
index ef2f73b..58d84bb 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -11,7 +11,7 @@ var=(FULLUSER)
 init_loop
 
 # Assign a variable to represent .git/index.lock
-gitLock="${WORKPATH}/${APP}/.git/index.lock"
+gitLock="${APP_PATH}/.git/index.lock"
 
 # Make sure we're in a git repository.
 function gitStart() {
@@ -21,19 +21,19 @@ function gitStart() {
   fi
   
   # Directory exists?
-  if [[ ! -d "${WORKPATH}/${APP}" ]]; then
-    info "${WORKPATH}/${APP} is not a valid directory."
-    clean_up; exit 1
+  if [[ ! -d "${APP_PATH}" ]]; then
+    info "${APP_PATH} is not a valid directory."
+    clean_up; exit 34
   else
-    cd "${WORKPATH}/${APP}" || error_check
+    cd "${APP_PATH}" || error_check
   fi
 
   # Check that .git exists
-  if [[ -f "${WORKPATH}/${APP}/.git/index" ]]; then
+  if [[ -f "${APP_PATH}/.git/index" ]]; then
     sleep 1
   else
-    info "There is nothing at ${WORKPATH}/${APP} to deploy."
-    clean_up; exit 1
+    info "There is nothing at ${APP_PATH} to deploy."
+    clean_up; exit 51
   fi
 
   # Make sure there has been at least one commit previously made
@@ -64,7 +64,7 @@ function gitStart() {
 # Checkout master
 function gitChkMstr() {
   if [[ -z "${MASTER}" ]]; then
-    empty_line; error "deploy ${VERSION} requires a master branch to be defined.";
+    empty_line; error "stir ${VERSION} requires a master branch to be defined.";
   else
     current_branch="$(git rev-parse --abbrev-ref HEAD)"
     if [[ "${current_branch}" != "${MASTER}" ]]; then
@@ -166,7 +166,7 @@ function gitCommit() {
         # We need Smart commits enabled or this can't work
         if [[ "${SMARTCOMMIT}" -ne "TRUE" ]]; then
           console "Smart Commits must enabled when forcing updates."
-          console "Set SMARTCOMMIT=TRUE in ${WORKPATH}/${APP}/${CONFIGDIR}deploy.sh"; quietExit
+          console "Set SMARTCOMMIT=TRUE in .stir.sh"; quietExit
         else
           if [[ -z "${COMMITMSG}" ]]; then
             info "Commit message must not be empty."; quietExit
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index 0e7c4e9..896cba9 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -153,8 +153,9 @@ function makeLog() {
 }
 
 function build_html() {
-  # Build out the HTML
   LOGSUFFIX="html"
+  
+  # Build out the HTML
   if [[ "${message_state}" == "ERROR" ]]; then
     # Oh man, this is an error
     notes="${error_msg}"
diff --git a/lib/main.sh b/lib/main.sh
index 9b66039..398ad76 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -10,9 +10,14 @@ function main() {
   dependency_check  # Check that required commands are available
   release_check     # Check for newer version at Github
   env_check         # Check for configuration files that need updating
-
-  if [[ -n "${PREPARE}" ]] && [[ "${PREPARE}" != "FALSE" ]]; then
-    prepare
+  wp_check          # Check for Wordpress
+  
+  if [[ -n "${PREPARE}" ]] || [[ "${PREPARE_ONLY}" == "1" ]]; then
+    if [[ "${PREPARE}" != "FALSE" ]]; then
+      prepare
+    else
+      return
+    fi
   fi
 
   gitStart          # Check for a valid git project and get set up
diff --git a/lib/package-manager.sh b/lib/package-manager.sh
index d533bc3..23e8e3b 100755
--- a/lib/package-manager.sh
+++ b/lib/package-manager.sh
@@ -15,11 +15,11 @@ function pkgMgr() {
     if [[ "${UPGRADE}" != "1" ]]; then
 
       # Checking for app/lib, which assumes we're using Grunt
-      if [[ -f "${WORKPATH}/${APP}/Gruntfile.coffee" ]]; then
+      if [[ -f "${APP_PATH}/Gruntfile.coffee" ]]; then
         notice "Found grunt configuration!" 
 
         if  [[ "${FORCE}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then
-          cd "${WORKPATH}"/"${APP}" || errorCheck
+          cd "${APP_PATH}" || errorCheck
     
           if [[ "${VERBOSE}" == "TRUE" ]]; then
             /usr/local/bin/grunt build --force 2>&1 | tee --append "${trshFile}"           
@@ -47,7 +47,7 @@ function pkgMgr() {
 function check_build_method() {
   if [[ "${DEPLOY}" == *"mina"* ]]; then
     # Trying this a weirdo way, turn it into a loop or something later
-    [[ -f "${WORKPATH}/${APP}/Minafile" ]] && deploy_config="$(cat ${WORKPATH}/${APP}/Minafile)"
+    [[ -f "${APP_PATH}/Minafile" ]] && deploy_config="$(cat ${APP_PATH}/Minafile)"
     if [[ "${deploy_config}" =~ "npm run build" ]] && [[ "${BUILD}" != "1" ]]; then
         SKIP_BUILD="1"
     fi
@@ -55,15 +55,15 @@ function check_build_method() {
 }
 
 function npm_build() {
-  if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/site/package.json" ]]; then
-    trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/site/package.json found."
-    npm_json="${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/site"
-  elif [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then
-    trace "${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}/package.json found."
-    npm_json="${WORKPATH}/${APP}${WPROOT}${WPAPP}/themes/${APP}"
-  elif [[ -f "${WORKPATH}/${APP}/package.json" ]]; then
-    trace "${WORKPATH}/${APP}/package.json found."
-    npm_json="${WORKPATH}/${APP}"
+  if [[ -f "${APP_PATH}/${WPROOT}${WPAPP}/themes/site/package.json" ]]; then
+    trace "${APP_PATH}/${WPROOT}${WPAPP}/themes/site/package.json found."
+    npm_json="${APP_PATH}/${WPROOT}${WPAPP}/themes/site"
+  elif [[ -f "${APP_PATH}/${WPROOT}${WPAPP}/themes/${APP}/package.json" ]]; then
+    trace "${APP_PATH}/${WPROOT}${WPAPP}/themes/${APP}/package.json found."
+    npm_json="${APP_PATH}/${WPROOT}${WPAPP}/themes/${APP}"
+  elif [[ -f "${APP_PATH}//package.json" ]]; then
+    trace "${APP_PATH}//package.json found."
+    npm_json="${APP_PATH}"
   fi
 
   if [[ -z "${npm_json}" ]]; then 
diff --git a/lib/prepare.sh b/lib/prepare.sh
index 184299a..66c3fda 100755
--- a/lib/prepare.sh
+++ b/lib/prepare.sh
@@ -7,8 +7,19 @@
 ###############################################################################
 
 function prepare() {
-  trace "This is an empty function"
-  if [[ "${PREPARE_ONLY}" == "1" ]]; then
-    quickExit
+
+  # If running a command that does not going to touch code, we can skip the 
+  # --prepare stuff altogether
+  startup_switch=(REPORT DIGEST SCAN SSHTEST EMAILTEST SLACKTEST POSTTEST \
+    PUBLISH PROJSTATS CREATE_INVOICE FUNCTIONLIST VARIABLELIST)
+  for arg in "${startup_switch[@]}"; do
+    if [[ "${arg}" == "1" ]]; then
+      PREPARE="FALSE"; return
+    fi
+  done
+
+  # Should we use our built-in Worpdress prepare clone function?
+  if [[ "${PREPARE}" == "TRUE" ]]; then
+    wp_clone; return
   fi
 }
diff --git a/lib/quit.sh b/lib/quit.sh
index 6a71e53..f302605 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -97,6 +97,7 @@ function clean_up() {
   [[ -d "${statDir}" ]] && rm -rf "${statDir}"
   [[ -d "${avatarDir}" ]] && rm -rf "${avatarDir}"
   [[ -d /tmp/stats ]] && rm -rf /tmp/stats
+  
   # [[ -d /tmp/avatar ]] && rm -rf /tmp/avatar
   # [[ -f "${gitLock}" ]] && rm "${gitLock}"
   # Attempt to reset the terminal
@@ -125,6 +126,12 @@ function clean_up() {
     fi
   fi
 
+  # Cleanup clone
+  if [[ -d "/tmp/${REPO}" ]]; then 
+    cd /tmp
+    rm -rf /tmp/"${REPO}"
+  fi
+
   # Attempt to reset the console when running --quiet
   if [[ "${QUIET}" != "1" ]]; then
     tput cnorm
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 37d9a0d..335e672 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -36,7 +36,7 @@ function go() {
   fi  
 
   if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    console "Current working path is ${WORKPATH}/${APP}"
+    console "Current working path is ${APP_PATH}"
   fi
   
   # Slack test
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
new file mode 100755
index 0000000..d2f4fc2
--- /dev/null
+++ b/lib/wp-clone.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+#
+# wp-clone.sh
+#
+###############################################################################
+# Checks for Wordpress upgrades, and executes upgrades if needed
+###############################################################################
+
+# Initialize variables
+var=(SSH_REPO TMP_PATH SET_ENV)
+init_loop
+
+function wp_clone() {
+  # This is all under construction
+  trace "Cloning the project..."
+
+  # Get paths
+  wp_path
+  wp_tmp
+
+  # Create SSH string
+  SSH_REPO="${REPOHOST}/${REPO}.git"
+  SSH_REPO=$(sed -e "s^.org/^.org:^g" <<< ${SSH_REPO})
+  SSH_REPO=$(sed -e "s^https://^git@^g" <<< ${SSH_REPO})
+
+  # Double check in case of insecure repo host
+  if [[ "${SSH_REPO}" == *"http"* ]]; then
+    SSH_REPO=$(sed -e "s^http://^git@^g" <<< ${SSH_REPO})
+  fi
+
+  # Try to make sure ssh will work
+  ssh_check
+  
+  notice "Setting up project..."
+  cd /tmp; \
+  git clone "${SSH_REPO}" #&>> /dev/null &
+  #spinner $!
+
+  # Copy plugins that are not part of repo (for update checking)
+  cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
+
+  # Reset our root working directory
+  APP_PATH="/tmp/${REPO}"
+  cd "${APP_PATH}"
+
+  # Get environment variables
+  get_env
+  WP_PATH="${WP_TMP}"
+}
+
+function get_env() {
+  env_file=(config/env.php env.php .env.php .env public/wp-settings.php)
+  for arg in "${env_file[@]}"; do
+    if [[ -f "${WORKPATH}/${APP}/${arg}" ]]; then
+      cp "${WORKPATH}/${APP}/${arg}" "/tmp/${REPO}/${arg}"
+      if [[ -f "/tmp/${REPO}/${arg}" ]]; then
+        SET_ENV="1"
+      fi
+    fi
+  done
+
+  if [[ "${SET_ENV}" != "1" ]]; then
+    warning "Configuration file not found, can not continue."
+    quickExit
+  fi
+
+  GARBAGE="FALSE"
+}
\ No newline at end of file
diff --git a/lib/wp-core.sh b/lib/wp-core.sh
index 1cacdcb..5bc7464 100755
--- a/lib/wp-core.sh
+++ b/lib/wp-core.sh
@@ -9,7 +9,7 @@
 function wpCore() {
   # There's a little bug when certain plugins are spitting errors; work around 
   # seems to be to check for core updates a second time
-  cd "${WORKPATH}"/"${APP}${WPROOT}"; \
+  cd "${APP_PATH}"/"${WPROOT}"; \
   "${WPCLI}"/wp core check-update --no-color &>> "${logFile}"
   if grep -q 'WordPress is at the latest version.' "${logFile}"; then
     info "Wordpress core is up to date."; UPD2="1"
@@ -44,7 +44,7 @@ function wpCore() {
         warning "Checking for available core update was unreliable, skipping.";
       else
         if [[ "${FORCE}" = "1" ]] || yesno --default no "A new version of Wordpress is available (${COREUPD}), update? [y/N] "; then
-          cd "${WORKPATH}/${APP}${WPROOT}"; \
+          cd "${APP_PATH}/${WPROOT}"; \
           if [[ "${QUIET}" != "1" ]]; then
             "${WPCLI}"/wp core update --no-color &>> "${logFile}" &
             spinner $!
@@ -60,7 +60,7 @@ function wpCore() {
             error "Core update failed.";
           else
             sleep 1
-            cd "${WORKPATH}/${APP}/"; # \ 
+            cd "${APP_PATH}/"; # \ 
             info "Wordpress core updates complete."; UPDCORE=1
           fi
                   
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index 0947a08..e2a4e5e 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -40,9 +40,9 @@ function wpPlugins() {
     fi
 
     # First, check for for updates via composer
-    if [[ -f "${WORKPATH}/${APP}/composer.json" ]]; then
+    if [[ -f "${APP_PATH}/composer.json" ]]; then
       trace "Found composer.json, updating"
-      cd "${WORKPATH}"/"${APP}"; \
+      cd "${APP_PATH}"; \
       if [[ "${QUIET}" != "1" ]]; then
         # Come back and get this path properly
         /usr/local/bin/composer update &>> "${logFile}" &
@@ -50,7 +50,7 @@ function wpPlugins() {
       else
         /usr/local/bin/composer update &>> "${logFile}"
       fi
-      cd "${WORKPATH}"/"${APP}${WPROOT}${WPAPP}"; \
+      cd "${WP_PATH}"; \
     fi
 
     # Now, run the rest of the needed updates via wp-cli
@@ -72,7 +72,7 @@ function wpPlugins() {
       error "One or more plugin updates have failed."
     fi
 
-    cd "${WORKPATH}"/"${APP}"/; \
+    cd "${APP_PATH}"; \
     info "Plugin updates complete."
   else  
     info "Skipping plugin updates..."
diff --git a/lib/wp.sh b/lib/wp.sh
index 0525770..73edd6e 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -6,83 +6,56 @@
 # Checks for Wordpress upgrades, and executes upgrades if needed
 ###############################################################################
 
+# Initialize variables
+var=(WP_PATH)
+init_loop
+
 function wpPkg() {
   # Make sure we are allowed to update
-  if [[ "${SKIPUPDATE}" != "1" ]]; then
-
-    # Is wp-cli installed? 
-    if hash "${WPCLI}"/wp 2>/dev/null; then
-    trace status "wp-cli found, checking for Wordpress... "
-
-      # Check for Wordpress
-      if [[ -f "${WORKPATH}"/"${APP}${WPROOT}${WPSYSTEM}"/wp-settings.php ]]; then
-        trace notime "FOUND"
-        cd "${WORKPATH}"/"${APP}${WPROOT}${WPAPP}"; \
-
-        # Database check
-        trace status "Checking database... "
-        "${WPCLI}"/wp db check &>> /dev/null; EXITCODE=$?; 
-        if [[ "${EXITCODE}" != "0" ]]; then 
-          "${WPCLI}"/wp db check &>> "${logFile}"; 
-          trace notime "FAIL"
-          if [[ "${AUTOMATE}" == "1" ]]; then
-            error "There is a problem with your Wordpress installation, check your configuration."
-          else
-            info "There is a problem with your Wordpress installation, check your configuration."
-          fi
-        else
-        	# Get info
-        	trace notime "OK"
-          wp core version --extra  &>> "${logFile}";
-
-          # Check for Wordfence
-          wfCheck
-          
-          # Look for updates
-          if [[ "${QUIET}" != "1" ]]; then
-            wpCheck &
-            spinner $!
-          else
-            "${WPCLI}"/wp plugin status --no-color >> "${logFile}"
-            "${WPCLI}"/wp plugin update --dry-run --no-color --all > "${wpFile}"
-          fi
+  if [[ "${SKIPUPDATE}" != "1" ]] && [[ "${WP_PATH}" != "FALSE" ]]; then
+    # Check for Wordfence
+    wfCheck
+    
+    cd "${WP_PATH}"
 
-          # Check the logs
-          #if grep -q "U = Update Available" "${logFile}"; then
-          if grep -q "Available plugin updates:" "${wpFile}"; then    
-            wpPlugins
-          else
-            # Was there a database glitch?
-            if grep -q 'plugins can not be updated' "${wpFile}"; then
-              sleep 1
-            else
-              info "Plugins are up to date."; UPD1="1"
-            fi
-          fi
+    # Look for updates
+    if [[ "${QUIET}" != "1" ]]; then
+      wp_update_check &
+      spinner $!
+    else
+      "${WPCLI}"/wp plugin status --no-color >> "${logFile}"
+      "${WPCLI}"/wp plugin update --dry-run --no-color --all > "${wpFile}"
+    fi
 
-          # Check log for core updates
-          if [[ "${DONOTUPDATEWP}" == "TRUE" ]]; then
-            trace "Wordpress core updates disabled, skipping"
-          else
-            wpCore
-          fi
-        fi
+    # Check the logs
+    #if grep -q "U = Update Available" "${logFile}"; then
+    if grep -q "Available plugin updates:" "${wpFile}"; then    
+      wpPlugins
+    else
+      # Was there a database glitch?
+      if grep -q 'plugins can not be updated' "${wpFile}"; then
+        sleep 1
       else
-        trace notime "NOT FOUND"
+        info "Plugins are up to date."; UPD1="1"
       fi
-    else
-      trace "wp-cli not found"
     fi
 
-    # If running in Wordpress update-only mode, bail out
-    if [[ "${UPGRADE}" == "1" ]] && [[ "${UPD1}" == "1" ]] && [[ "${UPD2}" == "1" ]]; then
-      notice "No updates available, halting."
-      safeExit
+    # Check log for core updates
+    if [[ "${DONOTUPDATEWP}" == "TRUE" ]]; then
+      trace "Wordpress core updates disabled, skipping"
+    else
+      wpCore
     fi
   fi
+
+  # If running in Wordpress update-only mode, bail out
+  if [[ "${UPGRADE}" == "1" ]] && [[ "${UPD1}" == "1" ]] && [[ "${UPD2}" == "1" ]]; then
+    notice "No updates available, halting."
+    safeExit
+  fi
 }
 
-function wpCheck() {
+function wp_update_check() {
   notice "Checking for updates..."
 
   # For the logfile
@@ -95,3 +68,51 @@ function wpCheck() {
   # wp plugin list --format=csv --all --fields=name,update_version,update | grep 'available'
   # wp plugin list --format=csv --all --fields=title,update_version,update | grep 'available'
 }
+
+function wp_check() {
+  # Is wp-cli installed? 
+  if hash "${WPCLI}"/wp 2>/dev/null; then
+  trace status "wp-cli found, checking for Wordpress... "
+    # Check for Wordpress
+    if [[ -f "${WORKPATH}"/"${APP}${WPROOT}${WPSYSTEM}"/wp-settings.php ]]; then
+      trace notime "FOUND"
+
+      # Get Wordpress paths
+      wp_path;
+
+      # Database check
+      trace status "Checking database... "
+      "${WPCLI}"/wp db check &>> /dev/null; EXITCODE=$?; 
+      
+      if [[ "${EXITCODE}" != "0" ]]; then 
+        "${WPCLI}"/wp db check &>> "${logFile}"; 
+        trace notime "FAIL"
+        if [[ "${AUTOMATE}" == "1" ]]; then
+          error "There is a problem with your Wordpress installation, check your configuration."
+        else
+          info "There is a problem with your Wordpress installation, check your configuration."
+        fi
+      else
+        # Get info
+        trace notime "OK"
+        "${WPCLI}"/wp core version --extra  &>> "${logFile}";
+      fi
+    else
+      trace notime "NOT FOUND"
+      WP_PATH="FALSE"
+    fi
+  fi
+}
+
+function wp_path() {
+  # Store path in variable and remove any extra /
+  WP_PATH="${APP_PATH}${WPROOT}${WPAPP}"
+  WP_PATH=$(sed -e "s^//^/^g" <<< ${WP_PATH})
+  cd "${WP_PATH}"; \
+}
+
+function wp_tmp {
+  # Store path in variable and remove any extra /
+  WP_TMP="/tmp/${REPO}/${WPROOT}${WPAPP}"
+  WP_TMP=$(sed -e "s^//^/^g" <<< $WP_TMP)
+}
diff --git a/stir.sh b/stir.sh
index 8dc0133..6c2d035 100755
--- a/stir.sh
+++ b/stir.sh
@@ -65,7 +65,7 @@ function init_startup() {
     SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \
     DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST BUILD PROJSTATS UNLOCK  \
     SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN \
-    CHECK_BACKUP)
+    CHECK_BACKUP APP_PATH)
   init_loop
 }
 
@@ -574,7 +574,10 @@ if [[ "${MERGE}" == "1" ]] && [[ -z "${PRODUCTION}" ]]; then
   quietExit
 fi
 
-# Execute the main process
+# Set app path
+APP_PATH="${WORKPATH}/${APP}"
+
+# Execute the main application
 main
 
 # All done

From 083f7f4a2dce6b86c8907937d050128dd69f5fd1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 5 Nov 2018 17:52:50 -0800
Subject: [PATCH 132/334] Temp project functions

---
 CHANGELOG.md         |   2 +
 etc/stir-prepare.sh  |   6 ++
 etc/stir-project.sh  |  10 ++-
 lib/env-check.sh     |   3 +-
 lib/git.sh           |   2 +-
 lib/quit.sh          |   6 +-
 lib/smart-commits.sh |   4 +-
 lib/utilities.sh     |   2 +-
 lib/wp-clone.sh      | 109 +++++++++++++++++++++++++---
 lib/wp.sh            |  14 ++--
 stir.sh              |   5 +-
 test/extended.sh     | 166 -------------------------------------------
 test/test.sh         |   9 ---
 13 files changed, 137 insertions(+), 201 deletions(-)
 create mode 100755 etc/stir-prepare.sh
 delete mode 100755 test/extended.sh
 delete mode 100644 test/test.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c724021..b472e3c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Automated Worpdress updates are now made by cloning a temporary copy of the project's repo, running the updates, and destroying upon completion
+- Prepare hook added 
 - Wordpress projects can now be managed using either `composer` or `wp-cli` (or both) transparently
 - ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
 ### Changed
diff --git a/etc/stir-prepare.sh b/etc/stir-prepare.sh
new file mode 100755
index 0000000..997cbdd
--- /dev/null
+++ b/etc/stir-prepare.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+# .stir-prepare.sh
+#
+MYSQL_USER="someuser"
+MYSQL_PASS="somepassword"
diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 473735a..478de8f 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -35,9 +35,14 @@ PROJECT_VERSION="3.8"
 
 # If you will need to execute custom scripts before beginning your session, 
 # insert the command with (full path in the value below. If you won't be 
-# needing to run prepare scripts, leave this value empty or set to FALSE.
+# needing to run prepare scripts, leave this value empty or set to FALSE. To 
+# use stir's built-in Wordpress prepare function, set this value to TRUE.
 # PREPARE="{{PREPARE}}"
 
+# If you need to load extra environment variables, enter a the location to
+# that file below.  
+# PREPARE_CONFIG="{{PREPARE_CONFIG}}"
+
 # The URL for this repo's hosting, with no trailing slash. For example, if 
 # you use Github and your repo URL looks like https://github.com/EMRL/deploy
 # your REPOHOST should be set to https://github.com/EMRL (with no trailing 
@@ -104,6 +109,9 @@ PROJECT_VERSION="3.8"
 # upgrades to happen more reliably.
 # ACFKEY="{{ACFKEY}}"
 
+# Gravityforms License
+# GRAVITY_FORMS_LICENSE="{{GRAVITY_FORMS_LICENSE}}"
+
 
 ###############################################################################
 # Deployment Configuration
diff --git a/lib/env-check.sh b/lib/env-check.sh
index 186a612..fdb9f42 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -143,7 +143,8 @@ function update_project() {
     ACCESSTOKEN REFRESHTOKEN PROFILEID MONITORURL MONITORUSER MONITORPASS \
     SERVERID NIKTO NIKTO_CONFIG STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST \
     PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS SCP_DEPLOY_PORT \
-    NIKTO NIKTO_CONFIG NIKTO_PROXY DB_API_TOKEN DB_BACKUP_PATH PREPARE)
+    NIKTO NIKTO_CONFIG NIKTO_PROXY DB_API_TOKEN DB_BACKUP_PATH PREPARE \
+    PREPARE_CONFIG)
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
diff --git a/lib/git.sh b/lib/git.sh
index 58d84bb..72b6ebd 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -131,7 +131,7 @@ function gitStage() {
 # Commit, with message
 function gitCommit() {
   # Smart commit stuff
-  smrtCommit; empty_line
+  smart_commit; empty_line
 
   # Do a dry run; check for anything to commit
   git commit --dry-run &>> "${logFile}" 
diff --git a/lib/quit.sh b/lib/quit.sh
index f302605..aec3188 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -127,9 +127,9 @@ function clean_up() {
   fi
 
   # Cleanup clone
-  if [[ -d "/tmp/${REPO}" ]]; then 
-    cd /tmp
-    rm -rf /tmp/"${REPO}"
+  if [[ -d "/tmp/${REPO}" ]] && [[ "${PREPARE_ONLY}" != "1" ]] && [[ "${SET_ENV}" == "1" ]]; then 
+    cd "${WP_TMP}"; "${WPCLI}"/wp db drop --yes &>> /dev/null
+    cd /tmp; rm -rf /tmp/"${REPO}"
   fi
 
   # Attempt to reset the console when running --quiet
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index fa6d6e2..ed7f4a9 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -7,7 +7,7 @@
 ###############################################################################
 
 # Constructing smart *cough* commit messages
-function smrtCommit() {
+function smart_commit() {
   if [[ "${SMARTCOMMIT}" == "TRUE" ]]; then
     # Checks for the existence of a successful plugin update, using grep, and if 
     # we find updates, grab the relevant line of text from the logs
@@ -20,7 +20,7 @@ function smrtCommit() {
       fi
     fi
 
-    if [[ ! -z "${PCA}" ]] || [[ ! -z "${UPDCORE}" ]]; then
+    if [[ ! -z "${PCA}" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wpFile}" ]]; then
       trace "Building commit message"
 
       if [[ -z "${PCA}" ]] && [[ -z "${ACFFILE}" ]]; then
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 335e672..0a0202a 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -162,7 +162,7 @@ function is_integer() {
 function dependency_check() {
   # Is git installed?
   hash git 2>/dev/null || {
-    error "deploy ${VERSION} requires git to function properly." 
+    error "stir ${VERSION} requires git to function properly." 
   }
 
   # Does a configuration file for this repo exist?
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index d2f4fc2..b2888cc 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -7,13 +7,11 @@
 ###############################################################################
 
 # Initialize variables
-var=(SSH_REPO TMP_PATH SET_ENV)
+var=(SSH_REPO TMP_PATH SET_ENV dest REMOVE_ME MYSQL_USER MYSQL_PASS)
 init_loop
 
 function wp_clone() {
   # This is all under construction
-  trace "Cloning the project..."
-
   # Get paths
   wp_path
   wp_tmp
@@ -33,22 +31,114 @@ function wp_clone() {
   
   notice "Setting up project..."
   cd /tmp; \
-  git clone "${SSH_REPO}" #&>> /dev/null &
-  #spinner $!
+  if [[ -d "/tmp/${REPO}" ]]; then
+    cd "/tmp/${REPO}"
+    git checkout "${MASTER}" &>> /dev/null; error_check
+  else
+    trace status "Cloning ${SSH_REPO}... "
+    git clone "${SSH_REPO}" &>> /dev/null; error_check
+    trace notime "OK"
+  fi
 
   # Copy plugins that are not part of repo (for update checking)
-  cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
+  # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
 
   # Reset our root working directory
   APP_PATH="/tmp/${REPO}"
   cd "${APP_PATH}"
 
-  # Get environment variables
-  get_env
+  # Setup environment variables
+  create_env
   WP_PATH="${WP_TMP}"
+  ACTIVECHECK="FALSE"
+  cd "${WP_PATH}"
+
+  # Create database
+  if [[ -z "${PREPARE_CONFIG}" ]]; then
+    error "MYSQL user info not found, can not create database."
+  else
+    # This is temporary
+    source "${PREPARE_CONFIG}"
+
+    # If using .env
+    if [[ "${env_file}" == *".env" ]]; then
+      sed -i -e "/DB_DATABASE/c\DB_DATABASE='null'" \
+        -e "/DB_USERNAME/c\DB_USERNAME='${MYSQL_USER}'" \
+        -e "/DB_PASSWORD/c\DB_PASSWORD='${MYSQL_PASS}'" \
+        "${APP_PATH}/${env_file}"
+    fi
+
+    # If using env.php config
+    if [[ "${env_file}" == *"env.php"* ]]; then
+      sed -i -e "/host/c\'host' => 'localhost'," \
+        -e "/name/c\'name' => 'null'," \
+        -e "/user/c\'user' => '${MYSQL_USER}'," \
+        -e "/pass/c\'pass' => '${MYSQL_PASS}'," \
+        "${APP_PATH}/${env_file}"
+    fi
+
+    # If using a standard wp-config.php
+    if [[ "${env_file}" == *"wp-config.php"* ]]; then
+      sed -i -e "s^localhost^localhost^g" \
+        -e "s^database_name_here^null^g" \
+        -e "s^username_here^${MYSQL_USER}^g" \
+        -e "s^password_here^${MYSQL_PASS}^g" \
+        "${APP_PATH}/${env_file}"
+    fi
+
+    # Set Gravityforms license if needed
+    if [[ -n "${GRAVITY_FORMS_LICENSE}" ]]; then
+      sed -i "/GRAVITY_FORMS_LICENSE/c\GRAVITY_FORMS_LICENSE='${GRAVITY_FORMS_LICENSE}'" \
+        "${APP_PATH}/${env_file}"
+    fi
+
+    # Composer stuff
+    if [[ -f "${APP_PATH}/composer.json" ]]; then
+      # TODO Get real path later
+      cd "${APP_PATH}"
+      /usr/local/bin/composer install
+    fi
+
+    cat "${APP_PATH}/${env_file}" #; quietExit
+
+    trace status "Creating database... "
+    wp db create &>> /dev/null; error_check; trace notime "OK"
+    trace status "Installing Wordpress... "
+    wp core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
+    trace notime "OK"
+  fi
+}
+
+function create_env() {
+  env_file=(config/env-example.php env-example.php .env-example.php \
+    .env.example .env.sample public/wp-config-sample.php wp-config-sample.php)
+  for arg in "${env_file[@]}"; do
+    if [[ -f "${APP_PATH}/${arg}" ]]; then
+      if [[ "${arg}" == *"-example"* ]]; then
+        REMOVE_ME="-example"
+      elif [[ "${arg}" == *"-sample"* ]]; then
+        REMOVE_ME="-sample"
+      elif [[ "${arg}" == *".sample"* ]]; then
+        REMOVE_ME=".sample"
+      elif [[ "${arg}" == *".example"* ]]; then
+        REMOVE_ME=".example"
+      fi
+      dest="$(printf '%s\n' ${arg//$REMOVE_ME/})"
+      cp "${arg}" "${dest}" &>> "${logFile}"
+      SET_ENV="1"
+      env_file="${dest}"
+    fi
+  done
+
+  if [[ "${SET_ENV}" != "1" ]]; then
+    error "Configuration file not found, can not continue."
+  fi
+
+  # This is a freshly cloned repo, no need for garbage collection
+  GARBAGE="FALSE"
 }
 
-function get_env() {
+function get_env_deprecated() {
   env_file=(config/env.php env.php .env.php .env public/wp-settings.php)
   for arg in "${env_file[@]}"; do
     if [[ -f "${WORKPATH}/${APP}/${arg}" ]]; then
@@ -64,5 +154,6 @@ function get_env() {
     quickExit
   fi
 
+  # This is a freshly cloned repo, no need for garbage collection
   GARBAGE="FALSE"
 }
\ No newline at end of file
diff --git a/lib/wp.sh b/lib/wp.sh
index 73edd6e..553d802 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -72,15 +72,18 @@ function wp_update_check() {
 function wp_check() {
   # Is wp-cli installed? 
   if hash "${WPCLI}"/wp 2>/dev/null; then
-  trace status "wp-cli found, checking for Wordpress... "
-    # Check for Wordpress
-    if [[ -f "${WORKPATH}"/"${APP}${WPROOT}${WPSYSTEM}"/wp-settings.php ]]; then
-      trace notime "FOUND"
+    trace "wp-cli found"
+
+    # Bug out if this is a new style project
+    if [[ "${PREPARE}" == "TRUE" ]]; then 
+      return
+    fi
 
+    if [[ -f "${WORKPATH}"/"${APP}${WPROOT}${WPSYSTEM}"/wp-settings.php ]]; then
       # Get Wordpress paths
       wp_path;
 
-      # Database check
+      # Local database check
       trace status "Checking database... "
       "${WPCLI}"/wp db check &>> /dev/null; EXITCODE=$?; 
       
@@ -98,7 +101,6 @@ function wp_check() {
         "${WPCLI}"/wp core version --extra  &>> "${logFile}";
       fi
     else
-      trace notime "NOT FOUND"
       WP_PATH="FALSE"
     fi
   fi
diff --git a/stir.sh b/stir.sh
index 6c2d035..8757fe7 100755
--- a/stir.sh
+++ b/stir.sh
@@ -98,7 +98,8 @@ function init_env() {
   CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \
   PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \
   INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE \
-  NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE PREPARE_ONLY)
+  NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE PREPARE_ONLY PREPARE_CONFIG \
+  GRAVITY_FORMS_LICENSE)
   init_loop
 }
 
@@ -505,7 +506,7 @@ fi
 trace "Current project is ${APP}"
 if [[ "${INCOGNITO}" != "TRUE" ]]; then
   trace "Current user is ${DEV}"
-  trace "Git lock at ${gitLock}"
+  # trace "Git lock at ${gitLock}"
 fi
 
 # Start checking for errors
diff --git a/test/extended.sh b/test/extended.sh
deleted file mode 100755
index 4730802..0000000
--- a/test/extended.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. assert.sh
-
-assert "echo"                           # no output expected
-assert "echo foo" "foo"                 # output expected
-assert "cat" "bar" "bar"                # output expected if input's given
-assert_raises "true" 0 ""               # status code expected
-assert_raises "exit 127" 127 ""         # status code expected
-assert "head -1 < $0" "#!/bin/bash"     # redirections
-assert "seq 2" "1\n2"                   # multi-line output expected
-assert_raises 'read a; exit $a' 42 "42" # variables still work
-assert "echo 1;
-echo 2      # ^" "1\n2"                 # semicolon required!
-assert_end demo
-
-_clean() {
-    _assert_reset # reset state
-    DEBUG= STOP= INVARIANT=1 DISCOVERONLY= CONTINUE= # reset flags
-    eval $* # read new flags
-}
-
-# clean output
-assert "_clean; assert true; assert_end" \
-"all 1 tests passed."
-# error reports on failure
-assert "_clean; assert 'seq 1'; assert_end" \
-'test #1 "seq 1" failed:\n\texpected nothing\n\tgot "1"\n1 of 1 tests failed.'
-assert "_clean; assert true '1'; assert_end" \
-'test #1 "true" failed:\n\texpected "1"\n\tgot nothing\n1 of 1 tests failed.'
-assert "_clean; assert 'true' 'foo' 'bar'; assert_end" \
-'test #1 "true <<< bar" failed:\n\texpected "foo"\n\tgot nothing\n1 of 1 tests failed.'
-# debug output (-v)
-assert "_clean DEBUG=1; assert true; assert_end" \
-".\nall 1 tests passed."
-assert "_clean DEBUG=1; assert_raises false; assert_end" \
-'X\ntest #1 "false" failed:\n\tprogram terminated with code 1 instead of 0
-1 of 1 tests failed.'
-# collect tests only (-d)
-assert "_clean DISCOVERONLY=1; assert true; assert false; assert_end" \
-"collected 2 tests."
-# stop immediately on failure (-x)
-assert "_clean STOP=1; assert_raises false; assert_end" \
-'test #1 "false" failed:\n\tprogram terminated with code 1 instead of 0'
-# runtime statistics (omission of -i)
-assert_raises "_clean INVARIANT=;
-assert_end | egrep 'all 0 tests passed in ([0-9]|[0-9].[0-9]{3})s'"
-# always exit successfully (--continue)
-assert_raises "bash -c '. assert.sh; assert_raises false; assert_end' '' --continue" 0
-# skip
-assert "_clean; skip; assert_raises false; assert_raises true; assert_end" \
-"all 1 tests passed."
-# conditional skip
-assert "_clean; skip_if true; assert_raises false; assert_end;" \
-"all 0 tests passed."
-assert "_clean; skip_if false; assert_raises true; assert_end;" \
-"all 1 tests passed."
-assert "_clean; skip_if bash -c 'exit 1'; assert_raises false; assert_end;" \
-"all 0 tests passed."
-# subshells and pipes can be used in skip as well (albeit escaped)
-assert "_clean; skip_if 'cat /etc/passwd | grep \$(echo \$USER)';
-assert_raises false; assert_end;" \
-"all 0 tests passed."
-assert_end output
-
-# stderr should NOT leak if ignored
-assert "_clean; assert less" ""
-# stderr should be redirectable though
-assert '_clean; assert "less 2>&1" "Missing filename (\"less --help\" for help)"'
-# bash failures behave just like stderr
-assert "_clean; assert ___invalid" ""
-# test suites can be nested and settings are inherited
-# (ie. we don't need to invoke the inner suite with the very same options,
-# namely --invariant)
-assert "_clean; bash -c '
-. assert.sh;
-assert_raises true; assert_end outer;
-bash -c \". assert.sh; assert_raises true; assert_end inner\"
-' '' --invariant" "all 1 outer tests passed.
-all 1 inner tests passed."  #  is $0
-# set the correct exit status
-assert_raises "_clean; bash -c \"
-. assert.sh; assert true ''; assert_end one;
-assert 'echo bar' 'bar'; assert_end two\"" 0
-assert_raises "_clean; bash -c \"
-. assert.sh; assert true 'foo'; assert_end one;
-assert 'echo bar' 'bar'; assert_end two\"" 1
-# ..but do not override it
-assert_raises "_clean; bash -c \"
-. assert.sh; assert true 'foo'; assert_end one;
-assert 'echo bar' 'bar'; assert_end two; exit 3\"" 3
-# environment variables do not leak
-assert "_clean; x=0; assert 'x=1'; assert_raises 'x=2'; echo \$x" 0
-assert "_clean; x=0; assert 'export x=1'; assert_raises 'export x=2';
-echo \$x" 0
-# options do not leak
-assert_raises "set +e"
-# assert_raises "shopt -o errexit"
-# skip properly resets all options
-# assert_raises "_clean; set +e; skip; assert_raises false; shopt -o errexit" 1
-# assert_raises "_clean; set -e; skip; assert_raises false; shopt -o errexit"
-# assert_raises "_clean; shopt -u extdebug; skip; assert_raises false; shopt extdebug" 1
-# assert_raises "_clean; shopt -s extdebug; skip; assert_raises false; shopt extdebug"
-
-assert_end interaction
-
-# commit: fixed output to report all errors, not just the first
-assert "_clean;
-assert_raises false; assert_raises false;
-assert_end" 'test #1 "false" failed:
-\tprogram terminated with code 1 instead of 0
-test #2 "false" failed:
-\tprogram terminated with code 1 instead of 0
-2 of 2 tests failed.'
-# commit: added default value for assert_raises
-assert_raises "_clean; assert_raises true; assert_end" 0
-# commit: fixed verbose failure reports in assert_raises
-assert "_clean DEBUG=1; assert_raises false; assert_end" 'X
-test #1 "false" failed:
-\tprogram terminated with code 1 instead of 0
-1 of 1 tests failed.'
-# commit: redirected assert_raises output
-assert "_clean; assert_raises 'echo 1'; assert_end" "all 1 tests passed."
-# commit: fixed --discover to reset properly
-assert "_clean DISCOVERONLY=1;
-assert 1; assert 1; assert_end;
-assert 1; assert_end;" "collected 2 tests.\ncollected 1 tests."
-# commit: stopped errors from leaking into other test suites
-assert "_clean;
-assert_raises false; assert_raises false; assert_end;
-assert_raises false; assert_end" 'test #1 "false" failed:
-\tprogram terminated with code 1 instead of 0
-test #2 "false" failed:
-\tprogram terminated with code 1 instead of 0
-2 of 2 tests failed.
-test #1 "false" failed:
-\tprogram terminated with code 1 instead of 0
-1 of 1 tests failed.'
-# issue 1: assert.sh: line 87: DISCOVERONLY: unbound variable
-assert "_clean; set -u; assert_raises true; assert true; assert_end" \
-"all 2 tests passed."
-# issue 3: Not working on Mac OS X 10.7.5
-assert "
-_date=20;
-date() {
-echo \${_date}N;
-};
-_clean INVARIANT=;
-assert date 20N;
-_date=22;
-assert_end" "all 1 tests passed in 2.000s."
-# commit: supported formatting codes
-assert "echo %s" "%s"
-assert "echo -n %s | wc -c" "2"
-# date with no nanosecond support
-date() {         # date mock
-    echo "123N"
-}
-assert '_clean DEBUG=1 INVARIANT=; tests_starttime="0N"; assert_end' \
-       '\nall 0 tests passed in 123.000s.'
-unset -f date  # bring back original date
-assert_end regression
-
-
diff --git a/test/test.sh b/test/test.sh
deleted file mode 100644
index d0f197a..0000000
--- a/test/test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-testEquality() {
-	assertEquals 1 1
-}
-
-. shunit2/shunit2
-
-

From 586a21d0aea861b65af7423a96aab13509cf2a39 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 5 Nov 2018 17:54:55 -0800
Subject: [PATCH 133/334] Restoring tests, oops

---
 test/extended.sh | 166 +++++++++++++++++++++++++++++++++++++++++++++++
 test/test.sh     |   9 +++
 2 files changed, 175 insertions(+)
 create mode 100755 test/extended.sh
 create mode 100755 test/test.sh

diff --git a/test/extended.sh b/test/extended.sh
new file mode 100755
index 0000000..4730802
--- /dev/null
+++ b/test/extended.sh
@@ -0,0 +1,166 @@
+#!/bin/bash
+
+set -e
+
+. assert.sh
+
+assert "echo"                           # no output expected
+assert "echo foo" "foo"                 # output expected
+assert "cat" "bar" "bar"                # output expected if input's given
+assert_raises "true" 0 ""               # status code expected
+assert_raises "exit 127" 127 ""         # status code expected
+assert "head -1 < $0" "#!/bin/bash"     # redirections
+assert "seq 2" "1\n2"                   # multi-line output expected
+assert_raises 'read a; exit $a' 42 "42" # variables still work
+assert "echo 1;
+echo 2      # ^" "1\n2"                 # semicolon required!
+assert_end demo
+
+_clean() {
+    _assert_reset # reset state
+    DEBUG= STOP= INVARIANT=1 DISCOVERONLY= CONTINUE= # reset flags
+    eval $* # read new flags
+}
+
+# clean output
+assert "_clean; assert true; assert_end" \
+"all 1 tests passed."
+# error reports on failure
+assert "_clean; assert 'seq 1'; assert_end" \
+'test #1 "seq 1" failed:\n\texpected nothing\n\tgot "1"\n1 of 1 tests failed.'
+assert "_clean; assert true '1'; assert_end" \
+'test #1 "true" failed:\n\texpected "1"\n\tgot nothing\n1 of 1 tests failed.'
+assert "_clean; assert 'true' 'foo' 'bar'; assert_end" \
+'test #1 "true <<< bar" failed:\n\texpected "foo"\n\tgot nothing\n1 of 1 tests failed.'
+# debug output (-v)
+assert "_clean DEBUG=1; assert true; assert_end" \
+".\nall 1 tests passed."
+assert "_clean DEBUG=1; assert_raises false; assert_end" \
+'X\ntest #1 "false" failed:\n\tprogram terminated with code 1 instead of 0
+1 of 1 tests failed.'
+# collect tests only (-d)
+assert "_clean DISCOVERONLY=1; assert true; assert false; assert_end" \
+"collected 2 tests."
+# stop immediately on failure (-x)
+assert "_clean STOP=1; assert_raises false; assert_end" \
+'test #1 "false" failed:\n\tprogram terminated with code 1 instead of 0'
+# runtime statistics (omission of -i)
+assert_raises "_clean INVARIANT=;
+assert_end | egrep 'all 0 tests passed in ([0-9]|[0-9].[0-9]{3})s'"
+# always exit successfully (--continue)
+assert_raises "bash -c '. assert.sh; assert_raises false; assert_end' '' --continue" 0
+# skip
+assert "_clean; skip; assert_raises false; assert_raises true; assert_end" \
+"all 1 tests passed."
+# conditional skip
+assert "_clean; skip_if true; assert_raises false; assert_end;" \
+"all 0 tests passed."
+assert "_clean; skip_if false; assert_raises true; assert_end;" \
+"all 1 tests passed."
+assert "_clean; skip_if bash -c 'exit 1'; assert_raises false; assert_end;" \
+"all 0 tests passed."
+# subshells and pipes can be used in skip as well (albeit escaped)
+assert "_clean; skip_if 'cat /etc/passwd | grep \$(echo \$USER)';
+assert_raises false; assert_end;" \
+"all 0 tests passed."
+assert_end output
+
+# stderr should NOT leak if ignored
+assert "_clean; assert less" ""
+# stderr should be redirectable though
+assert '_clean; assert "less 2>&1" "Missing filename (\"less --help\" for help)"'
+# bash failures behave just like stderr
+assert "_clean; assert ___invalid" ""
+# test suites can be nested and settings are inherited
+# (ie. we don't need to invoke the inner suite with the very same options,
+# namely --invariant)
+assert "_clean; bash -c '
+. assert.sh;
+assert_raises true; assert_end outer;
+bash -c \". assert.sh; assert_raises true; assert_end inner\"
+' '' --invariant" "all 1 outer tests passed.
+all 1 inner tests passed."  #  is $0
+# set the correct exit status
+assert_raises "_clean; bash -c \"
+. assert.sh; assert true ''; assert_end one;
+assert 'echo bar' 'bar'; assert_end two\"" 0
+assert_raises "_clean; bash -c \"
+. assert.sh; assert true 'foo'; assert_end one;
+assert 'echo bar' 'bar'; assert_end two\"" 1
+# ..but do not override it
+assert_raises "_clean; bash -c \"
+. assert.sh; assert true 'foo'; assert_end one;
+assert 'echo bar' 'bar'; assert_end two; exit 3\"" 3
+# environment variables do not leak
+assert "_clean; x=0; assert 'x=1'; assert_raises 'x=2'; echo \$x" 0
+assert "_clean; x=0; assert 'export x=1'; assert_raises 'export x=2';
+echo \$x" 0
+# options do not leak
+assert_raises "set +e"
+# assert_raises "shopt -o errexit"
+# skip properly resets all options
+# assert_raises "_clean; set +e; skip; assert_raises false; shopt -o errexit" 1
+# assert_raises "_clean; set -e; skip; assert_raises false; shopt -o errexit"
+# assert_raises "_clean; shopt -u extdebug; skip; assert_raises false; shopt extdebug" 1
+# assert_raises "_clean; shopt -s extdebug; skip; assert_raises false; shopt extdebug"
+
+assert_end interaction
+
+# commit: fixed output to report all errors, not just the first
+assert "_clean;
+assert_raises false; assert_raises false;
+assert_end" 'test #1 "false" failed:
+\tprogram terminated with code 1 instead of 0
+test #2 "false" failed:
+\tprogram terminated with code 1 instead of 0
+2 of 2 tests failed.'
+# commit: added default value for assert_raises
+assert_raises "_clean; assert_raises true; assert_end" 0
+# commit: fixed verbose failure reports in assert_raises
+assert "_clean DEBUG=1; assert_raises false; assert_end" 'X
+test #1 "false" failed:
+\tprogram terminated with code 1 instead of 0
+1 of 1 tests failed.'
+# commit: redirected assert_raises output
+assert "_clean; assert_raises 'echo 1'; assert_end" "all 1 tests passed."
+# commit: fixed --discover to reset properly
+assert "_clean DISCOVERONLY=1;
+assert 1; assert 1; assert_end;
+assert 1; assert_end;" "collected 2 tests.\ncollected 1 tests."
+# commit: stopped errors from leaking into other test suites
+assert "_clean;
+assert_raises false; assert_raises false; assert_end;
+assert_raises false; assert_end" 'test #1 "false" failed:
+\tprogram terminated with code 1 instead of 0
+test #2 "false" failed:
+\tprogram terminated with code 1 instead of 0
+2 of 2 tests failed.
+test #1 "false" failed:
+\tprogram terminated with code 1 instead of 0
+1 of 1 tests failed.'
+# issue 1: assert.sh: line 87: DISCOVERONLY: unbound variable
+assert "_clean; set -u; assert_raises true; assert true; assert_end" \
+"all 2 tests passed."
+# issue 3: Not working on Mac OS X 10.7.5
+assert "
+_date=20;
+date() {
+echo \${_date}N;
+};
+_clean INVARIANT=;
+assert date 20N;
+_date=22;
+assert_end" "all 1 tests passed in 2.000s."
+# commit: supported formatting codes
+assert "echo %s" "%s"
+assert "echo -n %s | wc -c" "2"
+# date with no nanosecond support
+date() {         # date mock
+    echo "123N"
+}
+assert '_clean DEBUG=1 INVARIANT=; tests_starttime="0N"; assert_end' \
+       '\nall 0 tests passed in 123.000s.'
+unset -f date  # bring back original date
+assert_end regression
+
+
diff --git a/test/test.sh b/test/test.sh
new file mode 100755
index 0000000..d0f197a
--- /dev/null
+++ b/test/test.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+testEquality() {
+	assertEquals 1 1
+}
+
+. shunit2/shunit2
+
+

From 8120ba95c861c9f7f0e2cbb2ece6600a39720b2f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 13 Dec 2018 18:32:24 -0800
Subject: [PATCH 134/334] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b472e3c..e7e6090 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - `deploy` is now `stir`
 - Invoice creation will now exit gracefully if project is not correctly configured
-- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory (This is the equivalent of setting `DONOTDEPLOY="TRUE"` in `.deploy.sh`)
+- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory (This is the equivalent of setting `DONOTDEPLOY="TRUE"` in `.stir.sh`)
 ### Fixed
 - Fixed a bug that occasionally caused successful deployment to be incorrectly reported
 

From 5683b32e287ecfb7924a705d115823d270d5f1b5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 20 Dec 2018 13:45:29 -0800
Subject: [PATCH 135/334] Making a mess

---
 README.md           |  8 ++++----
 lib/main.sh         |  2 +-
 lib/utilities.sh    |  6 +++---
 lib/wp-clone.sh     | 46 ++++++++++++++++++---------------------------
 lib/wp-core.sh      | 17 +++++++++++++++--
 lib/wp-plugins.sh   |  2 +-
 lib/wp-wordfence.sh |  2 +-
 lib/wp.sh           | 36 ++++++++++++++++++++++++++++++-----
 stir.sh             |  4 ++--
 9 files changed, 76 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index eb90273..af44e4e 100755
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 `stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 
-[Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md)
+[Changelog](https://github.com/EMRL/stir/blob/master/CHANGELOG.md)
 
 `stir` is in daily use at [EMRL](http://emrl.com), an advertising, design, and development agency in northern California. If you have any questions, please feel free to contact us.
 
@@ -68,13 +68,13 @@ Other Options:
 `stir` can be run from anywhere, but if you'd like it to be installed server-wide follow the instructions below. 
 
 1. In the `stir` directory, type `sudo ./install/doinst.sh` and enter your sudo password when/if asked
-2. That's it. By default `deploy` is installed to `/usr/local/bin/` and support files are installed to `/etc/deploy/`
+2. That's it. By default `stir` is installed to `/usr/local/bin/` and support files are installed to `/etc/stir/`
 
 ## Configuration
 
 Configuration is handled globally in the `etc/stir/global.conf` file. Individual users also have their own settings in `~/.stirrc`
 
-Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/deploy/blob/master/etc/deploy.sh).
+Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/stir/blob/master/etc/stir.sh).
 
 ## Slack
 
@@ -82,7 +82,7 @@ For workgroups and teams that use it, `stir` is able to integrate with Slack. Yo
 
 ## Autopilot
 
-`stir --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/deploy/blob/master/etc/cron/deploy.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed.
+`stir --automate` works well for unattended updates of Wordpress sites; great for maintaining updates via a crontab. An example cron script can be [found here](https://github.com/EMRL/stir/blob/master/etc/cron/stir.cron.example). Running in this mode, the project will only be deployed if there are Wordpress core or plugin updates. If other code changes are detected the project will not be auto-updated. Smart Commits must be enabled or nothing will be deployed.
 
 ## Contact
 
diff --git a/lib/main.sh b/lib/main.sh
index 398ad76..02df9c3 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -73,7 +73,7 @@ function main() {
 
       # Continue normally
       if [[ "${APPROVE}" != "1" ]]; then
-        wpPkg       # Run Wordpress upgrades if needed
+        wp          # Run Wordpress upgrades if needed
         pkgMgr      # Run package manager
         gitStatus   # Make sure there's anything here to commit         
       fi
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 0a0202a..25802d9 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -138,10 +138,10 @@ function go() {
 function fix_index() {
   # A rather brutal fix for index permissions issues
   if [[ "${FIXINDEX}" == "TRUE" ]]; then
-    if [[ ! -w "${WORKPATH}/${APP}/.git/index" ]]; then
+    if [[ ! -w "${APP_PATH}/.git/index" ]]; then
       trace "Index is not writable, attempting to fix..."
-      sudo chmod 777 "${WORKPATH}/${APP}/.git/index"; error_check
-      if [[ ! -w "${WORKPATH}/${APP}/.git/index" ]]; then
+      sudo chmod 777 "${APP_PATH}/.git/index"; error_check
+      if [[ ! -w "${APP_PATH}/.git/index" ]]; then
         error "Unable to write new index file."
       fi
     fi
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index b2888cc..e9567fe 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -7,7 +7,8 @@
 ###############################################################################
 
 # Initialize variables
-var=(SSH_REPO TMP_PATH SET_ENV dest REMOVE_ME MYSQL_USER MYSQL_PASS)
+var=(SSH_REPO TMP_PATH SET_ENV dest REMOVE_ME MYSQL_USER MYSQL_PASS \
+  DB_CHECK)
 init_loop
 
 function wp_clone() {
@@ -96,16 +97,25 @@ function wp_clone() {
     if [[ -f "${APP_PATH}/composer.json" ]]; then
       # TODO Get real path later
       cd "${APP_PATH}"
-      /usr/local/bin/composer install
+      /usr/local/bin/composer install; error_check
+    fi
+    
+    # Database check
+    DB_CHECK="$(/usr/bin/mysqlshow --user=${MYSQL_USER} --password=${MYSQL_PASS} null 2> /dev/null | grep -o null)"
+    if [[ "${DB_CHECK}" != "null" ]]; then
+      trace status "Creating database... "
+      "${WPCLI}"/wp db create &>> /dev/null; error_check; trace notime "OK"
     fi
 
-    cat "${APP_PATH}/${env_file}" #; quietExit
+    # Install wordpress if there's no composer
+    # if [[ ! -f "${APP_PATH}/composer.json" ]]; then
+    #  trace status "Installing Wordpress... "
+    #  "${WPCLI}"/wp core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
+    #  trace notime "OK"
+    # fi
 
-    trace status "Creating database... "
-    wp db create &>> /dev/null; error_check; trace notime "OK"
-    trace status "Installing Wordpress... "
-    wp core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
-    trace notime "OK"
+    # Check server
+    # wp_server_check
   fi
 }
 
@@ -137,23 +147,3 @@ function create_env() {
   # This is a freshly cloned repo, no need for garbage collection
   GARBAGE="FALSE"
 }
-
-function get_env_deprecated() {
-  env_file=(config/env.php env.php .env.php .env public/wp-settings.php)
-  for arg in "${env_file[@]}"; do
-    if [[ -f "${WORKPATH}/${APP}/${arg}" ]]; then
-      cp "${WORKPATH}/${APP}/${arg}" "/tmp/${REPO}/${arg}"
-      if [[ -f "/tmp/${REPO}/${arg}" ]]; then
-        SET_ENV="1"
-      fi
-    fi
-  done
-
-  if [[ "${SET_ENV}" != "1" ]]; then
-    warning "Configuration file not found, can not continue."
-    quickExit
-  fi
-
-  # This is a freshly cloned repo, no need for garbage collection
-  GARBAGE="FALSE"
-}
\ No newline at end of file
diff --git a/lib/wp-core.sh b/lib/wp-core.sh
index 5bc7464..3adc66d 100755
--- a/lib/wp-core.sh
+++ b/lib/wp-core.sh
@@ -6,7 +6,7 @@
 # Checks for Wordpress core updates
 ###############################################################################
 
-function wpCore() {
+function wp_core() {
   # There's a little bug when certain plugins are spitting errors; work around 
   # seems to be to check for core updates a second time
   cd "${APP_PATH}"/"${WPROOT}"; \
@@ -39,8 +39,21 @@ function wpCore() {
       # Update available!  \o/
       echo -e "";
 
+      # This is only temporary, danger!
+      if [[ -f "${APP_PATH}/composer.json" ]]; then
+        trace "Found composer.json, updating"
+        cd "${APP_PATH}"; \
+        if [[ "${QUIET}" != "1" ]]; then
+          # Come back and get this path properly
+          /usr/local/bin/composer update &>> "${logFile}" &
+          spinner $!
+        else
+          /usr/local/bin/composer update &>> "${logFile}"
+        fi
+        cd "${WP_PATH}"; \
+
       # Check for broken wp-cli garbage
-      if [[ "${COREUPD}" == *"PHP"* ]]; then
+      elif [[ "${COREUPD}" == *"PHP"* ]]; then
         warning "Checking for available core update was unreliable, skipping.";
       else
         if [[ "${FORCE}" = "1" ]] || yesno --default no "A new version of Wordpress is available (${COREUPD}), update? [y/N] "; then
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index e2a4e5e..5c0c3d7 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -6,7 +6,7 @@
 # Checks for Wordpress plugin updates
 ###############################################################################
 
-function wpPlugins() {
+function wp_plugins() {
   # If available then let's do it
   info "The following updates are available:"
   # Clean the garbage out of the log for console display
diff --git a/lib/wp-wordfence.sh b/lib/wp-wordfence.sh
index 802e141..b128957 100755
--- a/lib/wp-wordfence.sh
+++ b/lib/wp-wordfence.sh
@@ -7,7 +7,7 @@
 # staging server
 ###############################################################################
 
-function wfCheck() {
+function wf_check() {
   if [[ "${WFCHECK}" == "TRUE" ]]; then
     if [[ -f "${WORKPATH}/${APP}${WPROOT}${WPAPP}/wflogs/config.php" ]]; then
       trace "Wordfence detected"; empty_line
diff --git a/lib/wp.sh b/lib/wp.sh
index 553d802..949ff43 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -7,14 +7,14 @@
 ###############################################################################
 
 # Initialize variables
-var=(WP_PATH)
+var=(WP_PATH PID)
 init_loop
 
-function wpPkg() {
+function wp() {
   # Make sure we are allowed to update
   if [[ "${SKIPUPDATE}" != "1" ]] && [[ "${WP_PATH}" != "FALSE" ]]; then
     # Check for Wordfence
-    wfCheck
+    wf_check
     
     cd "${WP_PATH}"
 
@@ -30,7 +30,7 @@ function wpPkg() {
     # Check the logs
     #if grep -q "U = Update Available" "${logFile}"; then
     if grep -q "Available plugin updates:" "${wpFile}"; then    
-      wpPlugins
+      wp_plugins
     else
       # Was there a database glitch?
       if grep -q 'plugins can not be updated' "${wpFile}"; then
@@ -44,7 +44,7 @@ function wpPkg() {
     if [[ "${DONOTUPDATEWP}" == "TRUE" ]]; then
       trace "Wordpress core updates disabled, skipping"
     else
-      wpCore
+      wp_core
     fi
   fi
 
@@ -106,6 +106,32 @@ function wp_check() {
   fi
 }
 
+function wp_server_check {
+  # Launch server
+  trace "Launching server"
+  "${WPCLI}"/wp server --host=localhost >> "${logFile}" 2>&1 &
+  PID=$!
+
+  # Keep checking for server to come online
+  until $(curl --output /dev/null --silent --head --fail http://localhost:8080); do
+    sleep 1
+  done
+
+  trace "Activating plugins"
+  "${WPCLI}"/wp plugin activate --all >> "${logFile}" 2>&1
+  trace "Activating theme"
+  "${WPCLI}"/wp theme activate site >> "${logFile}" 2>&1
+  
+  curl -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
+  
+  if [[ -z "$(curl -sL localhost:8080 | grep -E "Warning:|Fatal:")" ]]; then
+  #if curl -sL localhost:8080 | grep -E "Warning:|Fatal:" > /dev/null; then
+    trace "Local server check passed";
+  else
+    error "Local server check FAIL"
+  fi
+}
+
 function wp_path() {
   # Store path in variable and remove any extra /
   WP_PATH="${APP_PATH}${WPROOT}${WPAPP}"
diff --git a/stir.sh b/stir.sh
index 8757fe7..88d1812 100755
--- a/stir.sh
+++ b/stir.sh
@@ -141,7 +141,7 @@ Options:
   -S, --skip-update      Skip any Wordpress core/plugin updates
   -u, --update           If no available Wordpress updates, halt deployment
   -U, --update-only      Deploy only Wordpresss plugin/core updates
-  -P, --publish          Publish current production code to live environment
+  -D, --deploy           Deploy current production code to live environment
   -m, --merge            Force merge of branches
   -c, --current          Deploy a project from current working directory          
   -t, --time             Add time to project management integration
@@ -212,7 +212,7 @@ while [[ ${1:-unset} = -?* ]]; do
     -h|--help) flags >&2; exit ;;
     -u|--update) UPGRADE="1" ;;
     -U|--update-only) UPDATEONLY="1" ;;
-    -P|--publish) PUBLISH="1" ;;
+    -D|--deploy) PUBLISH="1" ;;
     -S|--skip-update) SKIPUPDATE="1" ;;
     -c|--current) CURRENT="1" ;;
     -v|--version) echo "$(basename "${0}") ${VERSION}"; exit ;;

From 876f27a73d2ba1f531f81a2160de28267661f2b1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 23 Feb 2019 12:52:54 -0800
Subject: [PATCH 136/334] Many change

---
 etc/stir-project.sh |  6 +++++-
 lib/env-check.sh    |  2 +-
 lib/quit.sh         |  8 ++++----
 lib/wp-clone.sh     | 14 +++++++-------
 lib/wp-plugins.sh   | 12 +++++++-----
 stir.sh             | 18 +++++++++---------
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 478de8f..81d7615 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -9,7 +9,7 @@
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-PROJECT_VERSION="3.8"
+PROJECT_VERSION="3.81"
 
 
 ###############################################################################
@@ -108,6 +108,10 @@ PROJECT_VERSION="3.8"
 # Wordpress plugin ACF Pro. Including your license key below will enable 
 # upgrades to happen more reliably.
 # ACFKEY="{{ACFKEY}}"
+#
+# If you need to lock your version of ACF fro some reason, set the value
+# below to TRUE
+# ACF_LOCK="{{ACF_LOCK}}"
 
 # Gravityforms License
 # GRAVITY_FORMS_LICENSE="{{GRAVITY_FORMS_LICENSE}}"
diff --git a/lib/env-check.sh b/lib/env-check.sh
index fdb9f42..c610f9c 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -144,7 +144,7 @@ function update_project() {
     SERVERID NIKTO NIKTO_CONFIG STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST \
     PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER SCP_DEPLOY_PASS SCP_DEPLOY_PORT \
     NIKTO NIKTO_CONFIG NIKTO_PROXY DB_API_TOKEN DB_BACKUP_PATH PREPARE \
-    PREPARE_CONFIG)
+    PREPARE_CONFIG ACF_LOCK)
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
diff --git a/lib/quit.sh b/lib/quit.sh
index aec3188..e0ad116 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -127,10 +127,10 @@ function clean_up() {
   fi
 
   # Cleanup clone
-  if [[ -d "/tmp/${REPO}" ]] && [[ "${PREPARE_ONLY}" != "1" ]] && [[ "${SET_ENV}" == "1" ]]; then 
-    cd "${WP_TMP}"; "${WPCLI}"/wp db drop --yes &>> /dev/null
-    cd /tmp; rm -rf /tmp/"${REPO}"
-  fi
+  #if [[ -d "/tmp/${REPO}" ]] && [[ "${PREPARE_ONLY}" != "1" ]] && [[ "${SET_ENV}" == "1" ]]; then 
+  #  cd "${WP_TMP}"; "${WPCLI}"/wp db drop --yes &>> /dev/null
+  #  cd /tmp; rm -rf /tmp/"${REPO}"
+  #fi
 
   # Attempt to reset the console when running --quiet
   if [[ "${QUIET}" != "1" ]]; then
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index e9567fe..77b0930 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -63,7 +63,7 @@ function wp_clone() {
 
     # If using .env
     if [[ "${env_file}" == *".env" ]]; then
-      sed -i -e "/DB_DATABASE/c\DB_DATABASE='null'" \
+      sed -i -e "/DB_DATABASE/c\DB_DATABASE='null_${REPO}'" \
         -e "/DB_USERNAME/c\DB_USERNAME='${MYSQL_USER}'" \
         -e "/DB_PASSWORD/c\DB_PASSWORD='${MYSQL_PASS}'" \
         "${APP_PATH}/${env_file}"
@@ -72,7 +72,7 @@ function wp_clone() {
     # If using env.php config
     if [[ "${env_file}" == *"env.php"* ]]; then
       sed -i -e "/host/c\'host' => 'localhost'," \
-        -e "/name/c\'name' => 'null'," \
+        -e "/name/c\'name' => 'null_${REPO}'," \
         -e "/user/c\'user' => '${MYSQL_USER}'," \
         -e "/pass/c\'pass' => '${MYSQL_PASS}'," \
         "${APP_PATH}/${env_file}"
@@ -81,7 +81,7 @@ function wp_clone() {
     # If using a standard wp-config.php
     if [[ "${env_file}" == *"wp-config.php"* ]]; then
       sed -i -e "s^localhost^localhost^g" \
-        -e "s^database_name_here^null^g" \
+        -e "s^database_name_here^null_${REPO}^g" \
         -e "s^username_here^${MYSQL_USER}^g" \
         -e "s^password_here^${MYSQL_PASS}^g" \
         "${APP_PATH}/${env_file}"
@@ -109,13 +109,13 @@ function wp_clone() {
 
     # Install wordpress if there's no composer
     # if [[ ! -f "${APP_PATH}/composer.json" ]]; then
-    #  trace status "Installing Wordpress... "
-    #  "${WPCLI}"/wp core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
-    #  trace notime "OK"
+    trace status "Installing Wordpress... "
+    "${WPCLI}"/wp core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
+    trace notime "OK"
     # fi
 
     # Check server
-    # wp_server_check
+    wp_server_check
   fi
 }
 
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index 5c0c3d7..a560826 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -32,11 +32,13 @@ function wp_plugins() {
 
   if [[ "${FORCE}" = "1" ]] || yesno --default no "Proceed with updates? [y/N] "; then
     # If ACFPRO needs an update, do it first via wget
-    if [[ "${QUIET}" != "1" ]]; then
-      acf_update &
-      spinner $!
-    else
-      acf_update
+    if [[ "${ACF_LOCK}" != "TRUE" ]]; then
+      if [[ "${QUIET}" != "1" ]]; then
+        acf_update &
+       spinner $!
+      else
+        acf_update
+      fi
     fi
 
     # First, check for for updates via composer
diff --git a/stir.sh b/stir.sh
index 88d1812..aa83218 100755
--- a/stir.sh
+++ b/stir.sh
@@ -91,15 +91,15 @@ function init_env() {
   POSTEMAILHEAD POSTEMAILTAIL POSTTOSLACK SLACKURL SLACKERROR POSTURL NOKEY \
   PROJNAME PROJCLIENT DEVURL PRODURL REPO MASTER PRODUCTION COMMITMSG DEPLOY \
   DONOTDEPLOY TASK CHECKBRANCH ACTIVECHECK CHECKTIME GARBAGE WFCHECK ACFKEY \
-  WFOFF REMOTELOG REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL \
-  DIGESTSLACK DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER SCPHOST \
-  SCPHOSTPATH SCPHOSTPORT SCPPASS SCPCMD SSHCMD LOGMSG EXPIRELOGS SERVERCHECK \
-  STASH MAILPATH REQUIREAPPROVAL ADDTIME SCPPORT TASKUSER CLIENTID \
-  CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN \
-  PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT \
-  INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION TERSE \
-  NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE PREPARE_ONLY PREPARE_CONFIG \
-  GRAVITY_FORMS_LICENSE)
+  ACF_LOCK WFOFF REMOTELOG REMOTETEMPLATE LOCALHOSTPOST LOCALHOSTPATH \
+  DIGESTEMAIL DIGESTSLACK DIGESTURL CLIENTLOGO REMOTEURL SCPPOST SCPUSER \
+  SCPHOST SCPHOSTPATH SCPHOSTPORT SCPPASS SCPCMD SSHCMD LOGMSG EXPIRELOGS \
+  SERVERCHECK STASH MAILPATH REQUIREAPPROVAL ADDTIME SCPPORT TASKUSER \
+  CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \
+  REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL \
+  CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION \
+  TERSE NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE PREPARE_ONLY \
+  PREPARE_CONFIG GRAVITY_FORMS_LICENSE)
   init_loop
 }
 

From 3079a82fe475ec659ebaa50ddca816016cb95c2c Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 23 Feb 2019 13:41:35 -0800
Subject: [PATCH 137/334] Config files

---
 etc/stir-global.conf | 4 ++--
 etc/stir-user.rc     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/stir-global.conf b/etc/stir-global.conf
index 9f2bfa2..f820708 100755
--- a/etc/stir-global.conf
+++ b/etc/stir-global.conf
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# deploy.conf
+# global.conf
 #
-# Global configuration file for deploy
+# Global configuration file for stir
 
 # This value indicates the version number when this file was last changed: 
 # it does not necessarily reflect deploy's current version number.
diff --git a/etc/stir-user.rc b/etc/stir-user.rc
index 2b68b04..e8a322a 100755
--- a/etc/stir-user.rc
+++ b/etc/stir-user.rc
@@ -1,6 +1,6 @@
 #!/bin/bash
-#
-# .deployrc
+
+# .stirrc
 #
 # This is a default user configuration file, located in ~/.deployrc
 #

From 625fca5add405077a2d06a7a8c2290b662e1a090 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 23 Feb 2019 13:54:43 -0800
Subject: [PATCH 138/334] Fix github ssh check

---
 lib/ssh-check.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ssh-check.sh b/lib/ssh-check.sh
index 1ac5598..16989f6 100755
--- a/lib/ssh-check.sh
+++ b/lib/ssh-check.sh
@@ -20,12 +20,12 @@ function ssh_check() {
         trace "git@bitbucket.org: OK"
       fi
     elif [[ "${REPOHOST}" == *"github"* ]]; then
-      ssh -oStrictHostKeyChecking=no git@github.org &> /dev/null; error_status     
-      if [[ "${EXITCODE}" != "0" ]]; then
-        error "git@github.org: SSH check failed (Error code ${EXITCODE})"
+      ssh -oStrictHostKeyChecking=no git@github.com &> /dev/null #; error_status     
+      if [[ "${EXITCODE}" -gt "1" ]]; then
+        error "git@github.com: SSH check failed (Error code ${EXITCODE})"
       else
-        [[ "${SSHTEST}" == "1" ]] && console "git@github.org: OK"
-        trace "git@github.org: OK"
+        [[ "${SSHTEST}" == "1" ]] && console "git@github.com: OK"
+        trace "git@github.com: OK"
       fi
     fi
   fi

From 71496ba1cf0dab05cb2c59f905e3f06524f48333 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 23 Feb 2019 14:05:30 -0800
Subject: [PATCH 139/334] WSL test commit

---
 etc/stir-project.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 81d7615..433248b 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -47,7 +47,9 @@ PROJECT_VERSION="3.81"
 # you use Github and your repo URL looks like https://github.com/EMRL/deploy
 # your REPOHOST should be set to https://github.com/EMRL (with no trailing 
 # slash) If most of your repos are all hosted at the same location, you may 
-# want to define this in either the global or user configuration files.
+# want to define this in either the global or user configuration files. Note
+# that Github will currently ask for a user/password in when using https://
+# instead of ssh - a fix for this is incoming ASAP.
 # REPOHOST="{{REPOHOST}}"
 
 # The exact name of the Bitbucket/Github repository

From ddf3716b247a8f5beb3d1c0993b4c54b80e3166a Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 23 Feb 2019 14:24:56 -0800
Subject: [PATCH 140/334] Sendmail checking

---
 lib/post-integration.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index 1bc445f..9ea3e7e 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -39,8 +39,14 @@ function mailPost() {
   if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${DIGEST}" != "1" ]]; then
     trace "Approval required, skipping integration"
   else
+
+    if [[ ! -f "${MAILPATH}/sendmail" ]]; then
+      empty_line; warning "Sendmail misconfigured or not found, skipping email integration."
+      return
+    fi
+
     echo "${COMMITURL}" >> "${postFile}"
-    postSendmail=$(<"${postFile}")
+    post=$(<"${postFile}")
     (
     # Is this an automated deployment?
     if [ "${AUTOMATE}" = "1" ]; then
@@ -66,8 +72,8 @@ function mailPost() {
     echo "To: ${POSTEMAIL}"
     echo "Content-Type: text/plain"
     echo
-    echo "${postSendmail}";
-    ) | "${MAILPATH}"/sendmail -t
+    echo "${post}";
+    ) | "${MAILPATH}"/ -t
   fi
 }
 

From 95e9bc6601891f5d91b578cbe3477c159e8b1246 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 23 Feb 2019 22:33:33 -0800
Subject: [PATCH 141/334] ACF commit

---
 lib/smart-commits.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index ed7f4a9..9b49a07 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -61,6 +61,10 @@ function smart_commit() {
 
       # Output the contents of $COMMITMSG
       if [[ -n "${COMMITMSG}" ]]; then
+				# This is temporary
+				if [[ "${ACF_LOCK}" == "TRUE" ]]; then
+					COMMITMSG="$(sed 's/, advanced-custom-fields-pro*......//g' <<< ${COMMITMSG})"
+				fi 
         trace "Auto-generated commit message: $COMMITMSG"
       fi
     fi

From 20d70f85affc9e3bf324f9f6e0380df9f0fc8fff Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 26 Feb 2019 10:34:23 -0800
Subject: [PATCH 142/334] Whoops

---
 lib/post-integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index 9ea3e7e..e970017 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -73,7 +73,7 @@ function mailPost() {
     echo "Content-Type: text/plain"
     echo
     echo "${post}";
-    ) | "${MAILPATH}"/ -t
+    ) | "${MAILPATH}"/sendmail -t
   fi
 }
 

From 34e43a0b2e700485c5f8ca4b3fe1a277053e6c0b Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 7 Mar 2019 16:57:34 -0800
Subject: [PATCH 143/334] Some minor prep

---
 lib/log-handling.sh | 2 +-
 lib/quit.sh         | 4 ++++
 lib/wp-clone.sh     | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index 896cba9..2851b90 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -188,7 +188,7 @@ function build_html() {
       fi
       if [[ "${DIGEST}" != "1" ]] && [[ "${REPORT}" != "1" ]]; then
         if [[ "${REPAIR}" == "1" ]] && [[ -z "${notes}" ]]; then
-          notes="Repaired and deployed codebase"
+          notes="Merged and deployed codebase"
         fi
         cat "${deployPath}/html/${HTMLTEMPLATE}/header.html" "${deployPath}/html/${HTMLTEMPLATE}/success.html" > "${htmlFile}"
       fi
diff --git a/lib/quit.sh b/lib/quit.sh
index e0ad116..7bcdfe1 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -132,6 +132,10 @@ function clean_up() {
   #  cd /tmp; rm -rf /tmp/"${REPO}"
   #fi
 
+  # Do we need to shutdown local wp server?
+  # This will spit out a PID to kill
+  # lsof -i:8080 -t 
+  
   # Attempt to reset the console when running --quiet
   if [[ "${QUIET}" != "1" ]]; then
     tput cnorm
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 77b0930..af9e41a 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -31,9 +31,9 @@ function wp_clone() {
   ssh_check
   
   notice "Setting up project..."
-  cd /tmp; \
+  cd ${WORKPATH}; \
   if [[ -d "/tmp/${REPO}" ]]; then
-    cd "/tmp/${REPO}"
+    cd "/${WORKPATH}/${REPO}"
     git checkout "${MASTER}" &>> /dev/null; error_check
   else
     trace status "Cloning ${SSH_REPO}... "

From 152e871c065cd74b72d46fa7e735280d3e2d33b5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 7 Mar 2019 18:16:16 -0800
Subject: [PATCH 144/334] Config checks

---
 .gitignore       |  4 +---
 lib/env-check.sh | 15 +++++++++++----
 stir.sh          | 12 ++++++------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index dfe7923..a34033f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-/config/
-/etc/deploy.conf
 /original
 /*.sublime-workspace
+global.conf
 .DS_Store
-.deploy.sh
 .stir.sh
 theme.conf
 *.bak
\ No newline at end of file
diff --git a/lib/env-check.sh b/lib/env-check.sh
index c610f9c..85bb290 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -9,7 +9,7 @@
 # Initialize variables
 var=(update_global update_user update_project env_settings project_config \
   sed_hack short_version global_project_version local_version \
-  tmp_workpath)
+  tmp_workpath default_etc)
 init_loop
 
 function env_check() {
@@ -23,14 +23,21 @@ function env_check() {
     # Trim alpha/beta part of version number   
     local_version="${VERSION//-*}"
     
+    # Check for global vs local install
+    if [[ "${deployPath}" != "/etc/stir" ]]; then
+      default_etc="${deployPath}/etc"
+    else
+      default_etc="${deployPath}"
+    fi
+
     # Compare version numbers
-    local_version="${GLOBAL_VERSION}"; source "${deployPath}"/stir-global.conf
+    local_version="${GLOBAL_VERSION}"; source "${default_etc}"/stir-global.conf
     [[ "${GLOBAL_VERSION}" != "${local_version}" ]] && update_global="1";
     
-    local_version="${USER_VERSION}"; source "${deployPath}"/stir-user.rc
+    local_version="${USER_VERSION}"; source "${default_etc}"/stir-user.rc
     [[ "${USER_VERSION}" != "${local_version}" ]] && update_user="1";
     
-    local_version="${PROJECT_VERSION}"; source "${deployPath}"/stir-project.sh 
+    local_version="${PROJECT_VERSION}"; source "${default_etc}"/stir-project.sh 
     [[ "${PROJECT_VERSION}" != "${local_version}" ]] && update_project="1"
 
     if [[ "${update_global}" == "1" ]] || [[ "${update_user}" == "1" ]] || [[ "${update_project}" == "1" ]]; then
diff --git a/stir.sh b/stir.sh
index aa83218..8cb8838 100755
--- a/stir.sh
+++ b/stir.sh
@@ -393,13 +393,13 @@ if [[ "${INCOGNITO}" != "TRUE" ]]; then
 fi
 
 # Does a user configuration exit?
-if [[ "${USERRC}" == "1" ]]; then
-  if [[ "${INCOGNITO}" != "TRUE" ]]; then
-    trace "Loading user configuration from ~/.stirrc"
-  fi
-else
+if [[ "${USERRC}" != "1" ]]; then
   trace "User configuration not found, creating"
-  cp "${deployPath}"/stir-user.rc ~/.stirrc
+  if [[ -r "${deployPath}/stir-user.rc" ]]; then
+    cp "${deployPath}"/stir-user.rc ~/.stirrc
+  elif [[ -r "${deployPath}/etc/stir-user.rc" ]]; then
+    cp "${deployPath}"/etc/stir-user.rc ~/.stirrc
+  fi
   console "User configuration file missing, creating ~/.stirrc"
   if yesno --default yes "Would you like to edit the configuration file now? [Y/n] "; then
     configure_user; sleep 1

From 45a04c4d5450a262b1e8cc8c5c63f1c63e298c55 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 9 Mar 2019 11:02:44 -0800
Subject: [PATCH 145/334] Checking core before plugin updates

---
 lib/env-check.sh    |  4 +++-
 lib/server-check.sh |  2 +-
 lib/wp-core.sh      |  6 +++---
 lib/wp.sh           | 14 +++++++-------
 stir.sh             |  7 ++++++-
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/lib/env-check.sh b/lib/env-check.sh
index 85bb290..9360200 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -45,7 +45,7 @@ function env_check() {
     fi
 
     # Reload environment variables, from global > user > project
-    source "${deployPath}"/global.conf
+    source "${etcLocation}"
     source ~/.stirrc
     
     # TODO This throws an error, fix it.
@@ -179,3 +179,5 @@ function insert_values() {
 function env_cleanup() {
   sed -i "s^{{.*}}^^g" "${trshFile}"
 }
+
+
diff --git a/lib/server-check.sh b/lib/server-check.sh
index 8372913..ed2b642 100755
--- a/lib/server-check.sh
+++ b/lib/server-check.sh
@@ -41,7 +41,7 @@ function server_check() {
       trace "No production URL set, skipping check"
     else
       # Should return "200 OK" if all is working well
-      if curl -sL --head "${PRODURL}" | grep "200 OK" > /dev/null; then
+      if curl -sL --head "${PRODURL}" | grep "200 " > /dev/null; then
         console " ${PRODURL} (production) ${tan}OK${endColor}"
       else
         console " ${PRODURL} (production) ${red}FAIL${endColor}"
diff --git a/lib/wp-core.sh b/lib/wp-core.sh
index 3adc66d..d916dcd 100755
--- a/lib/wp-core.sh
+++ b/lib/wp-core.sh
@@ -39,16 +39,16 @@ function wp_core() {
       # Update available!  \o/
       echo -e "";
 
-      # This is only temporary, danger!
+      # Update via composer if needed
       if [[ -f "${APP_PATH}/composer.json" ]]; then
         trace "Found composer.json, updating"
         cd "${APP_PATH}"; \
         if [[ "${QUIET}" != "1" ]]; then
           # Come back and get this path properly
-          /usr/local/bin/composer update &>> "${logFile}" &
+          /usr/local/bin/composer update johnpbloch/wordpress &>> "${logFile}" &
           spinner $!
         else
-          /usr/local/bin/composer update &>> "${logFile}"
+          /usr/local/bin/composer update johnpbloch/wordpress &>> "${logFile}"
         fi
         cd "${WP_PATH}"; \
 
diff --git a/lib/wp.sh b/lib/wp.sh
index 949ff43..fcb4978 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -18,6 +18,13 @@ function wp() {
     
     cd "${WP_PATH}"
 
+    # Check log for core updates
+    if [[ "${DONOTUPDATEWP}" == "TRUE" ]]; then
+      trace "Wordpress core updates disabled, skipping"
+    else
+      wp_core
+    fi
+    
     # Look for updates
     if [[ "${QUIET}" != "1" ]]; then
       wp_update_check &
@@ -39,13 +46,6 @@ function wp() {
         info "Plugins are up to date."; UPD1="1"
       fi
     fi
-
-    # Check log for core updates
-    if [[ "${DONOTUPDATEWP}" == "TRUE" ]]; then
-      trace "Wordpress core updates disabled, skipping"
-    else
-      wp_core
-    fi
   fi
 
   # If running in Wordpress update-only mode, bail out
diff --git a/stir.sh b/stir.sh
index 8cb8838..a48ccce 100755
--- a/stir.sh
+++ b/stir.sh
@@ -306,7 +306,12 @@ fi
 
 # Load external configuration & functions
 libLocation="${deployPath}/lib/loader.sh"
-etcLocation="${deployPath}/global.conf"
+
+if [[ -r "${deployPath}/global.conf" ]]; then
+  etcLocation="${deployPath}/global.conf"
+else
+  etcLocation="${deployPath}/etc/global.conf"
+fi
 
 # System wide configuration files
 if [[ -f "${etcLocation}" ]]; then

From 1600770b3f23fbcbb1a713f595c2861490f52dc5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 10 Mar 2019 11:24:54 -0700
Subject: [PATCH 146/334] A bunch of cleanup

---
 lib/mail-log.sh      | 37 ++++++++++++++++++++++++-------------
 lib/main.sh          |  2 +-
 lib/prepare.sh       |  2 +-
 lib/smart-commits.sh | 43 +++++++++++++++++++++++--------------------
 lib/utilities.sh     | 12 +++++++++++-
 lib/wp-clone.sh      | 33 +++++++++++++++++++--------------
 lib/wp-core.sh       |  6 +++---
 lib/wp-plugins.sh    |  7 +++----
 lib/wp.sh            | 25 +++++++++++++------------
 stir.sh              |  5 +++--
 10 files changed, 101 insertions(+), 71 deletions(-)

diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index b802ae0..98b4782 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -11,10 +11,14 @@ function mailLog() {
   if [[ -n "${COMMITHASH}" ]] || [[ "${message_state}" == "ERROR" ]] || [[ "${message_state}" == "APPROVAL NEEDED" ]] || [[ "${AUTOMATE}" == "1" ]]; then
 
     # Make sure sendmail exists and is configured 
-    if [[ ! -f "${MAILPATH}/sendmail" ]]; then
-      empty_line; warning "Sendmail misconfigured or not found."
-      quietExit
-    fi
+    hash "${sendmail_cmd}" 2>/dev/null || { 
+      error >&2 "Sendmail misconfigured or not found."; 
+    }
+
+#    if [[ ! -f "${MAILPATH}/sendmail" ]]; then
+#      empty_line; warning "Sendmail misconfigured or not found."
+#      quietExit
+#    fi
 
     # If using --current, use the REPO value instead of the APP (current directory)
     if [[ "${CURRENT}" == "1" ]]; then
@@ -32,7 +36,7 @@ function mailLog() {
       echo "Content-Type: text/html"
       echo
       echo "${htmlSendmail}";
-      ) | "${MAILPATH}"/sendmail -t
+      ) | "${sendmail_cmd}" -t
     else
       # Compile and send text format email
       textSendmail=$(<"${logFile}")
@@ -45,7 +49,7 @@ function mailLog() {
       echo "Content-Type: text/plain"
       echo
       echo "${textSendmail}";
-      ) | "${MAILPATH}"/sendmail -t
+      ) | "${sendmail_cmd}" -t
     fi
   fi
 
@@ -61,21 +65,28 @@ function mailLog() {
     echo "Content-Type: text/html"
     echo
     echo "${digestSendmail}";
-    ) | "${MAILPATH}"/sendmail -t
+    ) | "${sendmail_cmd}" -t
   fi
 }
 
 function email_test() {
   console "Testing email..."
 
+  # Make sure sendmail exists and is configured 
+  hash "${sendmail_cmd}" 2>/dev/null || { 
+    error >&2 "Sendmail misconfigured or not found.";
+  }
+
   # Confirm we have a recipient address
   if [[ -z "${TO}" ]]; then
     empty_line; warning "No recipient address found."
     quietExit
   # Make sure sendmail exists and is configured 
-  elif [[ ! -f "${MAILPATH}/sendmail" ]]; then
-    empty_line; warning "Sendmail misconfigured or not found."
-    quietExit
+
+
+#  elif [[ ! -f "${MAILPATH}/sendmail" ]]; then
+#    empty_line; warning "Sendmail misconfigured or not found."
+#    quietExit
   else
     # Send HTML mail
     (
@@ -214,7 +225,7 @@ function email_test() {
       [[ -n "${NIKTO_PROXY}" ]] && echo "Proxy: ${NIKTO_PROXY}
"
       echo "
"
     fi
-    ) | "${MAILPATH}"/sendmail -t
+    ) | "${sendmail_cmd}" -t
 
     # Send text mail
     (
@@ -365,7 +376,7 @@ function email_test() {
       [[ -n "${NIKTO_PROXY}" ]] && echo "Proxy: ${NIKTO_PROXY}"
       echo
     fi
-    ) | "${MAILPATH}"/sendmail -t
+    ) | "${sendmail_cmd}" -t
   fi
 
   # If an integration is setup, let's test it
@@ -391,7 +402,7 @@ function email_test() {
       [[ -n "${PROJCLIENT}" ]] && echo "Client: ${PROJCLIENT}"
       [[ -n "${DEVURL}" ]] && echo "Staging URL: ${DEVURL}"
       [[ -n "${PRODURL}" ]] && echo "Production URL: ${PRODURL}"
-      ) | "${MAILPATH}"/sendmail -t
+      ) | "${sendmail_cmd}" -t
       quietExit
     else
       console "Integration email address ${POSTEMAILHEAD}${TASK}${POSTEMAILTAIL} does not look valid"; quietExit
diff --git a/lib/main.sh b/lib/main.sh
index 02df9c3..f623347 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -12,7 +12,7 @@ function main() {
   env_check         # Check for configuration files that need updating
   wp_check          # Check for Wordpress
   
-  if [[ -n "${PREPARE}" ]] || [[ "${PREPARE_ONLY}" == "1" ]]; then
+  if [[ -n "${PREPARE}" ]]; then
     if [[ "${PREPARE}" != "FALSE" ]]; then
       prepare
     else
diff --git a/lib/prepare.sh b/lib/prepare.sh
index 66c3fda..6384861 100755
--- a/lib/prepare.sh
+++ b/lib/prepare.sh
@@ -19,7 +19,7 @@ function prepare() {
   done
 
   # Should we use our built-in Worpdress prepare clone function?
-  if [[ "${PREPARE}" == "TRUE" ]]; then
+  if [[ "${PREPARE}" == "TRUE" ]] || [[ "${PREPARE}" == "1" ]]; then
     wp_clone; return
   fi
 }
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index 9b49a07..71dfe07 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -12,13 +12,15 @@ function smart_commit() {
     # Checks for the existence of a successful plugin update, using grep, and if 
     # we find updates, grab the relevant line of text from the logs
     # Looks like this changed somehow, new version of wp-cli maybe?
-    PCA=$(grep '\ "${trshFile}" && mv "${trshFile}" "${wpFile}";
         # Add commas between the plugins with this
         sed ':a;N;$!ba;s/\n/, /g' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
         # Replace current commit message with plugin update info 
         PLUGINS=$(<"${wpFile}")
-        COMMITMSG="$PCC ($PLUGINS)"
+
+        if [[ "${PCA}" -gt "1" ]]; then
+          COMMITMSG="Updated ${PCA} plugins ($PLUGINS)"
+        else
+          COMMITMSG="Updated ${PCA} plugin ($PLUGINS)"
+        fi
       fi
 
       # Is this an ACF-only update?
-      if [[ "${PCA}" == "1" ]]; then
-        trace "Creating ACF commit message"
-        PCC="Updated 1 of 1 plugin"
-        PLUGINS="advanced-custom-fields-pro"
-        COMMITMSG="$PCC ($PLUGINS)"
-      fi
+      #if [[ "${PCA}" == "1" ]]; then
+      #  trace "Creating ACF commit message"
+      #  PCC="Updated 1 of 1 plugin"
+      #  PLUGINS="advanced-custom-fields-pro"
+      #  COMMITMSG="$PCC ($PLUGINS)"
+      #fi
 
       # So what about a Wordpress core update?
       if [[ $UPDCORE == "1" ]]; then
         if [[ -z "$PCC" ]]; then 
           COMMITMSG="Updated system (wp-core $COREUPD)"
         else
-          COMMITMSG="$PCC ($PLUGINS) and system (wp-core $COREUPD)"
+          COMMITMSG="Updated plugins ($PLUGINS) and system (wp-core $COREUPD)"
         fi
       else      
         trace "No system updates"
@@ -61,10 +68,6 @@ function smart_commit() {
 
       # Output the contents of $COMMITMSG
       if [[ -n "${COMMITMSG}" ]]; then
-				# This is temporary
-				if [[ "${ACF_LOCK}" == "TRUE" ]]; then
-					COMMITMSG="$(sed 's/, advanced-custom-fields-pro*......//g' <<< ${COMMITMSG})"
-				fi 
         trace "Auto-generated commit message: $COMMITMSG"
       fi
     fi
diff --git a/lib/utilities.sh b/lib/utilities.sh
index 25802d9..ab4e054 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -157,6 +157,12 @@ function is_integer() {
   fi
 }
 
+function get_fullpath() {
+   # Get absolute paths to critical commands
+  for i in "${var[@]}" ; do
+    eval "${i}_cmd=\"$(which ${i})\""
+  done
+}
 
 # Check that dependencies exist
 function dependency_check() {
@@ -197,7 +203,11 @@ function dependency_check() {
       error "Project directory is not writable."
     fi
   fi
-  
+
+  # Get absolute paths
+  var=(composer wp sendmail wget curl git mysqlshow grep wc)
+  get_fullpath
+
   # If a deploy command is declared, check that it actually exists.
   # This is probably not the best way to do this but for now it works. It 
   # strips everything after the first space that is declared in DEPLOY and
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index af9e41a..6ac1784 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -31,13 +31,13 @@ function wp_clone() {
   ssh_check
   
   notice "Setting up project..."
-  cd ${WORKPATH}; \
+  cd /tmp; \
   if [[ -d "/tmp/${REPO}" ]]; then
-    cd "/${WORKPATH}/${REPO}"
-    git checkout "${MASTER}" &>> /dev/null; error_check
+    cd "/tmp/${REPO}"
+    "${git_cmd}" checkout "${MASTER}" &>> /dev/null; error_check
   else
     trace status "Cloning ${SSH_REPO}... "
-    git clone "${SSH_REPO}" &>> /dev/null; error_check
+    "${git_cmd}" clone "${SSH_REPO}" &>> /dev/null; error_check
     trace notime "OK"
   fi
 
@@ -95,22 +95,25 @@ function wp_clone() {
 
     # Composer stuff
     if [[ -f "${APP_PATH}/composer.json" ]]; then
-      # TODO Get real path later
       cd "${APP_PATH}"
-      /usr/local/bin/composer install; error_check
+      ${composer_cmd} install; error_check
     fi
     
-    # Database check
-    DB_CHECK="$(/usr/bin/mysqlshow --user=${MYSQL_USER} --password=${MYSQL_PASS} null 2> /dev/null | grep -o null)"
-    if [[ "${DB_CHECK}" != "null" ]]; then
-      trace status "Creating database... "
-      "${WPCLI}"/wp db create &>> /dev/null; error_check; trace notime "OK"
-    fi
+    # Database check (check is not working correctly)
+    # trace "Checking for database \'${DB_DATABASE}\'"
+    # "${mysqlshow_cmd}" --user=${MYSQL_USER} --password=${MYSQL_PASS} ${DB_DATABASE} 2> /dev/null
+    # DB_CHECK=$?;
+    # if [[ "${DB_CHECK}" != "0" ]]; then
+       trace status "Creating database... "
+    #  "${wp_cmd}" db create &>> /dev/null; error_check; trace notime "OK"
+      "${wp_cmd}" db create &>> /dev/null; trace notime "OK"
+
+    #fi
 
     # Install wordpress if there's no composer
     # if [[ ! -f "${APP_PATH}/composer.json" ]]; then
     trace status "Installing Wordpress... "
-    "${WPCLI}"/wp core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
+    "${wp_cmd}" core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
     trace notime "OK"
     # fi
 
@@ -142,8 +145,10 @@ function create_env() {
 
   if [[ "${SET_ENV}" != "1" ]]; then
     error "Configuration file not found, can not continue."
+  else
+    source "${env_file}"
   fi
 
   # This is a freshly cloned repo, no need for garbage collection
   GARBAGE="FALSE"
-}
+}
\ No newline at end of file
diff --git a/lib/wp-core.sh b/lib/wp-core.sh
index d916dcd..ec2102d 100755
--- a/lib/wp-core.sh
+++ b/lib/wp-core.sh
@@ -16,7 +16,7 @@ function wp_core() {
   else
     sleep 1
     # Get files setup for smart commit
-    "${WPCLI}"/wp core check-update --no-color &> "${coreFile}"
+    "${wp_cmd}" core check-update --no-color &> "${coreFile}"
     
     # Strip out any randomly occuring debugging output
     grep -vE 'Notice:|Warning:|Strict Standards:|PHP' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
@@ -45,10 +45,10 @@ function wp_core() {
         cd "${APP_PATH}"; \
         if [[ "${QUIET}" != "1" ]]; then
           # Come back and get this path properly
-          /usr/local/bin/composer update johnpbloch/wordpress &>> "${logFile}" &
+          "${composer_cmd}" update johnpbloch/wordpress &>> "${logFile}" &
           spinner $!
         else
-          /usr/local/bin/composer update johnpbloch/wordpress &>> "${logFile}"
+          "${composer_cmd}" update johnpbloch/wordpress &>> "${logFile}"
         fi
         cd "${WP_PATH}"; \
 
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index a560826..03aec4c 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -46,11 +46,10 @@ function wp_plugins() {
       trace "Found composer.json, updating"
       cd "${APP_PATH}"; \
       if [[ "${QUIET}" != "1" ]]; then
-        # Come back and get this path properly
-        /usr/local/bin/composer update &>> "${logFile}" &
+        "${composer_cmd}" update &>> "${logFile}" &
         spinner $!
       else
-        /usr/local/bin/composer update &>> "${logFile}"
+        "${composer_cmd}" update &>> "${logFile}"
       fi
       cd "${WP_PATH}"; \
     fi
@@ -94,7 +93,7 @@ function add_plugin() {
   # User will be doing something like `deploy --add-plugin wp-job-manager` from 
   # the shell
   # If composer:
-  composer require wpackagist-plugin/wp-job-manager:*
+  "${composer_cmd}" require wpackagist-plugin/wp-job-manager:*
   # If no composer:
   wp plugin install wp-job-manager
 }
diff --git a/lib/wp.sh b/lib/wp.sh
index fcb4978..1aeecf8 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -18,6 +18,8 @@ function wp() {
     
     cd "${WP_PATH}"
 
+    notice "Checking for updates..."
+
     # Check log for core updates
     if [[ "${DONOTUPDATEWP}" == "TRUE" ]]; then
       trace "Wordpress core updates disabled, skipping"
@@ -30,8 +32,8 @@ function wp() {
       wp_update_check &
       spinner $!
     else
-      "${WPCLI}"/wp plugin status --no-color >> "${logFile}"
-      "${WPCLI}"/wp plugin update --dry-run --no-color --all > "${wpFile}"
+      "${wp_cmd}" plugin status --no-color >> "${logFile}"
+      "${wp_cmd}" plugin update --dry-run --no-color --all > "${wpFile}"
     fi
 
     # Check the logs
@@ -56,13 +58,12 @@ function wp() {
 }
 
 function wp_update_check() {
-  notice "Checking for updates..."
 
   # For the logfile
-  "${WPCLI}"/wp plugin status --no-color &>> $logFile
+  "${wp_cmd}" plugin status --no-color &>> $logFile
 
   # For the console/smart commit message
-  "${WPCLI}"/wp plugin update --dry-run --no-color --all &> "${wpFile}"
+  "${wp_cmd}" plugin update --dry-run --no-color --all &> "${wpFile}"
 
   # Other options, thanks Corey
   # wp plugin list --format=csv --all --fields=name,update_version,update | grep 'available'
@@ -85,10 +86,10 @@ function wp_check() {
 
       # Local database check
       trace status "Checking database... "
-      "${WPCLI}"/wp db check &>> /dev/null; EXITCODE=$?; 
+      "${wp_cmd}" db check &>> /dev/null; EXITCODE=$?; 
       
       if [[ "${EXITCODE}" != "0" ]]; then 
-        "${WPCLI}"/wp db check &>> "${logFile}"; 
+        "${wp_cmd}" db check &>> "${logFile}"; 
         trace notime "FAIL"
         if [[ "${AUTOMATE}" == "1" ]]; then
           error "There is a problem with your Wordpress installation, check your configuration."
@@ -98,7 +99,7 @@ function wp_check() {
       else
         # Get info
         trace notime "OK"
-        "${WPCLI}"/wp core version --extra  &>> "${logFile}";
+        "${wp_cmd}" core version --extra  &>> "${logFile}";
       fi
     else
       WP_PATH="FALSE"
@@ -109,7 +110,7 @@ function wp_check() {
 function wp_server_check {
   # Launch server
   trace "Launching server"
-  "${WPCLI}"/wp server --host=localhost >> "${logFile}" 2>&1 &
+  "${wp_cmd}" server --host=localhost >> "${logFile}" 2>&1 &
   PID=$!
 
   # Keep checking for server to come online
@@ -118,11 +119,11 @@ function wp_server_check {
   done
 
   trace "Activating plugins"
-  "${WPCLI}"/wp plugin activate --all >> "${logFile}" 2>&1
+  "${wp_cmd}" plugin activate --all >> "${logFile}" 2>&1
   trace "Activating theme"
-  "${WPCLI}"/wp theme activate site >> "${logFile}" 2>&1
+  "${wp_cmd}" theme activate site >> "${logFile}" 2>&1
   
-  curl -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
+  "${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
   
   if [[ -z "$(curl -sL localhost:8080 | grep -E "Warning:|Fatal:")" ]]; then
   #if curl -sL localhost:8080 | grep -E "Warning:|Fatal:" > /dev/null; then
diff --git a/stir.sh b/stir.sh
index a48ccce..c4a705b 100755
--- a/stir.sh
+++ b/stir.sh
@@ -98,7 +98,7 @@ function init_env() {
   CLIENTID CLIENTSECRET REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN \
   REFRESHTOKEN PROFILEID ALLOWROOT SHORTEMAIL INCOGNITO REPORTURL \
   CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION USER_VERSION PROJECT_VERSION \
-  TERSE NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE PREPARE_ONLY \
+  TERSE NOTIFYCLIENT FIXINDEX HTMLTEMPLATE PREPARE \
   PREPARE_CONFIG GRAVITY_FORMS_LICENSE)
   init_loop
 }
@@ -145,6 +145,7 @@ Options:
   -m, --merge            Force merge of branches
   -c, --current          Deploy a project from current working directory          
   -t, --time             Add time to project management integration
+  -p, --prepare          Clone and setup local Wordpress project
   -V, --verbose          Output more process information to screen
   -q, --quiet            Display minimal output on screen
   -h, --help             Display this help and exit
@@ -225,7 +226,7 @@ while [[ ${1:-unset} = -?* ]]; do
     -t|--time) TIME="1" ;;
     --approve) APPROVE="1"; FORCE="1" ;;
     --deny) DENY="1"; FORCE="1" ;;
-    --prepare) PREPARE_ONLY="1" ;;
+    -p|--prepare) PREPARE="1" ;;
     --digest) DIGEST="1"; FORCE="1"; QUIET="1" ;;
     --report) REPORT="1"; FORCE="1"; QUIET="1" ;;
     --automate) FORCE="1"; UPGRADE="1"; MERGE="1"; QUIET="1"; AUTOMATE="1" ;;

From 18c6cc9faf7f17afffbaa7790d60362eba633387 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 10 Mar 2019 12:24:23 -0700
Subject: [PATCH 147/334] Removed local server check

---
 lib/wp.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/wp.sh b/lib/wp.sh
index 1aeecf8..69900b8 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -123,14 +123,14 @@ function wp_server_check {
   trace "Activating theme"
   "${wp_cmd}" theme activate site >> "${logFile}" 2>&1
   
-  "${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
+  #"${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
   
-  if [[ -z "$(curl -sL localhost:8080 | grep -E "Warning:|Fatal:")" ]]; then
+  #if [[ -z "$(curl -sL localhost:8080 | grep -E "Warning:|Fatal:")" ]]; then
   #if curl -sL localhost:8080 | grep -E "Warning:|Fatal:" > /dev/null; then
-    trace "Local server check passed";
-  else
-    error "Local server check FAIL"
-  fi
+  #  trace "Local server check passed";
+  #else
+  #  error "Local server check FAIL"
+  #fi
 }
 
 function wp_path() {

From a606ab08936659c3a6e62a3704f50d7e434633f5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 10 Mar 2019 15:58:12 -0700
Subject: [PATCH 148/334] Refinement

---
 lib/wp-clone.sh | 18 +++++++++---------
 lib/wp.sh       |  7 +++++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 6ac1784..0036f34 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -31,9 +31,9 @@ function wp_clone() {
   ssh_check
   
   notice "Setting up project..."
-  cd /tmp; \
-  if [[ -d "/tmp/${REPO}" ]]; then
-    cd "/tmp/${REPO}"
+  cd ${WORKPATH}; \
+  if [[ -d "${WORKPATH}/${REPO}" ]]; then
+    cd "${WORKPATH}/${REPO}"; \
     "${git_cmd}" checkout "${MASTER}" &>> /dev/null; error_check
   else
     trace status "Cloning ${SSH_REPO}... "
@@ -45,7 +45,7 @@ function wp_clone() {
   # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
 
   # Reset our root working directory
-  APP_PATH="/tmp/${REPO}"
+  APP_PATH="${WORKPATH}/${REPO}"
   cd "${APP_PATH}"
 
   # Setup environment variables
@@ -111,11 +111,11 @@ function wp_clone() {
     #fi
 
     # Install wordpress if there's no composer
-    # if [[ ! -f "${APP_PATH}/composer.json" ]]; then
-    trace status "Installing Wordpress... "
-    "${wp_cmd}" core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
-    trace notime "OK"
-    # fi
+    if [[ ! -f "${APP_PATH}/composer.json" ]]; then
+      trace status "Installing Wordpress... "
+      "${wp_cmd}" core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
+      trace notime "OK"
+    fi
 
     # Check server
     wp_server_check
diff --git a/lib/wp.sh b/lib/wp.sh
index 69900b8..6bce2a8 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -137,11 +137,14 @@ function wp_path() {
   # Store path in variable and remove any extra /
   WP_PATH="${APP_PATH}${WPROOT}${WPAPP}"
   WP_PATH=$(sed -e "s^//^/^g" <<< ${WP_PATH})
-  cd "${WP_PATH}"; \
+  if [[ -d "${WP_PATH}" ]]; then
+    cd "${WP_PATH}"; \
+  fi
 }
 
 function wp_tmp {
   # Store path in variable and remove any extra /
-  WP_TMP="/tmp/${REPO}/${WPROOT}${WPAPP}"
+  # WP_TMP="/tmp/${REPO}/${WPROOT}${WPAPP}"
+  WP_TMP="/${WORKPATH}/${REPO}/${WPROOT}${WPAPP}"
   WP_TMP=$(sed -e "s^//^/^g" <<< $WP_TMP)
 }

From 94f461fe6dc0b63cb403b655fb417f4f7dedba06 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 12 Mar 2019 10:07:23 -0700
Subject: [PATCH 149/334] Release 3.7.3

---
 .gitignore   | 1 +
 CHANGELOG.md | 5 +++--
 README.md    | 4 +++-
 deploy.sh    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 CHANGELOG.md
 mode change 100644 => 100755 README.md

diff --git a/.gitignore b/.gitignore
index 9c3bcee..dfe7923 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 /*.sublime-workspace
 .DS_Store
 .deploy.sh
+.stir.sh
 theme.conf
 *.bak
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
index c507621..596751e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [3.7.3] - 03-12-2019
 ### Added
 - Wordpress projects can now be managed using either `composer` or `wp-cli` (or both) transparently
 - ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
@@ -239,7 +239,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Old monolithic script rewritten
 
 
-[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.2...HEAD
+[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.3...HEAD
+[3.7.3]: https://github.com/EMRL/deploy/compare/v3.7.2...v3.7.3
 [3.7.2]: https://github.com/EMRL/deploy/compare/v3.7.1...v3.7.2
 [3.7.1]: https://github.com/EMRL/deploy/compare/v3.7...v3.7.1
 [3.7]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index ca027d8..91891bf
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 # Deploy
 
-[![release](https://img.shields.io/badge/release-v3.7.2-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
+[![release](https://img.shields.io/badge/release-v3.7.3-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
 
+**Note: This is the final release of deploy - check out the ['stir'](https://github.com/EMRL/deploy/tree/stir) branch to see where development headed**
+
 `deploy` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 
 [Changelog](https://github.com/EMRL/deploy/blob/master/CHANGELOG.md)
diff --git a/deploy.sh b/deploy.sh
index f763091..cd4782a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -10,7 +10,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.7.3-dev"
+VERSION="3.7.3"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"

From 13507f71a297b7b8b81d62069f932111d7072e8e Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 12 Mar 2019 11:31:56 -0700
Subject: [PATCH 150/334] Changelog

---
 CHANGELOG.md | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e6090..4a03172 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
-- Automated Worpdress updates are now made by cloning a temporary copy of the project's repo, running the updates, and destroying upon completion
+- Automated Worpdress updates may now made by cloning a temporary copy of the project's repo, running the updates, and destroying upon completion
 - Prepare hook added 
-- Wordpress projects can now be managed using either `composer` or `wp-cli` (or both) transparently
-- ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
 ### Changed
 - `deploy` is now `stir`
 - Invoice creation will now exit gracefully if project is not correctly configured
-- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory (This is the equivalent of setting `DONOTDEPLOY="TRUE"` in `.stir.sh`)
+### Fixed
+- Fixed many small bugs
+
+## [3.7.3] - 03-12-2019
+### Added
+- Wordpress projects can now be managed using either `composer` or `wp-cli` (or both) transparently
+- ACF Pro update files must now pass an integrity check before proceeding with plugin upgrade
+### Changed
+- Project deployment can be disabled by adding a file called `.donotdeploy` in the project's root directory (This is the equivalent of setting `DONOTDEPLOY="TRUE"` in `.deploy.sh`)
 ### Fixed
 - Fixed a bug that occasionally caused successful deployment to be incorrectly reported
 
@@ -27,6 +33,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed a problem where statistic dashboard could get corrupted when multiple instances of `deploy --stats` are running
 - Unbound variable errors no longer occur when a Google Analytics result is zero
 
+## [3.7.2] - 09-25-2018
+### Added
+- Project dashboards have been redesigned to include more analytics charts and information
+- Digest emails can now include a chart showing the week's analytics
+### Changed 
+- Improved HTML post-processing
+### Fixed
+- The `--stats` flag should no longer cause issues when being properly run from a cron process
+- Log files should no longer be left behind in the `/tmp` directory
+- Fixed a problem where statistic dashboard could get corrupted when multiple instances of `deploy --stats` are running
+- Unbound variable errors no longer occur when a Google Analytics result is zero
+
 
 ## [3.7.1] - 07-13-2018
 ### Added
@@ -243,7 +261,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Old monolithic script rewritten
 
 
-[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.2...HEAD
+[Unreleased]: https://github.com/EMRL/deploy/compare/v3.7.3...HEAD
+[3.7.3]: https://github.com/EMRL/deploy/compare/v3.7.2...v3.7.3
 [3.7.2]: https://github.com/EMRL/deploy/compare/v3.7.1...v3.7.2
 [3.7.1]: https://github.com/EMRL/deploy/compare/v3.7...v3.7.1
 [3.7]: https://github.com/EMRL/deploy/compare/v3.6.7...v3.7

From 23ffd9d076b1af01b8fe40717bc1ab00c83480e0 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 12 Mar 2019 12:52:24 -0700
Subject: [PATCH 151/334] Push version number

---
 stir.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/stir.sh b/stir.sh
index c4a705b..3a316db 100755
--- a/stir.sh
+++ b/stir.sh
@@ -11,7 +11,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.7.3-dev"
+VERSION="4.0-dev"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 LAST_MONTH="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"
@@ -27,6 +27,8 @@ set -uo pipefail
 # Trap ctrl-c exits; someday I'll do this better 
 trap ctrl_c INT
 
+# Function to try and cleanup after a user exit, even when external function
+# libraries may not be loaded
 function ctrl_c() {
   if type quietExit &>/dev/null; then
     quietExit
@@ -120,7 +122,7 @@ function init_internal() {
   init_loop
 }
 
-# Go!
+# Initialize all variables we'll need before loading external functions
 init_startup
 init_temp
 init_color
@@ -366,7 +368,7 @@ wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/nul
 coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail
 
 # Start writing the logfile
-echo -e "Deployment logfile for ${APP^^} - ${NOW}\r" >> "${logFile}"
+echo -e "Avtivity logfile for ${APP^^} - ${NOW}\r" >> "${logFile}"
 echo -e "Launching stir${STARTUP}\n" >> "${logFile}"
 
 # More crappy tmp files

From d3458eb3bc94a0f4c7571983497a0e7b8f2461d3 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 13 Mar 2019 11:38:11 -0700
Subject: [PATCH 152/334] Added branding

---
 img/icon.svg |  16 +++++++++++
 img/logo.png | Bin 0 -> 5692 bytes
 img/logo.svg |  74 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 img/icon.svg
 create mode 100644 img/logo.png
 create mode 100644 img/logo.svg

diff --git a/img/icon.svg b/img/icon.svg
new file mode 100644
index 0000000..e0874fb
--- /dev/null
+++ b/img/icon.svg
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/img/logo.png b/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f76a4b66f794ae371f857acda813840b88a57c5
GIT binary patch
literal 5692
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+

From 3804b8f592e6cd96c308b36825cf2cc6cc97c491 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 13 Mar 2019 11:42:07 -0700
Subject: [PATCH 153/334] Update README.md

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 53ca856..118c11c 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Stir
+![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
 
 [![release](https://img.shields.io/badge/release-v3.7.3-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
@@ -21,17 +21,18 @@ Options:
   -S, --skip-update      Skip any Wordpress core/plugin updates
   -u, --update           If no available Wordpress updates, halt deployment
   -U, --update-only      Deploy only Wordpresss plugin/core updates
-  -P, --publish          Publish current production code to live environment
+  -D, --deploy           Deploy current production code to live environment
   -m, --merge            Force merge of branches
   -c, --current          Deploy a project from current working directory          
   -t, --time             Add time to project management integration
+  -p, --prepare          Clone and prepare local Wordpress project
   -V, --verbose          Output more process information to screen
   -q, --quiet            Display minimal output on screen
   -h, --help             Display this help and exit
   -v, --version          Output version information and exit
 
 Other Options:
-  --automate             For unattended deployment via cron
+  --automate             For unattended execution via cron
   --approve              Approve and deploy queued code changes
   --deny                 Deny queued code changes
   --build                Build project assets

From a67e31b865f3e0406402e4687c743a6020b54c9f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 13 Mar 2019 11:45:10 -0700
Subject: [PATCH 154/334] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 129d7d4..4a03172 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.7.3] - 03-12-2019
+## [Unreleased]
 ### Added
 - Automated Worpdress updates may now made by cloning a temporary copy of the project's repo, running the updates, and destroying upon completion
 - Prepare hook added 

From 2e40570a543a1a49abeb23bb3abd100a9bfa4e6d Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 13 Mar 2019 14:20:26 -0700
Subject: [PATCH 155/334] Fix for db table creation

---
 lib/wp-clone.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 0036f34..c291fe1 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -110,12 +110,10 @@ function wp_clone() {
 
     #fi
 
-    # Install wordpress if there's no composer
-    if [[ ! -f "${APP_PATH}/composer.json" ]]; then
-      trace status "Installing Wordpress... "
-      "${wp_cmd}" core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
-      trace notime "OK"
-    fi
+    # Install wordpress database tables
+    trace status "Installing Wordpress... "
+    "${wp_cmd}" core install --url=null.com --title=Nullsite --admin_user=null --admin_email=null@null.com &>> /dev/null; error_check
+    trace notime "OK"
 
     # Check server
     wp_server_check

From 9cfdff4294a751464779ed1a5350235be30c1854 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 13 Mar 2019 15:31:01 -0700
Subject: [PATCH 156/334] More tweaks for Wordpress site preparation

---
 img/icon.png    | Bin 0 -> 5481 bytes
 lib/prepare.sh  |   7 ++++++-
 lib/wp-clone.sh |   2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 img/icon.png

diff --git a/img/icon.png b/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c25e91365c7ae4c6d7018d9b685ecef2ba7ac0ea
GIT binary patch
literal 5481
zcmeHLdrVVT9KOA@8E}y>BV{W(>)hs$N*1lopmPObh#1x(+Rj-8N~MB^O?f!ogwCNj
ztX_p-bd0DGWar#_&gHfgkj-U@*&pQQ-1D8^
z_x&Edd^sEC!2!b@MUDhP3=5p)7eWwrV)$oIf;XYVx4jDSd6Ri13(j
z^md)swKG{EK6^{1#{V{=IV9Sn{wuGHP1`rk9CxNDHA3J~P(S`v|Al^U85h3h5Lj7K
zQ1Qf}fhs-FP!+TKQh%PzBa+KV!bM3CBt;N90U^#K2)>YB
z%EEYry@Xy42?Wm!8i@l!>^A6ZgOEh5>DhoVI}*;(#G&JWFgqw4d^;$JQxSO7cBG+#
zVABST#07!Qa)fi}`T^~zn8Yj4XgZp|>2Oatzhq69LRH5vj`h`M*I{xB?Z}V_
zLkik4ATefNv?E8NwCQLk6NxLpJC#Ue{55Arb~7WEB`dUwjU)V$jY3%;xH71q$!z!aW^rI>tGx-!zLNOFaig~xNFLiiX!
zo^G@h0pWn$RYY09v4~!{g$M+Xw-y26P%B471{fqmj#&xEC(~0ZY>KRr_;`1B0}
z)2B|)k%gtxumRy20LH*E%mqYdqB2iVc_uoDOh<+AEKfM1NUkp`f?Q!RGFdTlaS`GL
zq9D4omNnzT>003;FmTWfQwZH(re+vk>8h0=c#tZ~lfTmemj~}y@af8MARJ%-c!(mo
z4;)9uPZS+Tl_8lpIt$AH#rL2S$50lMHcC7bln_?htYrEp-3ewqr8wU%lF81BMXpFl
zcGAOUfxcQE{mFT2I$d^_Sx{MH8I_D)PM3@g$~!)V;UiJZ3Nl9IXB=}+KLBeSL%lXZYnLij8)n}KeK*u+o`Z%WZ
zdSgK1>^+nG$FD20+py*s_$Ei4*ikZ#YEN3~=%SocZ_H39O)p9OywPp$p@~iV7Stt~
zoSUYf3|Z@~I9(!N|5(rK>=>P0IH9!T(Z;uD6xtoSchBe1uM4Z|^7!@=snB2q6*dxj
z0bFP$XhBkX0bDGV$kaS$;i3dDz#>S^6H&|pln*YzK*BhLF2zJjg?)mu3^*uFXBiaG
zSqBAT%t|nvG=oq?nU&%^@WMp$xeJC9?QjLyQbSUle6au^Tn|2TFkhS%X+w=DNUgKU
zZ4YIdz$kN*2T-d@423&L4ZgG7yk(GE2TH^i0nmZ}u%LJSF@cX8H!-*X-!H2ywGuw;
zxf(Z;UfAHSP%>G94=t0JxtF^)F*rXAEz1niG6b=ApUvb#7u_Q~V3cPIBf&xoUCGfG);a0e}LVd#=E3)~dCWHz)*g^X-g
zZXfNC4vv8Z?U0yA(5++>DjB8&lkzm&ptB&mIRxyuh5R7|H5l3KVB7idC#ruv4@^65
z`xs`SgFp4&Vrs!a+ryu_h{DB$^9Sr*KWc`<`Nvsh%A=$Uj*$fsD_btq=`)H=ELa^vT2u%4IVajv*uen
zJmkjr_OW=36FmRn00%5h9%~&dz`t-XS5`Ke&eNu4rA>dPCs1HB;NNhKy*8}Zy7qOA
zv?on7t)Q$;E92KtKG=Z$??Or7-YvWvHu|iGdk$QvM}IDKqM$z)`dz;+bj0)NLZL^e
z&1^wjQRf1JYkA-vLKgDMizI!&^t4wl
z@Q&p_zn9@&lmOv_-=;hjXsGuxoI9`nFY7oUPTAmF4&6ThaqhfeeA|&YAkIzIpsh@v
d(ml3}SngR?7TiK6g1b{9&_CEO$2aVYzW^$%6JG!T

literal 0
HcmV?d00001

diff --git a/lib/prepare.sh b/lib/prepare.sh
index 6384861..af35e1b 100755
--- a/lib/prepare.sh
+++ b/lib/prepare.sh
@@ -20,6 +20,11 @@ function prepare() {
 
   # Should we use our built-in Worpdress prepare clone function?
   if [[ "${PREPARE}" == "TRUE" ]] || [[ "${PREPARE}" == "1" ]]; then
-    wp_clone; return
+    wp_clone
+    if [[ "${PREPARE}" == "1" ]]; then
+      quickExit
+    else
+      return
+    fi
   fi
 }
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index c291fe1..6de7aae 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -116,7 +116,7 @@ function wp_clone() {
     trace notime "OK"
 
     # Check server
-    wp_server_check
+    # wp_server_check
   fi
 }
 

From 4aadaebc00f1f4a559a5ddb7b2909a2483518ce2 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 13 Mar 2019 15:36:49 -0700
Subject: [PATCH 157/334] Whoops

---
 lib/wp-clone.sh | 2 +-
 lib/wp.sh       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 6de7aae..c291fe1 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -116,7 +116,7 @@ function wp_clone() {
     trace notime "OK"
 
     # Check server
-    # wp_server_check
+    wp_server_check
   fi
 }
 
diff --git a/lib/wp.sh b/lib/wp.sh
index 6bce2a8..ecbc979 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -119,9 +119,9 @@ function wp_server_check {
   done
 
   trace "Activating plugins"
-  "${wp_cmd}" plugin activate --all >> "${logFile}" 2>&1
+  # "${wp_cmd}" plugin activate --all >> "${logFile}" 2>&1
   trace "Activating theme"
-  "${wp_cmd}" theme activate site >> "${logFile}" 2>&1
+  # "${wp_cmd}" theme activate site >> "${logFile}" 2>&1
   
   #"${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
   

From 593960af009bbd041873e9d44876beb8bb9256b0 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 14 Mar 2019 09:59:44 -0700
Subject: [PATCH 158/334] Branding

---
 img/logo.svg | 134 +++++++++++++++++++++++++--------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/img/logo.svg b/img/logo.svg
index 6468b7f..0922ce2 100644
--- a/img/logo.svg
+++ b/img/logo.svg
@@ -2,73 +2,73 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
+	 width="796px" height="210px" viewBox="1167 295 796 210" enable-background="new 1167 295 796 210" xml:space="preserve">
 
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+	
+	
+	
 
 

From 5fd95c39de6006f9c5c7dc7f5045faaccb2d213f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 14 Mar 2019 10:24:46 -0700
Subject: [PATCH 159/334] Logo broked

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 118c11c..8908a5f 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
+![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
 
-[![release](https://img.shields.io/badge/release-v3.7.3-blue.svg?style=flat)](https://github.com/EMRL/deploy/releases/latest)
-[![Build Status](https://travis-ci.org/EMRL/deploy.svg?branch=master)](https://travis-ci.org/EMRL/deploy)
+[![release](https://img.shields.io/badge/release-v3.7.3-blue.svg?style=flat)](https://github.com/EMRL/stir/releases/latest)
+[![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)](https://travis-ci.org/EMRL/stir)
 
 `stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 
@@ -60,7 +60,7 @@ Other Options:
 
 `stir` consolidates a boatload of functions into a single command that simplifies web app deployment from a development or staging environment to a production server. It also can provide clients with a dashboard of information about their project.
 
-![Dashboard](https://raw.githubusercontent.com/EMRL/deploy/stir/img/dashboard.png)
+![Dashboard](https://raw.githubusercontent.com/EMRL/stir/stir/img/dashboard.png)
 
 `stir` requires [`git`](https://git-scm.com/), and will make use of [`wp-cli`](http://wp-cli.org/), [`grunt`](http://gruntjs.com/), [`npm`](https://www.npmjs.com/), [`composer`](https://getcomposer.org/), and  [`mina`](http://nadarei.co/mina/) if they are installed.
 
@@ -75,7 +75,7 @@ Other Options:
 
 Configuration is handled globally in the `etc/stir/global.conf` file. Individual users also have their own settings in `~/.stirrc`
 
-Repositories can each have their own deploy configuration. An example of this file can be [found here](https://github.com/EMRL/stir/blob/master/etc/stir.sh).
+Repositories can each have their own configuration. An example of this file can be [found here](https://github.com/EMRL/stir/blob/master/etc/stir.sh).
 
 ## Slack
 

From d9faa13d7a2a359f7316958a2c3918768f2119e4 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 14 Mar 2019 10:32:34 -0700
Subject: [PATCH 160/334] Tweaker mode

---
 img/logo.png | Bin 5692 -> 3330 bytes
 img/logo.svg | 135 ++++++++++++++++++++++++++-------------------------
 2 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/img/logo.png b/img/logo.png
index 0f76a4b66f794ae371f857acda813840b88a57c5..04b6f25744ddd665f5e73cfe47c683d6cc6218e7 100644
GIT binary patch
literal 3330
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
 
 
+	 width="3130px" height="800px" viewBox="0 0 3130 800" enable-background="new 0 0 3130 800" xml:space="preserve">
+
+
+
+
+
+
+
+
+
+
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 
 

From 3f6a97307f8b394cd74b6953f1dd277cff410d5f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 14 Mar 2019 16:49:08 -0700
Subject: [PATCH 161/334] Origin sync

---
 CHANGELOG.md | 1 +
 lib/git.sh   | 8 +++++++-
 lib/slack.sh | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a03172..96045da 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Origin sync is now forced when running using `--automate` 
 - Automated Worpdress updates may now made by cloning a temporary copy of the project's repo, running the updates, and destroying upon completion
 - Prepare hook added 
 ### Changed
diff --git a/lib/git.sh b/lib/git.sh
index 72b6ebd..72ec318 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -42,7 +42,7 @@ function gitStart() {
     error "Unable to start deployment, push your first commit manually and try again."
   else  
     # If running --automate, force a branch check
-    if [[ "${AUTOMATE}" ]]; then
+    if [[ "${AUTOMATE}" == "1" ]]; then
       CHECKBRANCH="${MASTER}"
     fi
     # If CHECKBRANCH is set, make sure current branch is correct.
@@ -57,6 +57,12 @@ function gitStart() {
   # Check for active files
   check_active
 
+  # If running --automate, pull and sync all branches
+  if [[ "${AUTOMATE}" == "1" ]]; then
+    trace "Syncing with origin"
+    git pull --all &>> "${logFile}"; error_check
+  fi
+
   # Try to clear out old git processes owned by this user, if they exist
   pkill -f git &>> /dev/null || true
 }
diff --git a/lib/slack.sh b/lib/slack.sh
index 3e70d42..011cfca 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -153,7 +153,7 @@ function slackTest {
     warning "No Slack configuration found."; empty_line
     clean_up; exit 1
   else
-    curl -X POST --data "payload={\"text\": \"${slack_icon} Testing Slack integration of ${APP} from stir ${VERSION}\nhttps://github.com/EMRL/deploy\"}" "${SLACKURL}"
+    curl -X POST --data "payload={\"text\": \"${slack_icon} Testing Slack integration of ${APP} from stir ${VERSION}\nhttps://github.com/EMRL/stir\"}" "${SLACKURL}"
     empty_line
   fi
 }

From 1ea030ba0adc6e2d14e7978a67b3dd97317ea4ab Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 14 Mar 2019 19:57:24 -0700
Subject: [PATCH 162/334] Exit server process

---
 lib/quit.sh | 5 ++++-
 lib/wp.sh   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/quit.sh b/lib/quit.sh
index 7bcdfe1..5a7a96c 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -134,7 +134,10 @@ function clean_up() {
 
   # Do we need to shutdown local wp server?
   # This will spit out a PID to kill
-  # lsof -i:8080 -t 
+  # lsof -i :8080
+  if [[ -n "${PID}" ]]; then
+    kill -9 "${PID}"
+  fi
   
   # Attempt to reset the console when running --quiet
   if [[ "${QUIET}" != "1" ]]; then
diff --git a/lib/wp.sh b/lib/wp.sh
index ecbc979..14362f7 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -112,6 +112,7 @@ function wp_server_check {
   trace "Launching server"
   "${wp_cmd}" server --host=localhost >> "${logFile}" 2>&1 &
   PID=$!
+  trace "Server running (process ${PID})"
 
   # Keep checking for server to come online
   until $(curl --output /dev/null --silent --head --fail http://localhost:8080); do

From 3872fc0c9c9733a8aae48ad738a80fb1a88d9679 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 14 Mar 2019 20:14:51 -0700
Subject: [PATCH 163/334] Better process ID

---
 lib/quit.sh | 6 ++++--
 lib/wp.sh   | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/quit.sh b/lib/quit.sh
index 5a7a96c..f435906 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -135,8 +135,10 @@ function clean_up() {
   # Do we need to shutdown local wp server?
   # This will spit out a PID to kill
   # lsof -i :8080
-  if [[ -n "${PID}" ]]; then
-    kill -9 "${PID}"
+  # This is not ideal but it'll work for now
+  if [[ -n "${PREPARE}" ]]; then
+    WP_SERVER_PID=$(lsof -i :8080  | sed -n '1!p' | awk '{print $2}')
+    kill -9 "${WP_SERVER_PID}"  &> /dev/null
   fi
   
   # Attempt to reset the console when running --quiet
diff --git a/lib/wp.sh b/lib/wp.sh
index 14362f7..597b5d7 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -7,7 +7,7 @@
 ###############################################################################
 
 # Initialize variables
-var=(WP_PATH PID)
+var=(WP_PATH WP_SERVER_PID)
 init_loop
 
 function wp() {
@@ -111,8 +111,6 @@ function wp_server_check {
   # Launch server
   trace "Launching server"
   "${wp_cmd}" server --host=localhost >> "${logFile}" 2>&1 &
-  PID=$!
-  trace "Server running (process ${PID})"
 
   # Keep checking for server to come online
   until $(curl --output /dev/null --silent --head --fail http://localhost:8080); do

From 2aa48b21f0e239f1498d2cabfe35c1ab39e62cd1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 16 Mar 2019 14:32:38 -0700
Subject: [PATCH 164/334] Smart commits, better cloning

---
 CHANGELOG.md         |  2 ++
 lib/deployment.sh    |  8 +++-----
 lib/git.sh           |  8 ++++----
 lib/quit.sh          |  4 +++-
 lib/smart-commits.sh |  4 ++--
 lib/utilities.sh     |  6 +++---
 lib/wp-clone.sh      | 21 ++++++++++++++-------
 7 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96045da..1e5d74e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - `deploy` is now `stir`
 - Invoice creation will now exit gracefully if project is not correctly configured
+- Initial project preparation and cloning has been simplified
+- Improved accuracy of smart commit messages
 ### Fixed
 - Fixed many small bugs
 
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 60cd15e..fc4710c 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -15,9 +15,7 @@ function preDeploy() {
   # If there are changes waiting in the repo, stop and ask for user input
   # This should probably be it's own function
   currentStash="0"
-  if [[ -z $(git status --porcelain) ]]; then
-    trace "Status looks good"
-  else
+  if [[ -n $(git status --porcelain) ]]; then
     # If running in --force mode we will not allow deployment to continue
     if [[ "${FORCE}" == "1" && "${APPROVE}" != "1" ]] || [[ "${UPDATEONLY}" == "1" ]] || [[ "${REPAIR}" = "1" ]]; then
       trace "Checking for files that need stashing"
@@ -33,12 +31,12 @@ function preDeploy() {
         currentStash="1"
       else
         empty_line
-        error "There are previously undeployed changes in this project, deployment can not continue."
+        error "There are unstaged changes in this project, deployment can not continue."
       fi
 
     else
       empty_line
-      warning "There are previously undeployed changes in this project."
+      warning "There are unstaged changes in this project."
 
       if yesno --default no "View unresolved files? [y/N] "; then
         console; console " N = New | M = Modified | D = Deleted"
diff --git a/lib/git.sh b/lib/git.sh
index 72ec318..23943fc 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -32,14 +32,14 @@ function gitStart() {
   if [[ -f "${APP_PATH}/.git/index" ]]; then
     sleep 1
   else
-    info "There is nothing at ${APP_PATH} to deploy."
+    info "There is nothingno working project at ${APP_PATH}"
     clean_up; exit 51
   fi
 
   # Make sure there has been at least one commit previously made
   git rev-parse --abbrev-ref HEAD &>> "${trshFile}"
   if grep -q "fatal" "${trshFile}"; then 
-    error "Unable to start deployment, push your first commit manually and try again."
+    error "Unable to start, push your first commit manually and try again."
   else  
     # If running --automate, force a branch check
     if [[ "${AUTOMATE}" == "1" ]]; then
@@ -49,7 +49,7 @@ function gitStart() {
     start_branch="$(git rev-parse --abbrev-ref HEAD)"
     if [[ -n "${CHECKBRANCH}" ]] && [[ "${DIGEST}" != "1" ]] && [[ "${PROJSTATS}" != "1" ]] && [[ "${EMAILTEST}" != "1" ]] && [[ "${SLACKTEST}" != "1" ]]; then 
       if [[ "${start_branch}" != "${CHECKBRANCH}" ]]; then
-        error "Must be on ${CHECKBRANCH} branch to continue deployment.";
+        error "Must be on ${CHECKBRANCH} branch to continue.";
       fi
     fi
   fi
@@ -171,7 +171,7 @@ function gitCommit() {
       if [[ "${FORCE}" = "1" ]] && [[ "${UPDATE}" = "1" ]]; then
         # We need Smart commits enabled or this can't work
         if [[ "${SMARTCOMMIT}" -ne "TRUE" ]]; then
-          console "Smart Commits must enabled when forcing updates."
+          console "Smart Commits must be enabled when forcing updates."
           console "Set SMARTCOMMIT=TRUE in .stir.sh"; quietExit
         else
           if [[ -z "${COMMITMSG}" ]]; then
diff --git a/lib/quit.sh b/lib/quit.sh
index f435906..7054f8b 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -138,7 +138,9 @@ function clean_up() {
   # This is not ideal but it'll work for now
   if [[ -n "${PREPARE}" ]]; then
     WP_SERVER_PID=$(lsof -i :8080  | sed -n '1!p' | awk '{print $2}')
-    kill -9 "${WP_SERVER_PID}"  &> /dev/null
+    if [[ -n "${WP_SERVER_PID}" ]]; then
+      kill -9 "${WP_SERVER_PID}"  &> /dev/null
+    fi
   fi
   
   # Attempt to reset the console when running --quiet
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index 71dfe07..55922fa 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -22,10 +22,10 @@ function smart_commit() {
     #  fi
     #fi
 
-    if [[ ! -z "${PCA}" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wpFile}" ]]; then
+    if [[ "${PCA}" -gt "0" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wpFile}" ]]; then
       trace "Building commit message"
 
-      if [[ -z "${PCA}" ]] && [[ -z "${ACFFILE}" ]]; then
+      if [[ "${PCA}" == "0" ]] && [[ -z "${ACFFILE}" ]]; then
         trace "No plugin updates"
       else
         # How many plugins have we updated? First, strip out the Success:
diff --git a/lib/utilities.sh b/lib/utilities.sh
index ab4e054..ef5d1cb 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -99,7 +99,7 @@ function go() {
 
   # Is the user root?
   if [[ "${ALLOWROOT}" != "TRUE" ]] && [[ "${EUID}" -eq "0" ]]; then
-    warning "Can't continue deployment as root."; quickExit
+    warning "Can't continue as root."; quickExit
   fi
 
   # Disallow server check?
@@ -118,7 +118,7 @@ function go() {
     warning "Found ${gitLock}"
     # If running in --force mode we will not allow deployment to continue
     if [[ "${FORCE}" = "1" ]]; then
-      warning "Can't continue deployment using --force."; quietExit
+      warning "Can't continue using --force."; quietExit
     else
       if yesno --default no "Remove lockfile? [y/N] "; then
         rm -f "${gitLock}" 2>/dev/null
@@ -222,7 +222,7 @@ function dependency_check() {
   # Do we need Sendmail, and if so can we find it?
   if [[ "${EMAILERROR}" == "TRUE" ]] || [[ "${EMAILSUCCESS}" == "TRUE" ]] || [[ "${EMAILQUIT}" == "TRUE" ]] || [[ "${NOTIFYCLIENT}" == "TRUE" ]]; then
     hash "${MAILPATH}"/sendmail 2>/dev/null || {
-      error "deploy ${VERSION} requires Sendmail to function properly with your current configuration."
+      error "stir ${VERSION} requires Sendmail to function properly with your current configuration."
     }
   fi
 }
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index c291fe1..d8150c7 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -11,6 +11,13 @@ var=(SSH_REPO TMP_PATH SET_ENV dest REMOVE_ME MYSQL_USER MYSQL_PASS \
   DB_CHECK)
 init_loop
 
+function wp_clone_mngmt() {
+  "${git_cmd}" clone --no-checkout "${SSH_REPO}" "${WORKPATH}/${APP}/${REPO}" &>> /dev/null; error_check
+  mv "${WORKPATH}/${APP}/${REPO}/.git" "${WORKPATH}/${APP}"  &>> /dev/null; error_check 
+  rm -rf "${WORKPATH}/${APP}/${REPO}"  &>> /dev/null; error_check
+  "${git_cmd}" reset --hard HEAD &>> /dev/null; error_check 
+}
+
 function wp_clone() {
   # This is all under construction
   # Get paths
@@ -31,21 +38,21 @@ function wp_clone() {
   ssh_check
   
   notice "Setting up project..."
-  cd ${WORKPATH}; \
-  if [[ -d "${WORKPATH}/${REPO}" ]]; then
-    cd "${WORKPATH}/${REPO}"; \
+  cd "${WORKPATH}/${APP}"; \
+  if [[ -d "${WORKPATH}/${APP}/.gitignore" ]]; then
     "${git_cmd}" checkout "${MASTER}" &>> /dev/null; error_check
   else
-    trace status "Cloning ${SSH_REPO}... "
-    "${git_cmd}" clone "${SSH_REPO}" &>> /dev/null; error_check
-    trace notime "OK"
+    trace "Cloning ${SSH_REPO}... "
+    wp_clone_mngmt &
+    spinner $!
+    trace "OK"
   fi
 
   # Copy plugins that are not part of repo (for update checking)
   # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
 
   # Reset our root working directory
-  APP_PATH="${WORKPATH}/${REPO}"
+  # APP_PATH="${WORKPATH}/${REPO}"
   cd "${APP_PATH}"
 
   # Setup environment variables

From d2353cf44dd2e5f82f21050f7a17d293e89751d5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 16 Mar 2019 15:12:58 -0700
Subject: [PATCH 165/334] Cloning improvements

---
 lib/wp-clone.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index d8150c7..91b3c17 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -57,9 +57,9 @@ function wp_clone() {
 
   # Setup environment variables
   create_env
-  WP_PATH="${WP_TMP}"
+  #WP_PATH="${WP_TMP}"
   ACTIVECHECK="FALSE"
-  cd "${WP_PATH}"
+  #cd "${WP_PATH}"
 
   # Create database
   if [[ -z "${PREPARE_CONFIG}" ]]; then

From 3d22f12f7148296da719cbf6f96532927b4c1587 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 16 Mar 2019 15:53:51 -0700
Subject: [PATCH 166/334] Fixed typo

---
 lib/git.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.sh b/lib/git.sh
index 23943fc..a881411 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -32,7 +32,7 @@ function gitStart() {
   if [[ -f "${APP_PATH}/.git/index" ]]; then
     sleep 1
   else
-    info "There is nothingno working project at ${APP_PATH}"
+    info "There is no working project at ${APP_PATH}"
     clean_up; exit 51
   fi
 

From 540b3cb7468af354cc671b9fa99c7743cf4b7481 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 16 Mar 2019 20:04:24 -0700
Subject: [PATCH 167/334] Text change

---
 lib/quit.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/quit.sh b/lib/quit.sh
index 7054f8b..5c8fbd2 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -76,6 +76,8 @@ function quietExit() {
 }
 
 function clean_up() {
+  info "Closing ${APP} (${SSH_REPO})"
+
   # If anything is stashed, unstash it.
   if [[ "${currentStash}" == "1" ]]; then
     trace "Unstashing files"
@@ -133,9 +135,7 @@ function clean_up() {
   #fi
 
   # Do we need to shutdown local wp server?
-  # This will spit out a PID to kill
-  # lsof -i :8080
-  # This is not ideal but it'll work for now
+  # lsof doesn't seem to work as expected in Windows Subsystem Linux, doh
   if [[ -n "${PREPARE}" ]]; then
     WP_SERVER_PID=$(lsof -i :8080  | sed -n '1!p' | awk '{print $2}')
     if [[ -n "${WP_SERVER_PID}" ]]; then

From 54dc52c8fc11c2decd114e9b3f9f5ecfc9caa7e3 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 17 Mar 2019 10:13:00 -0700
Subject: [PATCH 168/334] Fix for scan results

---
 lib/quit.sh | 2 +-
 lib/scan.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/quit.sh b/lib/quit.sh
index 5c8fbd2..4e4d1b3 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -76,7 +76,7 @@ function quietExit() {
 }
 
 function clean_up() {
-  info "Closing ${APP} (${SSH_REPO})"
+  notice "Closing ${APP} (${REPOHOST}/${REPO})"
 
   # If anything is stashed, unstash it.
   if [[ "${currentStash}" == "1" ]]; then
diff --git a/lib/scan.sh b/lib/scan.sh
index 25eac19..a14d388 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -18,14 +18,16 @@ function scan_check() {
     SCAN_RESULT=$(echo "${SCAN_MSG//  
}")
     # Piping through tac is a workaround to solve a timing issue, see 
     # https://github.com/EMRL/deploy/issues/134
+    # For some reason upon migration, tac | tac no longer works
     #if curl -LIs --speed-time 900 "${SCAN_URL}" tac | tac | grep -q "200"; then
     if curl -LIs "${SCAN_URL}"  | grep -q "200"; then
-      if curl -Ls --speed-time 900 "${SCAN_URL}" tac | tac | grep -q "0 error"; then
+      if curl -Ls --speed-time 900 "${SCAN_URL}" | grep -q "0 error"; then
         SCANC="${SUCCESSC}"; SCAN_BTN="btn-success"
         SCAN_MSG="Scan passed"
-      elif curl -Ls --speed-time 900 "${SCAN_URL}" tac | tac | grep -q "error"; then
+      elif curl -Ls --speed-time 900 "${SCAN_URL}" | grep -q "error"; then
         SCANC="${DANGERC}"; SCAN_BTN="btn-danger"
         SCAN_MSG="Problem found"
+        trace "error"
       fi
       trace "Malware report: ${SCAN_MSG} (see ${SCAN_URL})"
     fi

From 9497598602094918c7dd9ca4e4ace5e9cf838adb Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 17 Mar 2019 10:35:13 -0700
Subject: [PATCH 169/334] Background color

---
 etc/html/default/header.html      | 6 +++---
 etc/html/default/scan/header.html | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/html/default/header.html b/etc/html/default/header.html
index c022d06..e8e41df 100755
--- a/etc/html/default/header.html
+++ b/etc/html/default/header.html
@@ -54,10 +54,10 @@
 	
 
 
-
-	
+
+	

-			" >> "${statFile}"
+    echo "" >> "${stat_file}"
   fi
 
   trace "git log --all --no-merges --first-parent --before=\"${current_year}-${current_month}-1 00:00\" --after=\"${previous_year}-${previous_month}-${last_day} 00:00\" --pretty=format:\"\""
-  git log --all --no-merges --first-parent --before="${current_year}-${current_month}-1 00:00" --after="${previous_year}-${previous_month}-${last_day} 00:00" --pretty=format:"" >> "${statFile}"
+  git log --all --no-merges --first-parent --before="${current_year}-${current_month}-1 00:00" --after="${previous_year}-${previous_month}-${last_day} 00:00" --pretty=format:"" >> "${stat_file}"
 
   # If it's an empty report, this empty row will keep the javascript from breaking. Kludgy I know.
-  if [[ ! -s "${statFile}" ]]; then
-    echo "" > "${statFile}"
+  if [[ ! -s "${stat_file}" ]]; then
+    echo "" > "${stat_file}"
   fi
 
   # Compile full report 
-  cat "${stir_path}/html/${HTMLTEMPLATE}/report/header.html" "${statFile}" "${stir_path}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/report/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/report/footer.html" > "${html_file}"
 
   # Filter and replace template variables
   process_html
diff --git a/lib/reset.sh b/lib/reset.sh
index 821607e..33612f1 100644
--- a/lib/reset.sh
+++ b/lib/reset.sh
@@ -41,8 +41,8 @@ function reset_local() {
 }
 
 function remove_local_files() {
-  mv "${project_config}" /tmp/"${APP}"-stir.sh &>> "${logFile}"
-  rm -rf ${WORKPATH}/${APP}/* &>> "${logFile}" 
-  rm -rf ${WORKPATH}/${APP}/.* &>> "${logFile}"
-  mv /tmp/"${APP}"-stir.sh "${project_config}" &>> "${logFile}"
+  mv "${project_config}" /tmp/"${APP}"-stir.sh &>> "${log_file}"
+  rm -rf ${WORKPATH}/${APP}/* &>> "${log_file}" 
+  rm -rf ${WORKPATH}/${APP}/.* &>> "${log_file}"
+  mv /tmp/"${APP}"-stir.sh "${project_config}" &>> "${log_file}"
 }
diff --git a/lib/rss.sh b/lib/rss.sh
index fec49d4..61c53e5 100644
--- a/lib/rss.sh
+++ b/lib/rss.sh
@@ -13,7 +13,7 @@ function get_rss() {
 	# Pull RSS feed
 	"${curl_cmd}" --silent "${NEWS_URL}" > /tmp/${APP}.xml; error_check
 	# Strip CDATA stuff
-	"${xmlstarlet_cmd}" fo --omit-decl --nocdata /tmp/${APP}.xml > ${statFile}
+	"${xmlstarlet_cmd}" fo --omit-decl --nocdata /tmp/${APP}.xml > ${stat_file}
 	# Clean up mess
 	rm /tmp/${APP}.xml
 }
@@ -24,7 +24,7 @@ function next_xml() {
 }
 
 function process_xml() {
-	cat ${statFile} | while next_xml ; do
+	cat ${stat_file} | while next_xml ; do
 		case $TAG in
 			'item')
 				title=''
@@ -62,29 +62,29 @@ function create_rss_payload() {
 		return
 	else
 		get_rss
-		process_xml > ${trshFile}
+		process_xml > ${trash_file}
 
 		# Clean up output
-		sed -i 's/\xc2\x91\|\xc2\x92\|\xc2\xa0\|\xe2\x80\x8e//g' "${trshFile}"
+		sed -i 's/\xc2\x91\|\xc2\x92\|\xc2\xa0\|\xe2\x80\x8e//g' "${trash_file}"
 
 		# Centos doesn't have the inplace option 
-		# awk -i inplace '{gsub(/’/, "'"'"'");print}' "${postFile}"
-		awk '{gsub(/’/, "'"'"'");print}' "${trshFile}" > "${postFile}"
+		# awk -i inplace '{gsub(/’/, "'"'"'");print}' "${post_file}"
+		awk '{gsub(/’/, "'"'"'");print}' "${trash_file}" > "${post_file}"
 
 
 		sed -r -i -e '/
The post /d' \
 			-e "s/&#160;/\ /g" \
 			-e "s/&#8230;/\.../g" \
-			"${postFile}"
+			"${post_file}"
 
 		# Escape quotes
-		sed -i "s/'/\'/g" "${postFile}"
+		sed -i "s/'/\'/g" "${post_file}"
 
 		# Remove newlines
-		sed -i ':a;N;$!ba;s/\n//g' "${postFile}"
-		sed -i -e :a -e '$!N;s/\n[[:blank:]]\{1,\}/ /;ta' -e 'P;D' "${postFile}"
+		sed -i ':a;N;$!ba;s/\n//g' "${post_file}"
+		sed -i -e :a -e '$!N;s/\n[[:blank:]]\{1,\}/ /;ta' -e 'P;D' "${post_file}"
 
-		# empty_line; cat "${postFile}"
-		RSS_NEWS="$(<${postFile})"
+		# empty_line; cat "${post_file}"
+		RSS_NEWS="$(<${post_file})"
 	fi
 }
diff --git a/lib/scan.sh b/lib/scan.sh
index 1ef95ca..a9fd738 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -56,27 +56,27 @@ function scan_host() {
   trace "Scanning ${PRODURL}..."
   # Spinners commented out for now, causing issues when running from a crontab
   if [[ -z "${NIKTO_PROXY}" ]]; then
-    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scanFile}" #&
+    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -Tuning 013789c -no404 -output "${scan_html}" -host "${PRODURL}" > "${scan_file}" #&
     #spinner $!
   else
-    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scanFile}" #&
+    "${NIKTO}" -config "${NIKTO_CONFIG}" -nointeractive -ask no -Display VE14 -no404 -output "${scan_html}" -useproxy "${NIKTO_PROXY}" -host "${PRODURL}" > "${scan_file}" #&
     #spinner $!
   fi
 
   # For testing only
-  cp "${scanFile}" ~/verbose_scan.txt
+  cp "${scan_file}" ~/verbose_scan.txt
 
   # Create and clean up the log
-  sed -i -e 's/^.*Running/Running/' "${scanFile}" \
+  sed -i -e 's/^.*Running/Running/' "${scan_file}" \
     -e 's/^.*Loaded/Loaded/' \
     -e '/^V\:/d' \
     -e '/^Running average\: Not enough data/d' \
     -e "s/: currently in plugin 'Nikto Tests'//" \
-    "${scanFile}"
+    "${scan_file}"
   
   # Strip redirects, can get very spammy on a Wordpress project
-  sed -i '/Redirects (301) to/d' "${scanFile}"
-  cat "${scanFile}" >> "${logFile}"
+  sed -i '/Redirects (301) to/d' "${scan_file}"
+  cat "${scan_file}" >> "${log_file}"
 
   # Here's what we need to do to get the HTML ready. Ouch.
   sed -i '/

 		

+			
 				
 
 				 
 				
 		

 			
 				
 

From e34f62e68e14497362060cf6b879debe6689df92 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 26 May 2019 11:30:59 -0700
Subject: [PATCH 180/334] Updated help, changed a few switches

---
 README.md               | 21 +++++++++++----------
 lib/main.sh             |  6 +++---
 lib/post-integration.sh |  2 +-
 lib/prepare.sh          |  3 ++-
 stir.sh                 | 30 +++++++++++++++---------------
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 729b118..8b5fe31 100755
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@ Please note that our documentation here is nearly useless, and there is quite a
 
 ```
 Usage: stir [options] [target] ...
-
 Options:
   -F, --force            Skip all user interaction, forces 'Yes' to all actions
   -S, --skip-update      Skip any Wordpress core/plugin updates
@@ -23,19 +22,21 @@ Options:
   -U, --update-only      Deploy only Wordpresss plugin/core updates
   -D, --deploy           Deploy current production code to live environment
   -m, --merge            Force merge of branches
-  -c, --current          Deploy a project from current working directory          
+  -c, --current          Deploy a project from current directory          
   -t, --time             Add time to project management integration
-  -p, --prepare          Clone and prepare local Wordpress project
+  -p, --prepare          Clone and setup local Wordpress project
   -V, --verbose          Output more process information to screen
   -q, --quiet            Display minimal output on screen
-  -h, --help             Display this help and exit
   -v, --version          Output version information and exit
+  -h, --help             Display this help and exit
+  -H, --more-help        Display extended help and exit
 
 Other Options:
   --automate             For unattended execution via cron
   --approve              Approve and deploy queued code changes
   --deny                 Deny queued code changes
   --build                Build project assets
+  --prepare              Prepare project
   --digest               Create and send weekly digest
   --report               Create a monthly activity report
   --no-check             Override active file and server checks
@@ -46,12 +47,12 @@ Other Options:
   --unlock               Delete expired lock files
   --repair               Repair a deployment after merge failure
   --scan                 Scan production hosts for malware issues
-  --ssh-test             Validate SSH key setup
-  --email-test           Test email configuration
-  --slack-test           Test Slack integration
-  --post-test            Test webhook integration  
-  --analytics-test       Test Google Analytics authentication
-  --monitor-test         Test production server uptime and latency monitoring
+  --test-ssh             Validate SSH key setup
+  --test-email           Test email configuration
+  --test-slack           Test Slack integration
+  --test-webhook         Test webhook integration  
+  --test-analytics       Test Google Analytics authentication
+  --test-monitor         Test production server uptime and latency monitoring
   --function-list        Output a list of all functions()
   --variable-list        Output a project's declared variables
 ```
diff --git a/lib/main.sh b/lib/main.sh
index f623347..886720f 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -20,9 +20,9 @@ function main() {
     fi
   fi
 
-  gitStart          # Check for a valid git project and get set up
+  gitStart          # Check for a valid git project and project set up
   lock              # Create lock file
-  go                # Start a deployment work session
+  go                # Start a work session
 
   if [[ "${DIGEST}" == "1" ]]; then
     create_digest
@@ -75,7 +75,7 @@ function main() {
       if [[ "${APPROVE}" != "1" ]]; then
         wp          # Run Wordpress upgrades if needed
         pkgMgr      # Run package manager
-        gitStatus   # Make sure there's anything here to commit         
+        gitStatus   # Make sure there's something here to commit         
       fi
 
       if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ ! -f "${WORKPATH}/${APP}/.queued" ]]; then
diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index e970017..6cc6fed 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -73,7 +73,7 @@ function mailPost() {
     echo "Content-Type: text/plain"
     echo
     echo "${post}";
-    ) | "${MAILPATH}"/sendmail -t
+    ) | "${sendmail_cmd}" -t
   fi
 }
 
diff --git a/lib/prepare.sh b/lib/prepare.sh
index af35e1b..0927b17 100755
--- a/lib/prepare.sh
+++ b/lib/prepare.sh
@@ -8,7 +8,7 @@
 
 function prepare() {
 
-  # If running a command that does not going to touch code, we can skip the 
+  # If running a command that is not going to touch code, we can skip the 
   # --prepare stuff altogether
   startup_switch=(REPORT DIGEST SCAN SSHTEST EMAILTEST SLACKTEST POSTTEST \
     PUBLISH PROJSTATS CREATE_INVOICE FUNCTIONLIST VARIABLELIST)
@@ -21,6 +21,7 @@ function prepare() {
   # Should we use our built-in Worpdress prepare clone function?
   if [[ "${PREPARE}" == "TRUE" ]] || [[ "${PREPARE}" == "1" ]]; then
     wp_clone
+    # If --prepare switch is being used, exit immediately
     if [[ "${PREPARE}" == "1" ]]; then
       quickExit
     else
diff --git a/stir.sh b/stir.sh
index 6b360ae..84fa666 100755
--- a/stir.sh
+++ b/stir.sh
@@ -145,14 +145,14 @@ Options:
   -U, --update-only      Deploy only Wordpresss plugin/core updates
   -D, --deploy           Deploy current production code to live environment
   -m, --merge            Force merge of branches
-  -c, --current          Deploy a project from current working directory          
+  -c, --current          Deploy a project from current directory          
   -t, --time             Add time to project management integration
   -p, --prepare          Clone and setup local Wordpress project
   -V, --verbose          Output more process information to screen
   -q, --quiet            Display minimal output on screen
   -v, --version          Output version information and exit
   -h, --help             Display this help and exit
-  -H, --full-help        Display extended help and exit
+  -H, --more-help        Display extended help and exit
 "
 
   if [[ "${EXTENDED_HELP}" == "1" ]]; then
@@ -173,12 +173,12 @@ Other Options:
   --unlock               Delete expired lock files
   --repair               Repair a deployment after merge failure
   --scan                 Scan production hosts for malware issues
-  --ssh-test             Validate SSH key setup
-  --email-test           Test email configuration
-  --slack-test           Test Slack integration
-  --post-test            Test webhook integration  
-  --analytics-test       Test Google Analytics authentication
-  --monitor-test         Test production server uptime and latency monitoring
+  --test-ssh             Validate SSH key setup
+  --test-email           Test email configuration
+  --test-slack           Test Slack integration
+  --test-webhook         Test webhook integration  
+  --test-analytics       Test Google Analytics authentication
+  --test-monitor         Test production server uptime and latency monitoring
   --function-list        Output a list of all functions()
   --variable-list        Output a project's declared variables
 "
@@ -224,7 +224,7 @@ unset options
 while [[ ${1:-unset} = -?* ]]; do
   case $1 in
     -h|--help) flags >&2; exit ;;
-    -H|--help-extended) EXTENDED_HELP="1"; flags >&2; exit ;;
+    -H|--more-help) EXTENDED_HELP="1"; flags >&2; exit ;;
     -u|--update) UPGRADE="1" ;;
     -U|--update-only) UPDATEONLY="1" ;;
     -D|--deploy) PUBLISH="1" ;;
@@ -244,12 +244,12 @@ while [[ ${1:-unset} = -?* ]]; do
     --digest) DIGEST="1"; FORCE="1"; QUIET="1" ;;
     --report) REPORT="1"; FORCE="1"; QUIET="1" ;;
     --automate) FORCE="1"; UPGRADE="1"; MERGE="1"; QUIET="1"; AUTOMATE="1" ;;
-    --ssh-test) SSHTEST="1" ;;
-    --slack-test) SLACKTEST="1" ;;
-    --email-test) EMAILTEST="1" ;;
-    --post-test) POSTTEST="1" ;;
-    --analytics-test) ANALYTICSTEST="1" ;; 
-    --monitor-test) MONITORTEST="1" ;;
+    --test-ssh) SSHTEST="1" ;;
+    --test-slack) SLACKTEST="1" ;;
+    --test-email) EMAILTEST="1" ;;
+    --test-webhook) POSTTEST="1" ;;
+    --test-analytics) ANALYTICSTEST="1" ;; 
+    --test-monitor) MONITORTEST="1" ;;
     --stats) PROJSTATS="1" ;;
     --build) BUILD="1"; NOCHECK="1"; FORCE="1" ;;
     --invoice) CREATE_INVOICE="1"; FORCE="1" ;;

From 32931be4f1acfcb3494dc56db88a1078f2e7da61 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 4 Jun 2019 11:29:17 -0700
Subject: [PATCH 181/334] Added --reset switch

---
 CHANGELOG.md |  5 +++--
 README.md    |  1 +
 lib/reset.sh | 27 +++++++++++++++++++++++++++
 stir.sh      | 10 ++++++++--
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 lib/reset.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fea49a7..fdf30c1 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [4.0-pre]
 ### Added
-- Origin sync is now forced when running using `--automate` 
 - Automated Worpdress updates may now made by cloning a temporary copy of the project's repo, running the updates, and destroying upon completion
-- Prepare hook added 
+- Origin sync is now forced when running using `--automate`
+- Prepare hook added
+- Added `--reset` switch
 ### Changed
 - `deploy` is now `stir`
 - Invoice creation will now exit gracefully if project is not correctly configured
diff --git a/README.md b/README.md
index 8b5fe31..6c4b111 100755
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Other Options:
   --deny                 Deny queued code changes
   --build                Build project assets
   --prepare              Prepare project
+  --reset                Resets local project files
   --digest               Create and send weekly digest
   --report               Create a monthly activity report
   --no-check             Override active file and server checks
diff --git a/lib/reset.sh b/lib/reset.sh
new file mode 100644
index 0000000..0a7a915
--- /dev/null
+++ b/lib/reset.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# reset.sh
+#
+###############################################################################
+# Deletes local repo files, while keeping configuration intact
+###############################################################################
+
+function reset_local() {
+    if [[ -n "${project_config}" ]] && [[ -w "${WORKPATH}/${APP}" ]]; then
+        info "Resetting local files..."
+        
+        trace "mv ${project_config} /tmp/${APP}-stir.sh"
+        mv "${project_config}" /tmp/"${APP}"-stir.sh
+        
+        trace "rm -rfv ${WORKPATH}/${APP}/*"
+        rm -rfv ${WORKPATH}/${APP}/*
+        
+        rm -rfv ${WORKPATH}/${APP}/.*
+        
+        trace "mv /tmp/${APP}-stir.sh ${project_config}"
+        mv /tmp/"${APP}"-stir.sh "${project_config}"
+        quietExit
+    else
+        warning "Can not reset this project"
+    fi
+}
diff --git a/stir.sh b/stir.sh
index 84fa666..db7ffa9 100755
--- a/stir.sh
+++ b/stir.sh
@@ -67,7 +67,7 @@ function init_startup() {
     SLACKTEST FUNCTIONLIST VARIABLELIST AUTOMATE EMAILTEST APPROVE \
     DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST BUILD PROJSTATS UNLOCK  \
     SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN \
-    CHECK_BACKUP APP_PATH EXTENDED_HELP)
+    CHECK_BACKUP APP_PATH EXTENDED_HELP RESET)
   init_loop
 }
 
@@ -163,6 +163,7 @@ Other Options:
   --deny                 Deny queued code changes
   --build                Build project assets
   --prepare              Prepare project
+  --reset                Resets local project files
   --digest               Create and send weekly digest
   --report               Create a monthly activity report
   --no-check             Override active file and server checks
@@ -241,6 +242,7 @@ while [[ ${1:-unset} = -?* ]]; do
     --approve) APPROVE="1"; FORCE="1" ;;
     --deny) DENY="1"; FORCE="1" ;;
     -p|--prepare) PREPARE="1" ;;
+    --reset) RESET="1" ;;
     --digest) DIGEST="1"; FORCE="1"; QUIET="1" ;;
     --report) REPORT="1"; FORCE="1"; QUIET="1" ;;
     --automate) FORCE="1"; UPGRADE="1"; MERGE="1"; QUIET="1"; AUTOMATE="1" ;;
@@ -360,7 +362,7 @@ fi
 # Load per-user configuration, if it exists
 if [[ -r ~/.stirrc ]]; then
   # shellcheck disable=1090
-  source ~/.stirrc; USERRC=1
+  source ~/.stirrc; USERRC="1"
 fi
 
 # Load libraries, or die
@@ -595,6 +597,10 @@ if [[ "${MERGE}" == "1" ]] && [[ -z "${PRODUCTION}" ]]; then
   quietExit
 fi
 
+if [[ "${RESET}" == "1" ]]; then
+  reset_local
+fi
+
 # Set app path
 APP_PATH="${WORKPATH}/${APP}"
 

From 4896517d2152a61a172a142dc0499db6bcd7d213 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 4 Jun 2019 12:02:52 -0700
Subject: [PATCH 182/334] Oops

---
 lib/reset.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/reset.sh b/lib/reset.sh
index 0a7a915..8778e0a 100644
--- a/lib/reset.sh
+++ b/lib/reset.sh
@@ -7,21 +7,21 @@
 ###############################################################################
 
 function reset_local() {
-    if [[ -n "${project_config}" ]] && [[ -w "${WORKPATH}/${APP}" ]]; then
-        info "Resetting local files..."
+  if [[ -n "${project_config}" ]] && [[ -w "${WORKPATH}/${APP}" ]]; then
+    info "Resetting local files..."
+      
+    trace "mv ${project_config} /tmp/${APP}-stir.sh"
+    mv "${project_config}" /tmp/"${APP}"-stir.sh
         
-        trace "mv ${project_config} /tmp/${APP}-stir.sh"
-        mv "${project_config}" /tmp/"${APP}"-stir.sh
+    trace "rm -rfv ${WORKPATH}/${APP}/*"
+    rm -rfv ${WORKPATH}/${APP}/*
         
-        trace "rm -rfv ${WORKPATH}/${APP}/*"
-        rm -rfv ${WORKPATH}/${APP}/*
+    rm -rfv ${WORKPATH}/${APP}/.*
         
-        rm -rfv ${WORKPATH}/${APP}/.*
-        
-        trace "mv /tmp/${APP}-stir.sh ${project_config}"
-        mv /tmp/"${APP}"-stir.sh "${project_config}"
-        quietExit
-    else
-        warning "Can not reset this project"
-    fi
+    trace "mv /tmp/${APP}-stir.sh ${project_config}"
+    mv /tmp/"${APP}"-stir.sh "${project_config}"
+    quietExit
+  else
+    warning "Can not reset this project"
+  fi
 }

From e693b93a83144f21c69fe6ac569faebacca7eea1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 18 Jun 2019 17:24:27 -0700
Subject: [PATCH 183/334] Reset switch now includes wp database

---
 lib/main.sh  |  4 ++++
 lib/reset.sh | 35 +++++++++++++++++++++++------------
 stir.sh      |  4 ----
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/main.sh b/lib/main.sh
index 886720f..290b8bd 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -12,6 +12,10 @@ function main() {
   env_check         # Check for configuration files that need updating
   wp_check          # Check for Wordpress
   
+  if [[ "${RESET}" == "1" ]]; then
+    reset_local
+  fi
+
   if [[ -n "${PREPARE}" ]]; then
     if [[ "${PREPARE}" != "FALSE" ]]; then
       prepare
diff --git a/lib/reset.sh b/lib/reset.sh
index 8778e0a..bbb1842 100644
--- a/lib/reset.sh
+++ b/lib/reset.sh
@@ -8,20 +8,31 @@
 
 function reset_local() {
   if [[ -n "${project_config}" ]] && [[ -w "${WORKPATH}/${APP}" ]]; then
+
+    if [[ -n "${wp_cmd}" ]]; then
+      # TODO: Add a better check here someday
+      info "Dropping Wordpress database..."
+      "${wp_cmd}" db drop --yes
+    fi
+
     info "Resetting local files..."
-      
-    trace "mv ${project_config} /tmp/${APP}-stir.sh"
-    mv "${project_config}" /tmp/"${APP}"-stir.sh
-        
-    trace "rm -rfv ${WORKPATH}/${APP}/*"
-    rm -rfv ${WORKPATH}/${APP}/*
-        
-    rm -rfv ${WORKPATH}/${APP}/.*
-        
-    trace "mv /tmp/${APP}-stir.sh ${project_config}"
-    mv /tmp/"${APP}"-stir.sh "${project_config}"
-    quietExit
+    remove_local_files &
+    spinner $!
+
+    if [[ -n "${PREPARE}" ]] && [[ "${PREPARE}" != "FALSE" ]]; then
+      return
+    else
+      quietExit
+    fi
+
   else
     warning "Can not reset this project"
   fi
 }
+
+function remove_local_files() {
+  mv "${project_config}" /tmp/"${APP}"-stir.sh &>> "${logFile}"
+  rm -rf ${WORKPATH}/${APP}/* &>> "${logFile}" 
+  rm -rf ${WORKPATH}/${APP}/.* &>> "${logFile}"
+  mv /tmp/"${APP}"-stir.sh "${project_config}" &>> "${logFile}"
+}
\ No newline at end of file
diff --git a/stir.sh b/stir.sh
index db7ffa9..6fc5de5 100755
--- a/stir.sh
+++ b/stir.sh
@@ -597,10 +597,6 @@ if [[ "${MERGE}" == "1" ]] && [[ -z "${PRODUCTION}" ]]; then
   quietExit
 fi
 
-if [[ "${RESET}" == "1" ]]; then
-  reset_local
-fi
-
 # Set app path
 APP_PATH="${WORKPATH}/${APP}"
 

From 347de015c246e2247d03e49269a34079fc1ee9f9 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 25 Jun 2019 14:39:16 -0700
Subject: [PATCH 184/334] MySQL check when creating projects, resolve #154

---
 lib/wp-clone.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 91b3c17..f19cc90 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -18,8 +18,17 @@ function wp_clone_mngmt() {
   "${git_cmd}" reset --hard HEAD &>> /dev/null; error_check 
 }
 
+function check_mysql_service() {
+  if [[ -z "$(pgrep mysql)" ]]; then 
+    warning "MySQL service not found, can not continue."
+    quietExit
+  fi
+}
+
 function wp_clone() {
   # This is all under construction
+  check_mysql_service
+
   # Get paths
   wp_path
   wp_tmp

From a2ab5ed3729610db199c3e5ab41cd9de7d2293b7 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 28 Jun 2019 12:14:05 -0700
Subject: [PATCH 185/334] Starting dark mode #156

---
 .../stats/css/{styles.css => dark.css}        |   0
 etc/html/default/stats/css/light.css          | 116 ++++++++++++++++++
 etc/html/default/stats/index.html             |   2 +-
 etc/html/default/theme-example.conf           |   3 +
 lib/process-html.sh                           |   3 +-
 stir.sh                                       |  12 ++
 6 files changed, 134 insertions(+), 2 deletions(-)
 rename etc/html/default/stats/css/{styles.css => dark.css} (100%)
 mode change 100755 => 100644
 create mode 100644 etc/html/default/stats/css/light.css

diff --git a/etc/html/default/stats/css/styles.css b/etc/html/default/stats/css/dark.css
old mode 100755
new mode 100644
similarity index 100%
rename from etc/html/default/stats/css/styles.css
rename to etc/html/default/stats/css/dark.css
diff --git a/etc/html/default/stats/css/light.css b/etc/html/default/stats/css/light.css
new file mode 100644
index 0000000..56e5926
--- /dev/null
+++ b/etc/html/default/stats/css/light.css
@@ -0,0 +1,116 @@
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700');
+
+body {
+  font-family: 'Roboto', sans-serif !important;
+}
+
+p, td {
+  font-weight: 400;
+}
+
+.navbar-static-top {
+  margin-bottom:20px;
+}
+
+i {
+  font-size:16px;
+}
+
+.nav > li > a {
+  color:#787878;
+}
+  
+footer {
+  margin-top:20px;
+  padding-top:20px;
+  padding-bottom:20px;
+  background-color:#efefef;
+}
+
+/* count indicator near icons */
+.nav>li .count {
+  position: absolute;
+  bottom: 12px;
+  right: 6px;
+  font-size: 9px;
+  background: rgba(51,200,51,0.55);
+  color: rgba(255,255,255,0.9);
+  line-height: 1em;
+  padding: 2px 4px;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  -ms-border-radius: 10px;
+  -o-border-radius: 10px;
+  border-radius: 10px;
+}
+
+textarea.form-control {
+    height: 8.0em !important;
+}
+
+.stat-label {
+  font-weight: 700;
+  font-size: 0.8em;
+}
+
+.nav > li > a > span {
+  padding: 0 10px;
+}
+
+.caret {
+  padding: 0 !important;
+}
+
+.mauticform-post-success .mauticform-message {
+  color: white;
+  background-color: green;
+  padding: 20px;
+  text-align: center;
+  margin-bottom: 20px;
+  margin-top: 5px;
+  font-weight: 700;
+  font-size: 20px;
+}
+
+.mauticform-post-success .mauticform-innerform {
+    display: none;
+}
+
+@media (min-width: 768px) {
+  .modal-dialog {
+    width: 800px !important;
+  }
+}
+
+.rss-items {
+  list-style-type: none;
+  -webkit-padding-start: 0px;
+}
+
+.rss-item {
+  margin-bottom: 1.4em;
+}
+
+.text-white {
+  color: #ffffff;
+}
+
+.progress-bar-vertical {
+  width: calc(86% / 7);
+  min-height: 340px;
+  display: flex;
+  align-items: flex-end;
+  float: left;
+}
+
+.progress-bar-vertical-margin {
+  margin-right: 2%;
+}
+
+.progress-bar-vertical .progress-bar {
+  width: 100%;
+  height: 0;
+  -webkit-transition: height 0.6s ease;
+  -o-transition: height 0.6s ease;
+  transition: height 0.6s ease;
+}
diff --git a/etc/html/default/stats/index.html b/etc/html/default/stats/index.html
index 1ad5c64..aeb7da1 100755
--- a/etc/html/default/stats/index.html
+++ b/etc/html/default/stats/index.html
@@ -10,7 +10,7 @@
 	
-	
+	
 	
 	
 	
 
-
\ No newline at end of file
+

From 0bcaf5b28cf4017654fe6db2a5e283e463f7ae5d Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Fri, 28 Jun 2019 14:10:37 -0700
Subject: [PATCH 189/334] Moron #156

---
 etc/html/default/stats/activity.html   |   2 +-
 etc/html/default/stats/backup.html     |   2 +-
 etc/html/default/stats/css/dark.css    |   4 +
 etc/html/default/stats/engagement.html |   2 +-
 etc/html/default/stats/firewall.html   |   2 +-
 etc/html/default/stats/index.html      | 409 ++++++++++++-------------
 etc/html/default/stats/scan.html       |   2 +-
 etc/html/default/stats/stats.html      |   2 +-
 lib/statistics.sh                      |   2 +-
 9 files changed, 213 insertions(+), 214 deletions(-)

diff --git a/etc/html/default/stats/activity.html b/etc/html/default/stats/activity.html
index 4b53847..873de3d 100755
--- a/etc/html/default/stats/activity.html
+++ b/etc/html/default/stats/activity.html
@@ -10,7 +10,7 @@
     
-    
+    
     
     
-	
-	
+    
+    
+    {{PROJNAME}} • {{PROJCLIENT}}
+    
+    
+    
+    
+    
+    
+    
+    
+    
 
 
 
-	
 
-	

-		

-			

-				Reports
-				

-				
-				
-				
 

-			

+    

+        

+            

+                Reports
+                

+                
+                
+                
 

+            

 
-			

-				
    
-					
  • Updated {{NOW}}
    • 
-				

-				My Dashboard
-				

-				

-					

-						

-							
-							
{{SCAN_MSG}}

-							
{{UPTIME}}% uptime

-							
{{LATENCY}}s latency

-							
{{LAST_BACKUP}}

-						

+            

+                
    
+                    
  • Updated {{NOW}}
    • 
+                

+                My Dashboard
+                

+                

+                    

+                        

+                            
+                            
{{SCAN_MSG}}

+                            
{{UPTIME}}% uptime

+                            
{{LATENCY}}s latency

+                            
{{LAST_BACKUP}}

+                        

 
-						
-						

-						

-							

-								

-									
-									
Site Traffic (Last 7 days)

-								

-							

-							

-								

-                                					
-
Total pageviews
-								
-

-								

-									
{{GA_HITS}}

-									
page views

-								

-								

-								
{{GA_PERCENT}}%

-									
traffic from new users

-								

-								

-								
{{GA_SEARCHES}}

-									
inbound organic searches

-								

-							

-							

-								

-								

-									View all
-								

-							

-						

-						
+                        
+                        

+                        

+                            

+                                

+                                    
+                                    
Site Traffic (Last 7 days)

+                                

+                            

+                            

+                                

+                                    
+                                    
{{GA_HITS}}total pageviews
+                                

+                                

+                                
{{GA_PERCENT}}%

+                                    
traffic from new users

+                                

+                                

+                                
{{GA_SEARCHES}}

+                                    
inbound organic searches

+                                

+                            

+                            

+                                

+                                

+                                    View all
+                                

+                            

+                        

+                        
 
-						

-						

-							

-								

-									
-									
Recent Activity

-								

-							

-							

-								{{COMMITS_RECENT}}
-								

-									View all
-								

-							

-						

-					

-					

-						

-							

-								

-									
-									
Project Stats

-								

-							

-							

-								

-									

-										Project: {{PROJNAME}}

-										Development: {{DEVURL}}

-										Production: {{PRODURL}}
-									

-									
{{CODE_STATS}}

-								

-								

-									{{PROJCLIENT}}
-								

-							

-							
-							

-								
-								

-								

-									View all
-								

-							

-						

-						

-						

-							

-								

-									
-									
Support Request

-								

-							

-							

-								
-							

-						

-					

-				

-			

-		

-	

+                        

+                        

+                            

+                                

+                                    
+                                    
Recent Activity

+                                

+                            

+                            

+                                {{COMMITS_RECENT}}
+                                

+                                    View all
+                                

+                            

+                        

+                    

+                    

+                        

+                            

+                                

+                                    
+                                    
Project Stats

+                                

+                            

+                            

+                                

+                                    

+                                        Project: {{PROJNAME}}

+                                        Development: {{DEVURL}}

+                                        Production: {{PRODURL}}
+                                    

+                                    
{{CODE_STATS}}

+                                

+                                

+                                    {{PROJCLIENT}}
+                                

+                            

+                            
+                            

+                                
+                                

+                                

+                                    View all
+                                

+                            

+                        

+                        

+                        

+                            

+                                

+                                    
+                                    
Support Request

+                                

+                            

+                            

+                                
+                            

+                        

+                    

+                

+            

+        

+    

 
-	
-	
-	
+    
+    
+    
 
-	

+    

 
-	
-	
-	
+    
+    
+    
 
 
diff --git a/etc/html/default/stats/scan.html b/etc/html/default/stats/scan.html
index a09d45a..326ea5e 100755
--- a/etc/html/default/stats/scan.html
+++ b/etc/html/default/stats/scan.html
@@ -10,7 +10,7 @@
     
-    
+    
     
     
 	
-	
+	
 	
diff --git a/etc/html/default/scan/header.html b/etc/html/default/scan/header.html
index ada0e54..d81ff7d 100755
--- a/etc/html/default/scan/header.html
+++ b/etc/html/default/scan/header.html
@@ -8,13 +8,13 @@
 	
 	
 	
 	
 	
-		
+		
 	
 	
-	
+	
 
 
 
@@ -56,8 +56,8 @@
 				 	
 					
-							

 					  	

-								
Site Scan BETA

+									
+								
Site Scan BETA

 								
 								
 								
Report generated {{NOW}}

@@ -73,4 +73,4 @@ 

\ No newline at end of file
+							

\ No newline at end of file

From 89986776572d37fe1176f362e5f6d05968cb720d Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sun, 14 Jun 2020 19:47:33 -0700
Subject: [PATCH 267/334] Adding RSS feed to digest

---
 etc/html/default/digest/footer.html |  1 +
 etc/html/default/digest/header.html |  2 +-
 etc/html/default/digest/mockup.html | 85 ++++++++++++----------------
 etc/html/default/header.html        | 10 ++--
 lib/digest.sh                       |  3 +
 lib/process-html.sh                 |  4 +-
 lib/report.sh                       |  2 +-
 lib/rss.sh                          | 86 +++++++++++++++++++++++++++++
 stir.sh                             |  2 +-
 9 files changed, 137 insertions(+), 58 deletions(-)
 create mode 100644 lib/rss.sh

diff --git a/etc/html/default/digest/footer.html b/etc/html/default/digest/footer.html
index b7ef1c4..b0b8272 100755
--- a/etc/html/default/digest/footer.html
+++ b/etc/html/default/digest/footer.html
@@ -13,6 +13,7 @@
 						

 					

 
+					
 
What's new at EMRL?
Sometimes we write stuff in our agency journal.
{{RSS_NEWS}}					
 					" --since="7 days ago" > "${stat_file}"; dot
+      sed -i '/^commit/ s/$/ <\/strong>
/' "${stat_file}"
+      sed -i '/^Author:/ s/$/ 
/' "${stat_file}"
+      sed -i '/^Date:/ s/$/ 

/' "${stat_file}"
 
       # Look for manual commits and strip their URLs 
-      grep -oP "(?<=href=\")[^\"]+(?=\")" "${statFile}" > "${trshFile}"; dot
+      grep -oP "(?<=href=\")[^\"]+(?=\")" "${stat_file}" > "${trash_file}"; dot
       while read URL; do
         CODE=$(${curl_cmd} -o /dev/null --silent --head --write-out '%{http_code}' "$URL")
         if [[ "${CODE}" != "200" ]]; then 
-          # sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${statFile}"
-          sed -i "s,${URL},${REPOHOST}/${REPO},g" "${statFile}"; dot
+          # sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${stat_file}"
+          sed -i "s,${URL},${REPOHOST}/${REPO},g" "${stat_file}"; dot
         fi
-      done < "${trshFile}"
+      done < "${trash_file}"
 
-      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${statFile}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${htmlFile}"; dot
+      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${html_file}"; dot
 
       # Randomize a positive Monday thought. Special characters must be escaped 
       # and use character codes
@@ -93,15 +93,15 @@ function create_digest() {
 
       # Strip out useless analytics results
       if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
-        sed -i '/ANALYTICS/d' "${htmlFile}"
+        sed -i '/ANALYTICS/d' "${html_file}"
       # else
         if [[ "${METRIC}" == "hits" ]] && [[ "${RESULT}" -lt "499" ]]; then
-          sed -i '/ANALYTICS/d' "${htmlFile}"
+          sed -i '/ANALYTICS/d' "${html_file}"
         fi
       fi   
 
       # Get the email payload ready
-      digestSendmail=$(<"${htmlFile}")
+      digestSendmail=$(<"${html_file}")
     else
       console "No activity found, canceling digest."
       clean_exit
diff --git a/lib/display-styles.sh b/lib/display-styles.sh
index d1025b2..24ccda5 100755
--- a/lib/display-styles.sh
+++ b/lib/display-styles.sh
@@ -33,17 +33,17 @@ function console() {
   fi
 }
 
-# Standard text output to console and logfile
+# Standard text output to console and log_file
 function info() {
   if [[ "${QUIET}" != "1" ]]; then
     echo -e "${reset}$*${endColor}"
   fi
-  echo "$@" >> "${logFile}"
+  echo "$@" >> "${log_file}"
 }
 
 # Standard text output only to log
 function log() {
-  echo "$@" >> "${logFile}"
+  echo "$@" >> "${log_file}"
 }
 
 function input() {
@@ -57,7 +57,7 @@ function notice() {
   if [[ "${QUIET}" != "1" ]]; then
     echo; echo -e "${green}$*${endColor}"
   fi
-  echo "" >> "${logFile}"; echo "$@" >> "${logFile}"
+  echo "" >> "${log_file}"; echo "$@" >> "${log_file}"
 }
 
 function error() {
@@ -68,7 +68,7 @@ function error() {
   else
     echo -e "$@"
   fi
-  echo -e "\nERROR: $*" >> "${logFile}"
+  echo -e "\nERROR: $*" >> "${log_file}"
   error_msg="$*"
   error_exit
 }
@@ -77,14 +77,14 @@ function warning() {
   if [[ "${QUIET}" != "1" ]]; then
     echo -e "${red}$*${endColor}"
   fi
-  echo "WARNING: $*" >> "${logFile}"
+  echo "WARNING: $*" >> "${log_file}"
 }
 
 function empty_line() {
   if [[ "${QUIET}" != "1" ]]; then
     echo ""
-    echo "" >> "${logFile}"
+    echo "" >> "${log_file}"
   else
-    echo "" >> "${logFile}"
+    echo "" >> "${log_file}"
   fi
 }
diff --git a/lib/env-check.sh b/lib/env-check.sh
index c54d648..4523adc 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -101,7 +101,7 @@ function update_global() {
   fi
   info "Global configuration backup created at ${stir_path}/global.conf.bak"
   
-  cp "${stir_path}"/stir-global.conf "${trshFile}"
+  cp "${stir_path}"/stir-global.conf "${trash_file}"
 
   # Reload global values
   source "${stir_path}"/global.conf
@@ -115,9 +115,9 @@ function update_global() {
   # Install new files
   env_cleanup
   if [[ ! -w "${stir_path}/global.conf" ]]; then
-    sudo cp "${trshFile}" "${stir_path}"/global.conf
+    sudo cp "${trash_file}" "${stir_path}"/global.conf
   else
-    cp "${trshFile}" "${stir_path}"/global.conf
+    cp "${trash_file}" "${stir_path}"/global.conf
   fi
   
   console "Global configuration updated - restart stir to continue."
@@ -130,7 +130,7 @@ function update_user() {
   
   info "User configuration backup created at ~/.stirrc.bak"
   cp ~/.stirrc ~/.stirrc.bak
-  cp "${stir_path}"/stir-user.rc "${trshFile}"
+  cp "${stir_path}"/stir-user.rc "${trash_file}"
 
   # Reload user values
   source ~/.stirrc
@@ -143,7 +143,7 @@ function update_user() {
 
   # Install new files
   env_cleanup
-  cp "${trshFile}" ~/.stirrc
+  cp "${trash_file}" ~/.stirrc
 }
 
 function update_project() { 
@@ -166,7 +166,7 @@ function update_project() {
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
-  cp "${stir_path}"/stir-project.sh "${trshFile}"
+  cp "${stir_path}"/stir-project.sh "${trash_file}"
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
     current_setting=$(grep -a "^${i}=" "${project_config}")
@@ -175,20 +175,20 @@ function update_project() {
 
   # Install new files
   env_cleanup
-  cp "${trshFile}" "${project_config}"
+  cp "${trash_file}" "${project_config}"
 }
 
 function insert_values() {
   if [[ -n "${!i:-}" ]]; then
     [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
-    sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${trshFile}; sed -i 's^# ${i}^${i}^g' ${trshFile}")
+    sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${trash_file}; sed -i 's^# ${i}^${i}^g' ${trash_file}")
     # Kludgy but works. Ugh.
     eval "${sed_hack}"
   fi
 }
 
 function env_cleanup() {
-  sed -i "s^{{.*}}^^g" "${trshFile}"
+  sed -i "s^{{.*}}^^g" "${trash_file}"
 }
 
 
diff --git a/lib/error-check.sh b/lib/error-check.sh
index 3bb3952..2e00049 100755
--- a/lib/error-check.sh
+++ b/lib/error-check.sh
@@ -40,14 +40,14 @@ function deploy_check() {
     DEPLOYTEST="mina --simulate deploy"
     # Get variables organized
     if [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/deploy.rb" ]]; then
-      grep -n -w "set :user" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
-      MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile})
-      echo -n "${MINAUSER}" > "${statFile}"
-      echo -n "@" >> ${statFile}
-      grep -n -w "set :domain" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
-      MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile})
-      echo -n "${MINADOMAIN}" >> "${statFile}"
-      SSHTARGET=$(sed -r 's/\s+//g' ${statFile})
+      grep -n -w "set :user" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trash_file}"
+      MINAUSER=$(awk -F\' '{print $2,$4}' ${trash_file})
+      echo -n "${MINAUSER}" > "${stat_file}"
+      echo -n "@" >> ${stat_file}
+      grep -n -w "set :domain" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trash_file}"
+      MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trash_file})
+      echo -n "${MINADOMAIN}" >> "${stat_file}"
+      SSHTARGET=$(sed -r 's/\s+//g' ${stat_file})
       # SSH check
       if [[ "${INCOGNITO}" != "TRUE" ]]; then
         trace "Testing connection for ${SSHTARGET}"
@@ -58,26 +58,26 @@ function deploy_check() {
 
     elif [[ -f "${WORKPATH}/${APP}/.deploy.yml" ]]; then
       DEPLOYTEST="bundle exec mina --simulate deploy -f Minafile"
-      grep -n -w "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
+      grep -n -w "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trash_file}"
       
-      if grep -aq "'" "${trshFile}"; then
-        MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile}) # Single quote method
+      if grep -aq "'" "${trash_file}"; then
+        MINAUSER=$(awk -F\' '{print $2,$4}' ${trash_file}) # Single quote method
       else
-        MINAUSER=$(awk 'NF>1{print $NF}' ${trshFile})
+        MINAUSER=$(awk 'NF>1{print $NF}' ${trash_file})
       fi
 
-      echo -n "${MINAUSER}" > "${statFile}"
-      echo -n "@" >> ${statFile}
-      grep -n -w "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
+      echo -n "${MINAUSER}" > "${stat_file}"
+      echo -n "@" >> ${stat_file}
+      grep -n -w "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trash_file}"
 
-      if grep -aq "'" "${trshFile}"; then
-        MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile}) # Single quote method
+      if grep -aq "'" "${trash_file}"; then
+        MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trash_file}) # Single quote method
       else
-        MINADOMAIN=$(awk 'NF>1{print $NF}' ${trshFile})
+        MINADOMAIN=$(awk 'NF>1{print $NF}' ${trash_file})
       fi
 
-      echo -n "${MINADOMAIN}" >> "${statFile}"
-      SSHTARGET=$(sed -r 's/\s+//g' ${statFile})  
+      echo -n "${MINADOMAIN}" >> "${stat_file}"
+      SSHTARGET=$(sed -r 's/\s+//g' ${stat_file})  
       # SSH check
       if [[ "${INCOGNITO}" != "TRUE" ]]; then
         trace "Testing connection for ${SSHTARGET}"
@@ -101,8 +101,8 @@ function deploy_check() {
         # Ok now offer to re-run mina in verbose mode if someone is at the console
         # If FORCE=1 then simply exit
         if [[ "${FORCE}" == "1" ]] || yesno --default yes "Retry ${DEPLOY} in verbose mode? [Y/n] "; then
-          eval "ssh ${SSHTARGET}" | tee --append "${logFile}"
-          # eval "${DEPLOY}" | tee --append "${logFile}"
+          eval "ssh ${SSHTARGET}" | tee --append "${log_file}"
+          # eval "${DEPLOY}" | tee --append "${log_file}"
         else
           error "Connection for ${SSHTARGET} not established, an unknown error occurred."
         fi
@@ -118,7 +118,7 @@ function deploy_check() {
       EXITCODE=$?;
       if [[ "${EXITCODE}" != 0 ]]; then
         warning "Could not locate Gemfile or .bundle/ directory, installing..." 
-        eval "bundle install" | tee --append "${logFile}"
+        eval "bundle install" | tee --append "${log_file}"
         eval "bundle check" &>> /dev/null
         EXITCODE=$?;
         if [[ "${EXITCODE}" != 0 ]]; then
diff --git a/lib/git-obj.sh b/lib/git-obj.sh
index ed1ebc5..79c6b0a 100644
--- a/lib/git-obj.sh
+++ b/lib/git-obj.sh
@@ -38,8 +38,8 @@ function verify_project() {
   fi
 
   # Make sure there has been at least one commit previously made
-  git rev-parse --abbrev-ref HEAD &>> "${trshFile}"
-  if grep -aq "fatal" "${trshFile}"; then 
+  git rev-parse --abbrev-ref HEAD &>> "${trash_file}"
+  if grep -aq "fatal" "${trash_file}"; then 
     error "Unable to start, push your first commit manually and try again."
   else  
     # If running --automate, force a branch check
@@ -61,9 +61,9 @@ function verify_project() {
   # If running --automate, pull and sync all branches
   if [[ "${AUTOMATE}" == "1" ]]; then
     trace "Syncing with origin"
-    "${git_cmd}" fetch --all &>> "${logFile}"; error_check
+    "${git_cmd}" fetch --all &>> "${log_file}"; error_check
     sleep 2 # Chill for a second (or 2 :p)
-    "${git_cmd}" pull --all &>> "${logFile}"; error_check
+    "${git_cmd}" pull --all &>> "${log_file}"; error_check
   fi
 
   # Try to clear out old git processes owned by this user, if they exist
@@ -83,13 +83,13 @@ function checkout() {
     notice "Checking out ${working_branch} branch...";
     
     if [[ "${VERBOSE}" == "TRUE" ]]; then
-      git checkout "${working_branch}" | tee --append "${logFile}"
+      git checkout "${working_branch}" | tee --append "${log_file}"
     else
       if [[ "${QUIET}" != "1" ]]; then
-        git checkout "${working_branch}" &>> "${logFile}" &
+        git checkout "${working_branch}" &>> "${log_file}" &
         show_progress
       else
-        git checkout "${working_branch}" &>> "${logFile}"
+        git checkout "${working_branch}" &>> "${log_file}"
       fi
     fi
   fi
@@ -119,9 +119,9 @@ function stage() {
     if [[ "${FORCE}" = "1" ]] || yesno --default yes "Stage files? [Y/n] "; then
       trace "Staging files"
       if [[ "${VERBOSE}" == "TRUE" ]]; then
-        git add --all :/ | tee --append "${logFile}"; error_check              
+        git add --all :/ | tee --append "${log_file}"; error_check              
       else  
-        git add --all :/ &>> "${logFile}"; error_check
+        git add --all :/ &>> "${log_file}"; error_check
       fi
     else
       trace "Exiting without staging files"; user_exit    
@@ -134,22 +134,22 @@ function push() {
   trace "Push ${working_branch}";
   empty_line
   if [[ "${VERBOSE}" == "TRUE" ]]; then
-    git push origin "${working_branch}" | tee --append "${logFile}"; error_check 
+    git push origin "${working_branch}" | tee --append "${log_file}"; error_check 
     trace "OK"              
   else
     if [[ "${FORCE}" = "1" ]] || yesno --default yes "Push ${working_branch} branch? [Y/n] "; then
       if [[ "${QUIET}" != "1" ]]; then
         sleep 1
-        git push origin "${working_branch}" &>> "${logFile}" &
+        git push origin "${working_branch}" &>> "${log_file}" &
         spinner $!
         info "Success.    "
       else
-        git push origin "${working_branch}" &>> "${logFile}"; error_check
+        git push origin "${working_branch}" &>> "${log_file}"; error_check
       fi
       sleep 1
       if [[ "$(git status --porcelain)" ]]; then
-        sleep 1; git add --all :/ &>> "${logFile}"
-        git push --force-with-lease  &>> "${logFile}"
+        sleep 1; git add --all :/ &>> "${log_file}"
+        git push --force-with-lease  &>> "${log_file}"
       fi
     else
       clean_exit
@@ -172,14 +172,14 @@ function merge() {
     # TODO: Find out why this is here, I can't remember what it was working around
     [[ -f "${gitLock}" ]] && rm "${gitLock}"
     if [[ "${VERBOSE}" == "TRUE" ]]; then
-      git merge "${MASTER}" | tee --append "${logFile}"              
+      git merge "${MASTER}" | tee --append "${log_file}"              
     else
       if [[ "${QUIET}" != "1" ]]; then
-        # git merge --no-edit master &>> "${logFile}" &
-        git merge "${MASTER}" &>> "${logFile}" &
+        # git merge --no-edit master &>> "${log_file}" &
+        git merge "${MASTER}" &>> "${log_file}" &
         show_progress
       else
-        git merge "${MASTER}" &>> "${logFile}"
+        git merge "${MASTER}" &>> "${log_file}"
       fi
     fi
   fi
@@ -203,13 +203,13 @@ function confirm_branch() {
     if  [[ "${FORCE}" = "1" ]] || yesno --default yes "Current branch is ${current_branch} and should be ${working_branch}, try again? [Y/n] "; then
       if [[ "${current_branch}" = "${MASTER}" ]]; then 
         [[ -f "${gitLock}" ]] && rm "${gitLock}"
-        git checkout "${working_branch}" &>> "${logFile}" #; error_check
+        git checkout "${working_branch}" &>> "${log_file}" #; error_check
       fi
     else
       clean_exit
     fi
     # Were there any conflicts checking out?
-    if grep -aq "error: Your local changes to the following files would be overwritten by checkout:" "${logFile}"; then
+    if grep -aq "error: Your local changes to the following files would be overwritten by checkout:" "${log_file}"; then
       error "There is a conflict checking out."
     else
       trace "OK"
@@ -221,9 +221,9 @@ function confirm_branch() {
 function garbage() {
   if [[ "${GARBAGE}" = "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then 
     notice "Preparing project files..."
-    git gc | tee --append "${logFile}"
+    git gc | tee --append "${log_file}"
     if [[ "${QUIET}" != "1" ]]; then
-      git gc &>> "${logFile}"
+      git gc &>> "${log_file}"
     fi
   fi
 }
@@ -232,8 +232,8 @@ function garbage() {
 function git_stats() {
   if [[ "${GITSTATS}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]] && [[ "${PUBLISH}" != "1" ]] && [[ "${APPROVE}" != "1" ]]; then
     console "Calculating..."
-    getent passwd "${USER}" | cut -d ':' -f 5 | cut -d ',' -f 1 > "${trshFile}"
-    FULLUSER=$(<"${trshFile}")
+    getent passwd "${USER}" | cut -d ':' -f 5 | cut -d ',' -f 1 > "${trash_file}"
+    FULLUSER=$(<"${trash_file}")
     git log --author="${FULLUSER}" --pretty=tformat: --numstat | \
     # The single quotes were messing with trying to line break this one
     awk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf "Your total lines of code contributed so far: %s\n(+%s added | -%s deleted)\n",loc,add,subs }' -
diff --git a/lib/git.sh b/lib/git.sh
index 1dc8556..3686ae5 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -19,9 +19,9 @@ function gitCommit() {
   smart_commit; empty_line
 
   # Do a dry run; check for anything to commit
-  git commit --dry-run &>> "${logFile}" 
+  git commit --dry-run &>> "${log_file}" 
 
-  if grep -aq "nothing to commit, working directory clean" "${logFile}"; then 
+  if grep -aq "nothing to commit, working directory clean" "${log_file}"; then 
     info "Nothing to commit, working directory clean."
     clean_exit
   else
@@ -77,13 +77,13 @@ function gitCommit() {
       trace "Queuing commit message"
       echo "${notes}" > "${WORKPATH}/${APP}/.queued"
     else
-      git commit -m "${notes}" &>> "${logFile}"; error_check
+      git commit -m "${notes}" &>> "${log_file}"; error_check
       trace "Commit message: ${notes}"
     fi
   fi
 
   # Check for bad characters in commit message
-  echo "${notes}" > "${trshFile}"
-  sed -i "s/\&/and/g" "${trshFile}"
-  notes=$(<$trshFile)
+  echo "${notes}" > "${trash_file}"
+  sed -i "s/\&/and/g" "${trash_file}"
+  notes=$(<$trash_file)
 }
diff --git a/lib/invoice.sh b/lib/invoice.sh
index e16ae9c..2f9b255 100755
--- a/lib/invoice.sh
+++ b/lib/invoice.sh
@@ -20,7 +20,7 @@ function create_invoice() {
   # Will create the invoice payload
   trace "Creating invoice..."
   invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\", \"cost\":${IN_ITEM_COST}, \"qty\":1}]}' -H \"X-Ninja-Token: ${IN_TOKEN}\"")
-  eval "${invoice_hack}" &>> "${logFile}"; error_check
+  eval "${invoice_hack}" &>> "${log_file}"; error_check
 
   get_current_invoice
 
@@ -32,15 +32,15 @@ function create_invoice() {
 }
 
 function get_current_invoice() {
-  "${curl_cmd}" --silent -X GET "${IN_HOST}/api/v1/clients/${IN_CLIENT_ID}?include=invoices" -H "X-Ninja-Token: ${IN_TOKEN}" > "${trshFile}"; error_check
+  "${curl_cmd}" --silent -X GET "${IN_HOST}/api/v1/clients/${IN_CLIENT_ID}?include=invoices" -H "X-Ninja-Token: ${IN_TOKEN}" > "${trash_file}"; error_check
 
   # Many sedtastic things
-  sed -i '/"invoice_number"/!d' "${trshFile}"
-  sed -i 's/ //g' "${trshFile}"
-  sed -i 's/[^0-9]*//g' "${trshFile}"
+  sed -i '/"invoice_number"/!d' "${trash_file}"
+  sed -i 's/ //g' "${trash_file}"
+  sed -i 's/[^0-9]*//g' "${trash_file}"
 
   # Store current invoice number
-  current_invoice=$(tail -1 ${trshFile})
+  current_invoice=$(tail -1 ${trash_file})
 
   trace "Invoice ${current_invoice} created"
 }
@@ -55,6 +55,6 @@ function send_invoice() {
 
   # Build out the command to send the email
   invoice_hack=$(echo "curl -X POST ${IN_HOST}/api/v1/email_invoice -d '{\"id\":${current_invoice_offset}}' -H "Content-Type:application/json" -H \"X-Ninja-Token: ${IN_TOKEN}\"")
-  eval "${invoice_hack}" &>> "${logFile}"; error_check
+  eval "${invoice_hack}" &>> "${log_file}"; error_check
   trace notime "OK"
 }
diff --git a/lib/loader.sh b/lib/loader.sh
index 17d1d66..a013eb3 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -33,22 +33,22 @@ function trace() {
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
       echo -e -n "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) ${2}"
-      echo -e -n "${TIMESTAMP} ${2}" >> "${logFile}"
+      echo -e -n "${TIMESTAMP} ${2}" >> "${log_file}"
     elif [[ "${1}" == "notime" ]]; then
       echo -e "${2}"
-      echo "${2}" >> "${logFile}"
+      echo "${2}" >> "${log_file}"
     else
       echo -e "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) $*"
-      echo "${TIMESTAMP} $*" >> "${logFile}"
+      echo "${TIMESTAMP} $*" >> "${log_file}"
     fi
   else
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
-      echo -e -n "${TIMESTAMP} ${2}" >> "${logFile}"
+      echo -e -n "${TIMESTAMP} ${2}" >> "${log_file}"
     elif [[ "${1}" == "notime" ]]; then
-      echo "${2}" >> "${logFile}"
+      echo "${2}" >> "${log_file}"
     else
-      echo "${TIMESTAMP} $*" >> "${logFile}"
+      echo "${TIMESTAMP} $*" >> "${log_file}"
     fi
   fi
 }
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index fcf24c6..000973f 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -11,7 +11,7 @@ function make_log() {
   sed -i -e '/git reset HEAD/d' \
     -e '/Checking out files:/d' \
     -e '/Unpacking objects:/d' \
-    "${logFile}"
+    "${log_file}"
 
   # Clean up stuff that has a small chance of being there
   sed -i -e '/--:--:--/d'  \
@@ -25,7 +25,7 @@ function make_log() {
     -e '/to update what/d' \
     -e '/to discard changes/d' \
     -e '/Changes not staged for/d' \
-    "${logFile}"
+    "${log_file}"
 
   # Clean up mina's goobers
   if [[ "${DEPLOY}" == *"mina"* ]]; then
@@ -35,41 +35,41 @@ function make_log() {
       -e '/0m Using this git commit/c\Using this git commit' \
       -e '/0m Cleaning up old releases/c\Cleaning up old releases' \
       -e '/0m Build finished/c\Build finished' \
-      "${logFile}"
+      "${log_file}"
 
     # Totally remove these lines
-    sed -i -e "/----->/d" "${logFile}" \
-      -e "/0m/d" "${logFile}" \
-      -e "/Resolving deltas:/d" "${logFile}" \
-      -e "/remote:/d" "${logFile}" \
-      -e "/Receiving objects:/d" "${logFile}" \
-      -e "/Resolving deltas:/d" "${logFile}" \
+    sed -i -e "/----->/d" "${log_file}" \
+      -e "/0m/d" "${log_file}" \
+      -e "/Resolving deltas:/d" "${log_file}" \
+      -e "/remote:/d" "${log_file}" \
+      -e "/Receiving objects:/d" "${log_file}" \
+      -e "/Resolving deltas:/d" "${log_file}" \
       -e "/No Kerberos credentials available/d" \
-      "${logFile}"
+      "${log_file}"
 
     # If incognito, remove this stuff for privacy
     if [[ "${INCOGNITO}" == "TRUE" ]]; then
-      sed -i "/Using cached file/d" "${logFile}"
+      sed -i "/Using cached file/d" "${log_file}"
     fi
   fi
 
   # Filter out ACF license key & wget stuff
   if [[ -n "${ACFKEY}" ]]; then
-    sed -i "s^${ACFKEY}^############^g" "${logFile}"
-    # sed -i "/........../d" "${logFile}"
+    sed -i "s^${ACFKEY}^############^g" "${log_file}"
+    # sed -i "/........../d" "${log_file}"
   fi
 
   # Filter out noise from scp deployment method
   if [[ "${DEPLOY}" == "SCP" ]]; then
-    sed -i "/Sending file modes:/d" "${logFile}"
-    sed -i "/Sink:/d" "${logFile}"
-    sed -i "/debug1:/d" "${logFile}"
+    sed -i "/Sending file modes:/d" "${log_file}"
+    sed -i "/Sink:/d" "${log_file}"
+    sed -i "/debug1:/d" "${log_file}"
   fi
 
   # Filter PHP log output as configured by user
   if [[ "${NOPHP}" == "TRUE" ]]; then
-    grep -vE "(PHP |Notice:|Warning:|Strict Standards:)" "${logFile}" > "${postFile}"
-    cat "${postFile}" > "${logFile}"
+    grep -vE "(PHP |Notice:|Warning:|Strict Standards:)" "${log_file}" > "${post_file}"
+    cat "${post_file}" > "${log_file}"
   fi
 
   # If logs should be terse, remove some more stuff
@@ -89,11 +89,11 @@ function make_log() {
       -e "/not found/d" \
       -e "/Checking for/d" \
       -e "/Continuing deploy/d" \
-      "${logFile}"
+      "${log_file}"
   fi
 
   # Remove double line breaks
-  sed -i '/^$/d' "${logFile}"
+  sed -i '/^$/d' "${log_file}"
   
   # Replace empty lines where we want
   sed -i -e '/Checking servers/s/^/\n/' \
@@ -104,7 +104,7 @@ function make_log() {
     -e '/Checking for updates/s/^/\n/' \
     -e '/The following updates/s/^/\n/' \
     -e '/installed plugins/s/^/\n/' \
-    "${logFile}"
+    "${log_file}"
 
   # Is this a publish only?
   if [[ "${PUBLISH}" == "1" ]] && [[ -z "${notes}" ]]; then   
@@ -118,21 +118,21 @@ function make_log() {
   # IF we're using HTML emails, let's get to work
   if [[ "${EMAILHTML}" == "TRUE" ]]; then
     [[ "${message_state}" != "DIGEST" ]] && build_html
-    cat "${htmlFile}" > "${trshFile}"
+    cat "${html_file}" > "${trash_file}"
 
     # If this is an approval email, strip out PHP
     if [[ "${message_state}" == "APPROVAL NEEDED" ]]; then 
-      sed -i '//d' "${trshFile}"
-      sed -e "s^EMAIL BUTTONS: BEGIN^EMAIL BUTTONS: BEGIN //-->^g" -i "${trshFile}"
+      sed -i '//d' "${trash_file}"
+      sed -e "s^EMAIL BUTTONS: BEGIN^EMAIL BUTTONS: BEGIN //-->^g" -i "${trash_file}"
     fi
 
     # Strip out logs if necessary
     if [[ "${SHORTEMAIL}" == "TRUE" ]]; then
-      sed -i '/LOG: BEGIN/,/LOG: END/d' "${trshFile}"
+      sed -i '/LOG: BEGIN/,/LOG: END/d' "${trash_file}"
     fi
 
     # Load the email into a variable
-    htmlSendmail=$(<"${trshFile}")
+    htmlSendmail=$(<"${trash_file}")
   fi
 
   # Create HTML/PHP logs for viewing online
@@ -147,7 +147,7 @@ function make_log() {
     # build_html
 
     # Strip out the buttons that self-link
-    sed -e "s^// BUTTON: BEGIN //-->^BUTTON HIDE^g" -i "${htmlFile}"
+    sed -e "s^// BUTTON: BEGIN //-->^BUTTON HIDE^g" -i "${html_file}"
     post_log
   fi
 }
@@ -161,7 +161,7 @@ function build_html() {
     notes="${error_msg}"
     LOGTITLE="Deployment Error"
     # Create the header
-    cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/error.html" > "${htmlFile}"
+    cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/error.html" > "${html_file}"
   else
     # Does this project need to be approved before finalizing deployment?
     #if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${DIGEST}" != "1" ]] && [[ -f "${WORKPATH}/${APP}/.queued" ]]; then
@@ -169,8 +169,8 @@ function build_html() {
       message_state="APPROVAL NEEDED"
       LOGTITLE="Approval Needed"
       LOGSUFFIX="php"
-      # cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/approve.html" > "${htmlFile}"
-      cat "${stir_path}/html/${HTMLTEMPLATE}/approval.php" > "${htmlFile}"
+      # cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/approve.html" > "${html_file}"
+      cat "${stir_path}/html/${HTMLTEMPLATE}/approval.php" > "${html_file}"
     else
       if [[ "${AUTOMATE}" == "1" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${UPD1}" == "1" ]] && [[ "${UPD2}" == "1" ]]; then
         message_state="NOTICE"
@@ -190,7 +190,7 @@ function build_html() {
         if [[ "${REPAIR}" == "1" ]] && [[ -z "${notes}" ]]; then
           notes="Merged and deployed codebase"
         fi
-        cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/success.html" > "${htmlFile}"
+        cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/success.html" > "${html_file}"
       fi
     fi
   fi
@@ -215,9 +215,9 @@ function build_html() {
     fi
   fi
 
-  # Insert the full deployment logfile & button it all up
+  # Insert the full deployment log_file & button it all up
   if [[ "${REPORT}" != "1" ]]; then
-    cat "${logFile}" "${stir_path}/html/${HTMLTEMPLATE}/footer.html" >> "${htmlFile}"
+    cat "${log_file}" "${stir_path}/html/${HTMLTEMPLATE}/footer.html" >> "${html_file}"
     # There's probably a better place for this.
     process_html
   fi
diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index 151b23b..f07c97d 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -33,7 +33,7 @@ function mail_log() {
       ) | "${sendmail_cmd}" -t
     else
       # Compile and send text format email
-      textSendmail=$(<"${logFile}")
+      textSendmail=$(<"${log_file}")
       (
       echo "Sender: ${FROM}"
       echo "From: ${FROM} <${FROM}>"
diff --git a/lib/monitor.sh b/lib/monitor.sh
index 1f6b719..7ecd48d 100755
--- a/lib/monitor.sh
+++ b/lib/monitor.sh
@@ -53,9 +53,9 @@ function server_monitor_log() {
   # Load the password and setup the curl command
   MONITORPASS=$(<$MONITORPASS)
   MONITORAPI="${MONITORURL}?tag=serveruptime&email=${MONITORUSER}&app_password=${MONITORPASS}&server_id=${SERVERID}&HoursUnit=${MONITORHOURS}"
-  "${curl_cmd}" -s --request GET "${MONITORAPI}" -o "${trshFile}"
+  "${curl_cmd}" -s --request GET "${MONITORAPI}" -o "${trash_file}"
   # Uptime
-  UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trshFile})
+  UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trash_file})
   UPTIME="$(cut -d ',' -f 1 <<< "${UPTIME}")"
   # Isolate the value we need
   UPTIME="$(sed 's/^[^:]*://g' <<< "${UPTIME}")"
@@ -67,7 +67,7 @@ function server_monitor_log() {
   fi
 
   # Latency
-  LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trshFile})"
+  LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trash_file})"
   LATENCY="$(cut -d ',' -f 1 <<< "${LATENCY}")"
   # Isolate the value we need
   LATENCY="$(sed 's/^[^:]*://g' <<< "${LATENCY}")"
diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index a561916..0eeeec8 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -29,7 +29,7 @@ function build_log() {
       notes="Marked as approved and deployed" 
     fi
 
-    echo "Commit ${COMMITHASH}: ${notes}" > "${postFile}"
+    echo "Commit ${COMMITHASH}: ${notes}" > "${post_file}"
   fi
 }
 
@@ -45,8 +45,8 @@ function mail_post() {
       return
     fi
 
-    echo "${COMMITURL}" >> "${postFile}"
-    post=$(<"${postFile}")
+    echo "${COMMITURL}" >> "${post_file}"
+    post=$(<"${post_file}")
     (
     # Is this an automated deployment?
     if [ "${AUTOMATE}" = "1" ]; then
diff --git a/lib/post-log.sh b/lib/post-log.sh
index ceb7208..524dd99 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -15,21 +15,21 @@ function post_log() {
   if [[ "${REMOTELOG}" == "TRUE" ]]; then
 
     # Post to localhost by simply copying files
-    if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -n "${LOCALHOSTPATH}" ]] && [[ -f "${htmlFile}" ]]; then
+    if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -n "${LOCALHOSTPATH}" ]] && [[ -f "${html_file}" ]]; then
       
       # Check that directory exists
       html_dir
 
       # Post the file   
       if [[ -n "${REMOTEFILE}" ]] && [[ "${REPORT}" != "1" ]]; then #&& [[ -n "${COMMITHASH}" ]]; then
-        cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
+        cp "${html_file}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
         chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
       fi
 
       # Post the digest
       if [[ "${DIGEST}" == "1" ]]; then
         REMOTEFILE="digest-${EPOCH}.html"
-        cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
+        cp "${html_file}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
         chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
         DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}"
       fi
@@ -37,7 +37,7 @@ function post_log() {
       # Post the report
       if [[ "${REPORT}" == "1" ]]; then
         REMOTEFILE="${EPOCH}.php"
-        cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}"
+        cp "${html_file}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}"
         chmod a+rw "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" &> /dev/null
         REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}"
       fi
@@ -46,7 +46,7 @@ function post_log() {
       if [[ "${PROJSTATS}" == "1" ]]; then
         [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}"
         [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats"
-        cp -R "${statDir}" "${LOCALHOSTPATH}/${APP}"
+        cp -R "${stat_dir}" "${LOCALHOSTPATH}/${APP}"
         chmod -R a+rw "${stir_path}/html/${HTMLTEMPLATE}/stats" &> /dev/null
       fi
 
@@ -60,7 +60,7 @@ function post_log() {
     fi
 
     # Send the files through SSH/SCP
-    if [[ "${SCPPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then
+    if [[ "${SCPPOST}" == "TRUE" ]] && [[ -f "${html_file}" ]]; then
 
       # Setup up the proper command, depending on whether we're using key or password
       if [[ -n "${SCPPASS}" ]] && [[ -n "${sshpass_cmd}" ]]; then
@@ -89,17 +89,17 @@ function post_log() {
         #fi
       fi
 
-      if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" && -f "${statDir}/*" ]]; then
+      if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" && -f "${stat_dir}/*" ]]; then
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/stats"
-        eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
+        eval "${SCPCMD} -r" "${stat_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
-        eval "${SCPCMD} -r" "${avatarDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/avatar/"
+        eval "${SCPCMD} -r" "${avatar_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/avatar/"
         # Clean up your mess
-        #if [[ -d "${statDir}" ]]; then
-        #  rm -R "${statDir}"
+        #if [[ -d "${stat_dir}" ]]; then
+        #  rm -R "${stat_dir}"
         #fi
-        if [[ -d "${avatarDir}" ]]; then
-          rm -R "${avatarDir}"
+        if [[ -d "${avatar_dir}" ]]; then
+          rm -R "${avatar_dir}"
         fi
       fi
 
@@ -108,10 +108,10 @@ function post_log() {
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/scan"
         eval "${SCPCMD} -r" "${scan_html}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/scan/index.html"
         # This stuff is for the new dashboard method
-        eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
+        eval "${SCPCMD} -r" "${stat_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         # Clean up your mess
-        #if [[ -d "${statDir}" ]]; then
-        #  rm -R "${statDir}"
+        #if [[ -d "${stat_dir}" ]]; then
+        #  rm -R "${stat_dir}"
         #fi
       fi
 
@@ -124,12 +124,12 @@ function post_log() {
         eval "${SCPCMD} -r" "${stir_path}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/js"
         eval "${SCPCMD} -r" "${stir_path}/html/${HTMLTEMPLATE}/report/js" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report"
-        eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report/${REMOTEFILE}"
+        eval "${SCPCMD}" "${html_file}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report/${REMOTEFILE}"
       fi
 
       # Send over the logs and set permissions
       if [[ "${REPORT}" != "1" ]] && [[ "${PROJSTATS}" != "1" ]]; then 
-        eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
+        eval "${SCPCMD}" "${html_file}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
       fi
 
       # Remove logs older then X days
diff --git a/lib/process-html.sh b/lib/process-html.sh
index bd79b3a..ad789a0 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -14,38 +14,38 @@ init_loop
 
 function process_html() {
   # Clean out the stuff we don't need
-  [[ -z "${DEVURL}" ]] && sed -i '/DEVURL/d' "${htmlFile}"
-  [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${htmlFile}"
-  [[ -z "${UPTIME}" ]] && sed -i '/UPTIME/d' "${htmlFile}"
-  [[ -z "${LATENCY}" ]] && sed -i '/LATENCY/d' "${htmlFile}"  
-  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_MSG/d' "${htmlFile}" 
-  [[ -z "${LAST_BACKUP}" ]] && sed -i '/LAST_BACKUP/d' "${htmlFile}" 
-  [[ -z "${PROJCLIENT}" ]] && sed -i 's/()//' "${htmlFile}"
-  [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${htmlFile}"
-  [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${htmlFile}"
-  [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${htmlFile}"
-  [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${htmlFile}"
-  [[ -z "${COMMITHASH}" ]] && sed -i '/COMMITHASH/d' "${htmlFile}"
-  [[ -z "${NEWS_URL}" ]] && sed -i '/RSS_NEWS/d' "${htmlFile}"
+  [[ -z "${DEVURL}" ]] && sed -i '/DEVURL/d' "${html_file}"
+  [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${html_file}"
+  [[ -z "${UPTIME}" ]] && sed -i '/UPTIME/d' "${html_file}"
+  [[ -z "${LATENCY}" ]] && sed -i '/LATENCY/d' "${html_file}"  
+  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_MSG/d' "${html_file}" 
+  [[ -z "${LAST_BACKUP}" ]] && sed -i '/LAST_BACKUP/d' "${html_file}" 
+  [[ -z "${PROJCLIENT}" ]] && sed -i 's/()//' "${html_file}"
+  [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${html_file}"
+  [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${html_file}"
+  [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${html_file}"
+  [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${html_file}"
+  [[ -z "${COMMITHASH}" ]] && sed -i '/COMMITHASH/d' "${html_file}"
+  [[ -z "${NEWS_URL}" ]] && sed -i '/RSS_NEWS/d' "${html_file}"
 
   # Clean out dashboard nav menu
-  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_NAV/d' "${htmlFile}"
-  [[ -z "${FIREWALL_STATUS}" ]] && sed -i '/FIREWALL_NAV/d' "${htmlFile}"
-  [[ -z "${BACKUP_STATUS}" ]] && sed -i '/BACKUP_NAV/d' "${htmlFile}"
-  [[ -z "${PROFILEID}" ]] && sed -i '/ENGAGEMENT_NAV/d' "${htmlFile}"
+  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_NAV/d' "${html_file}"
+  [[ -z "${FIREWALL_STATUS}" ]] && sed -i '/FIREWALL_NAV/d' "${html_file}"
+  [[ -z "${BACKUP_STATUS}" ]] && sed -i '/BACKUP_NAV/d' "${html_file}"
+  [[ -z "${PROFILEID}" ]] && sed -i '/ENGAGEMENT_NAV/d' "${html_file}"
 
 
   if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
-    sed -i '/BEGIN ANALYTICS/,/END ANALYTICS/d' "${htmlFile}"
-    sed -i '/ANALYTICS/d' "${htmlFile}"
+    sed -i '/BEGIN ANALYTICS/,/END ANALYTICS/d' "${html_file}"
+    sed -i '/ANALYTICS/d' "${html_file}"
   fi
 
   if [[ -z "${RSS_URL}" ]]; then
     sed -i -e '/BEGIN WORK RSS/,/END WORK RSS/d' \
-      -e '/RSS_URL/d' "${htmlFile}" \
-    "${htmlFile}"
+      -e '/RSS_URL/d' "${html_file}" \
+    "${html_file}"
   #else
-  #  sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${htmlFile}"
+  #  sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${html_file}"
   fi
 
   # Prettify errors, warning, and successes
@@ -57,22 +57,22 @@ function process_html() {
     -e '/^SUCCESS/s/^//' \
     -e '/Deployed to/s/$/<\/span>/' \
     -e '/^Deployed to/s/^//' \
-    "${htmlFile}"
+    "${html_file}"
 
   # Insert commits
-  sed_commits=$(echo "sed -e '/{{COMMITS_RECENT}}/ {' -e 'r ${statFile}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_commits=$(echo "sed -e '/{{COMMITS_RECENT}}/ {' -e 'r ${stat_file}' -e 'd' -e '}' -i \"${html_file}\"")
   eval "${sed_commits}"
   
   # Insert scan results
-  sed_scan=$(echo "sed -e '/{{SCAN_STATS}}/ {' -e 'r ${scan_html}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_scan=$(echo "sed -e '/{{SCAN_STATS}}/ {' -e 'r ${scan_html}' -e 'd' -e '}' -i \"${html_file}\"")
   eval "${sed_scan}"
 
   # Insert backup directory listings
-  sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trshFile}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trash_file}' -e 'd' -e '}' -i \"${html_file}\"")
   eval "${sed_backup}"
 
   # RSS news
-  sed -i "s^{{RSS_NEWS}}^${RSS_NEWS}^g" "${htmlFile}"
+  sed -i "s^{{RSS_NEWS}}^${RSS_NEWS}^g" "${html_file}"
 
   # Setup variables to process
   process_var=(VIEWPORT NOW DEV LOGTITLE USER PROJNAME PROJCLIENT CLIENTLOGO \
@@ -92,7 +92,7 @@ function process_html() {
     #  should consolidate them into one function
     if [[ -n "${!i:-}" ]]; then
       # [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
-      sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${htmlFile}")
+      sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${html_file}")
       # Kludgy but works. Ugh.
       eval "${sed_hack}"
     fi
@@ -117,5 +117,5 @@ function process_html() {
     -e "s^{{STATURL}}^${REMOTEURL}\/${APP}\/stats^g" \
     -e "s^{{LASTMONTH}}^${last_month}^g" \
     -e "s^{{ANALYTICS_CHART}}^${REMOTEURL}/${APP}/stats/${METRIC}.png^g" \
-    "${htmlFile}"
+    "${html_file}"
   }
diff --git a/lib/quit.sh b/lib/quit.sh
index 982e95d..bbdbf4f 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -76,7 +76,7 @@ function clean_up() {
   # If anything is stashed, unstash it.
   if [[ "${current_stash}" == "1" ]]; then
     trace "Unstashing files"
-    git stash pop >> "${logFile}"
+    git stash pop >> "${log_file}"
     current_stash="0"
   fi  
 
@@ -87,13 +87,13 @@ function clean_up() {
   if [[ -n "${start_branch}" ]]; then
     current_branch="$(git rev-parse --abbrev-ref HEAD)"
     if [[ "${current_branch}" != "${start_branch}" ]]; then
-      git checkout "${start_branch}" &>> "${logFile}" &
+      git checkout "${start_branch}" &>> "${log_file}" &
     fi
   fi
 
   # If Wordfence was an issue, restart the plugin
   if [[ "${WFOFF}" = "1" ]]; then
-    "${wp_cmd}" plugin activate --no-color wordfence &>> $logFile; error_check
+    "${wp_cmd}" plugin activate --no-color wordfence &>> $log_file; error_check
   fi
 
   # Was this an approval?
diff --git a/lib/report.sh b/lib/report.sh
index 9fb8dfb..686df1b 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -50,19 +50,19 @@ function create_report() {
     if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then
       INCLUDEHOSTING="Web hosting for the month of ${last_month}"
     fi
-    echo "
${TASK}X
${INCLUDEHOSTING}
${TASK}X
${INCLUDEHOSTING}
%hX
%s
%hX
%s
%hX
%s
 "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/scan/header.html" "${scan_html}" "${stir_path}/html/${HTMLTEMPLATE}/scan/footer.html" > "${html_file}"
 
-  SCAN_MSG=$(grep -a "error" "${htmlFile}")
+  SCAN_MSG=$(grep -a "error" "${html_file}")
 
   # Create scan result text
   SCAN_RESULT=$(echo "${SCAN_MSG//  
}")
@@ -120,7 +120,7 @@ function scan_host() {
 
   process_html
 
-  cp "${htmlFile}" "${scan_html}"
+  cp "${html_file}" "${scan_html}"
   
   LOGTITLE="Malware Scan"
   notes="Malware scan on ${PRODURL}: ${SCAN_RESULT}"
diff --git a/lib/scp.sh b/lib/scp.sh
index 7e192e1..b90b118 100755
--- a/lib/scp.sh
+++ b/lib/scp.sh
@@ -33,7 +33,7 @@ function deploy_scp() {
     # TODO: Add proper checks/fallbacks here
     TMP=$(<$SCP_DEPLOY_PASS)
     SCP_DEPLOY_PASS="${TMP}"
-    "${sshpass_cmd}" -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -P "${SCP_DEPLOY_PORT}" -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/"  &>> "${logFile}"; error_check;
+    "${sshpass_cmd}" -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -P "${SCP_DEPLOY_PORT}" -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/"  &>> "${log_file}"; error_check;
 
     # Checkout master and move on
     checkout "${MASTER}"
diff --git a/lib/slack.sh b/lib/slack.sh
index 1d44a70..b36e640 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -83,7 +83,7 @@ function post_slack () {
     fi    
   fi
 
-  # Add a details link to online logfiles if they exist
+  # Add a details link to online log_files if they exist
   if [[ -n "${REMOTEURL}" ]] && [[ -n "${REMOTELOG}" ]] && [[ "${CREATE_INVOICE}" != "1" ]] && [[ -n "${LOGURL}" ]]; then
     slack_message="${slack_message} (<${LOGURL}|Details>)"
   fi
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index 34e737f..fe0ace6 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -9,24 +9,24 @@
 # Constructing smart *cough* commit messages
 function smart_commit() {
   if [[ "${SMARTCOMMIT}" == "TRUE" ]]; then 
-    PCA=$("${wc_cmd}" -l < "${wpFile}")
+    PCA=$("${wc_cmd}" -l < "${wp_file}")
 
     if [[ "${UPDATE_ACF}" == "1" ]]; then
       PCA=$((PCA+1))
     fi
 
-    if [[ "${PCA}" -gt "0" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wpFile}" ]]; then
+    if [[ "${PCA}" -gt "0" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wp_file}" ]]; then
       trace "Building commit message"
 
       if [[ "${PCA}" == "0" ]] && [[ -z "${ACFFILE}" ]]; then
         trace "No plugin updates"
       else
         # Get this thing ready; first remove the leading spaces 
-        awk '{print $1, $2}' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+        awk '{print $1, $2}' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
         # Add commas between the plugins with this
-        sed ':a;N;$!ba;s/\n/, /g' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+        sed ':a;N;$!ba;s/\n/, /g' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
         # Replace current commit message with plugin update info 
-        PLUGINS=$(<"${wpFile}")
+        PLUGINS=$(<"${wp_file}")
 
         # This whole thing is just so ugly
         if [[ "${UPDATE_ACF}" == "1" ]]; then
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 3907b7b..d183bde 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -31,14 +31,14 @@ function project_stats() {
   queue_check
 
     # Setup up tmp work folder
-    #if [[ ! -d "${statDir}" ]]; then
-    #  umask 077 && mkdir "${statDir}" &> /dev/null
+    #if [[ ! -d "${stat_dir}" ]]; then
+    #  umask 077 && mkdir "${stat_dir}" &> /dev/null
     #fi
 
     # Prep assets
-    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/css" "${statDir}/"
-    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/fonts" "${statDir}/"
-    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/js" "${statDir}/"
+    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/css" "${stat_dir}/"
+    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/fonts" "${stat_dir}/"
+    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/js" "${stat_dir}/"
 
     echo -n "Generating files"
 
@@ -59,22 +59,22 @@ function project_stats() {
    
     # Get commits
     get_commits 6
-    validate_urls "${statFile}"
+    validate_urls "${stat_file}"
 
     # Process the HTML
-    cat "${stir_path}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}"
+    cat "${stir_path}/html/${HTMLTEMPLATE}/stats/index.html" > "${html_file}"
     process_html
 
-    cat "${htmlFile}" > "${statDir}/index.html"
+    cat "${html_file}" > "${stat_dir}/index.html"
 
     # Create SVG charts
     # Spinners commented out for now, causing issues when running from a crontab
     repo_charts=(authors commits_day_week commits_hour_day commits_hour_week \
       commits_month commits_year commits_year_month files_type)
     for i in "${repo_charts[@]}" ; do
-      "${gitchart_cmd}" -r "${WORKPATH}/${APP}" "${i}" "${statDir}/${i}.svg" &>> /dev/null
-      sed -i "s/#9999ff/${CHARTC}/g" "${statDir}/${i}.svg" 
-      sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "${statDir}/${i}.svg"
+      "${gitchart_cmd}" -r "${WORKPATH}/${APP}" "${i}" "${stat_dir}/${i}.svg" &>> /dev/null
+      sed -i "s/#9999ff/${CHARTC}/g" "${stat_dir}/${i}.svg" 
+      sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "${stat_dir}/${i}.svg"
     done #&
     #spinner $!
 
@@ -97,35 +97,35 @@ function project_activity() {
   # Grab the total number of commits
   TOTAL_COMMITS=$(git rev-list --count ${MASTER})
   get_commits "${TOTAL_COMMITS}"
-  validate_urls "${statFile}"
+  validate_urls "${stat_file}"
 
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/activity.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/activity.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/activity.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/activity.html"
 }
 
 function project_statistics() {
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/stats.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/stats.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/stats.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/stats.html"
 }
 
 # This is a special snowflake for now, called from within scan_host()
 function project_scan(){
   
-  #if [[ ! -d "${statDir}" ]]; then
-  #  umask 077 && mkdir ${statDir} &> /dev/null
+  #if [[ ! -d "${stat_dir}" ]]; then
+  #  umask 077 && mkdir ${stat_dir} &> /dev/null
   #fi
   
   SCAN_STATS=$(<${scan_html})
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/scan.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/scan.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/scan.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/scan.html"
 }
 
 function project_firewall() {
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/firewall.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/firewall.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/firewall.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/firewall.html"
 }
 
 function project_engagement() {
@@ -134,7 +134,7 @@ function project_engagement() {
     return
   fi
   
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${html_file}"
 
   # How many days of analytics to display?
   if [[ -z "${ENGAGEMENT_DAYS}" ]]; then
@@ -149,29 +149,29 @@ function project_engagement() {
 
   # Process the HTML
   process_html; 
-  cat "${htmlFile}" > "${statDir}/engagement.html"
+  cat "${html_file}" > "${stat_dir}/engagement.html"
 }
 
 function project_css() {
   # Process the CSS files
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/css/${THEME_MODE}.css" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/css/${THEME_MODE}.css"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/css/${THEME_MODE}.css" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/css/${THEME_MODE}.css"
 }
 
 function project_backup() {
   # Get file directory
-  #echo "${BACKUP_FILES}" > "${trshFile}"
+  #echo "${BACKUP_FILES}" > "${trash_file}"
 
-  echo "${BACKUP_FILES}" | grep -Po '"path_display":.*?[^\\]",' > "${trshFile}"
-  sed -i 's/\"path_display\": \"//g' "${trshFile}"
-  sed -i 's/\",//g' "${trshFile}"
-  sed -i 's/$/
/' "${trshFile}"
-  BACKUP_FILES=$(tac ${trshFile})
-  echo "${BACKUP_FILES}" > "${trshFile}"
+  echo "${BACKUP_FILES}" | grep -Po '"path_display":.*?[^\\]",' > "${trash_file}"
+  sed -i 's/\"path_display\": \"//g' "${trash_file}"
+  sed -i 's/\",//g' "${trash_file}"
+  sed -i 's/$/
/' "${trash_file}"
+  BACKUP_FILES=$(tac ${trash_file})
+  echo "${BACKUP_FILES}" > "${trash_file}"
 
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/backup.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/backup.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/backup.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/backup.html"
 }
 
 function check_backup() {
@@ -185,22 +185,22 @@ function check_backup() {
     --header "Content-Type: application/json" \
     --data "{\"path\": \"${DB_BACKUP_PATH}\",\"recursive\": false,
       \"include_media_info\": false,\"include_deleted\": false,
-      \"include_has_explicit_shared_members\": false}" > "${trshFile}"
+      \"include_has_explicit_shared_members\": false}" > "${trash_file}"
 
     # Check for what we might assume is error output
-    if [[ $(grep -a "error" "${trshFile}") ]]; then
+    if [[ $(grep -a "error" "${trash_file}") ]]; then
       warning "Error in backup configuration"
       return
     fi
 
     # Store file list for later
-    BACKUP_FILES="$(<${trshFile})" 
+    BACKUP_FILES="$(<${trash_file})" 
 
     # Start the loop
     for i in $(seq 0 365)
       do 
       var="$(date -d "${i} day ago" +"%Y-%m-%d")"
-      if [[ $(grep -a "${var}" "${trshFile}") ]]; then
+      if [[ $(grep -a "${var}" "${trash_file}") ]]; then
         # Assume success
         BACKUP_STATUS="${SUCCESSC}"
         BACKUP_BTN="btn-success"
@@ -232,21 +232,21 @@ function check_backup() {
 
 # Usage: get_commits [number of commits]
 function get_commits() {
-  git log -n $1 --pretty=format:"%n
\"%aN\"%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s

" > "${statFile}"
-  sed -i '/^commit/ s/$/ <\/strong>
/' "${statFile}"
-  sed -i '/^Author:/ s/$/ 
/' "${statFile}"
-  sed -i '/^Date:/ s/$/ 

/' "${statFile}"
+  git log -n $1 --pretty=format:"%n
\"%aN\"%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s

" > "${stat_file}"
+  sed -i '/^commit/ s/$/ <\/strong>
/' "${stat_file}"
+  sed -i '/^Author:/ s/$/ 
/' "${stat_file}"
+  sed -i '/^Date:/ s/$/ 

/' "${stat_file}"
 }
 
 # Usage: url_check [source file]
 function validate_urls() {
-  grep -oP "(?<=href=\")[^\"]+(?=\")" $1 > "${trshFile}"
+  grep -oP "(?<=href=\")[^\"]+(?=\")" $1 > "${trash_file}"
   while read URL; do
     CODE=$(${curl_cmd} -o /dev/null --silent --head --write-out '%{http_code}' "$URL")
     if [[ "${CODE}" != "200" ]]; then 
-      sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${statFile}"
+      sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${stat_file}"
     fi
-  done < "${trshFile}"
+  done < "${trash_file}"
 }
 
 function assign_nav() {
diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh
index 454516d..9993f9e 100755
--- a/lib/wp-acf.sh
+++ b/lib/wp-acf.sh
@@ -14,14 +14,14 @@ function acf_update() {
   ACFFILE="/tmp/acfpro.zip"
   trace status "Updating ACF Pro... "
 	# Download the ACF Pro upgrade file
-	"${wget_cmd}" --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${logFile}"; error_check
+	"${wget_cmd}" --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${log_file}"; error_check
 
 	# Check file integrity
 	acf_filecheck
 
 	# Proceed with install
-	"${wp_cmd}" plugin delete --no-color advanced-custom-fields-pro &>> "${logFile}"
-	"${wp_cmd}" plugin install --no-color "${ACFFILE}" &>> "${logFile}"
+	"${wp_cmd}" plugin delete --no-color advanced-custom-fields-pro &>> "${log_file}"
+	"${wp_cmd}" plugin install --no-color "${ACFFILE}" &>> "${log_file}"
 	rm "${ACFFILE}"
   trace notime "OK"
 }
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 994e3ae..42f8e41 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -70,7 +70,7 @@ function wp_clone() {
   fi
 
   # Copy plugins that are not part of repo (for update checking)
-  # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
+  # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${log_file}";
 
   # Reset our root working directory
   # APP_PATH="${WORKPATH}/${REPO}"
@@ -177,7 +177,7 @@ function wp_clone() {
       "${wp_cmd}" plugin is-active "${i}" #2>&1
       EXITCODE=$?; 
       if [[ "${EXITCODE}" -ne "0" ]]; then
-        "${wp_cmd}" plugin activate "${i}" >> "${logFile}" 2>&1
+        "${wp_cmd}" plugin activate "${i}" >> "${log_file}" 2>&1
       fi
     done
     trace notime "OK"
@@ -199,7 +199,7 @@ function create_env() {
         REMOVE_ME=".example"
       fi
       dest="$(printf '%s\n' ${arg//$REMOVE_ME/})"
-      cp "${arg}" "${dest}" &>> "${logFile}"
+      cp "${arg}" "${dest}" &>> "${log_file}"
       SET_ENV="1"
       env_file="${dest}"
     fi
diff --git a/lib/wp-core.sh b/lib/wp-core.sh
index c1fb10d..a672eb3 100755
--- a/lib/wp-core.sh
+++ b/lib/wp-core.sh
@@ -10,30 +10,30 @@ function wp_core() {
   # There's a little bug when certain plugins are spitting errors; work around 
   # seems to be to check for core updates a second time
   cd "${APP_PATH}"/"${WPROOT}"; \
-  "${wp_cmd}" core check-update --no-color &>> "${logFile}"
-  if grep -aq 'WordPress is at the latest version.' "${logFile}"; then
+  "${wp_cmd}" core check-update --no-color &>> "${log_file}"
+  if grep -aq 'WordPress is at the latest version.' "${log_file}"; then
     info "Wordpress core is up to date."; UPD2="1"
   else
     sleep 1
     # Get files setup for smart commit
-    "${wp_cmd}" core check-update --no-color &> "${coreFile}"
+    "${wp_cmd}" core check-update --no-color &> "${core_file}"
     
     # Strip out any randomly occuring debugging output
-    grep -vE 'Notice:|Warning:|Strict Standards:|PHP' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
+    grep -vE 'Notice:|Warning:|Strict Standards:|PHP' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}";
     
     # Clean out the gobbleygook from wp-cli
-    sed 's/[+|-]//g' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
-    cat "${coreFile}" | awk 'FNR == 1 {next} {print $1}' > "${trshFile}" && mv "${trshFile}" "${coreFile}";
+    sed 's/[+|-]//g' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}";
+    cat "${core_file}" | awk 'FNR == 1 {next} {print $1}' > "${trash_file}" && mv "${trash_file}" "${core_file}";
     
     # Just in case, try to remove all blank lines. DOS formatting is 
     # messing up output with PHP crap
-    sed '/^\s*$/d' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
+    sed '/^\s*$/d' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}";
     
     # Remove line breaks, value should noe equal 'version x.x.x' or some such.
-    sed ':a;N;$!ba;s/\n/ /g' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}"
+    sed ':a;N;$!ba;s/\n/ /g' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}"
     # Remove everything up to and including the first space (in case of multiple core updates)
-    sed -i 's/[^ ]* //' "${coreFile}"
-    COREUPD=$(<$coreFile)
+    sed -i 's/[^ ]* //' "${core_file}"
+    COREUPD=$(<$core_file)
 
     if [[ -n "${COREUPD}" ]]; then
       # Update available!  \o/
@@ -47,10 +47,10 @@ function wp_core() {
           # Execute the update
           info "Core update found, updating to ${COREUPD}"
           trace "Executing ${composer_cmd} update johnpbloch/wordpress-core"
-          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${logFile}" &
+          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${log_file}" &
           spinner $!
         else
-          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${logFile}"
+          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${log_file}"
         fi
         cd "${WP_PATH}"; \
 
@@ -61,17 +61,17 @@ function wp_core() {
         if [[ "${FORCE}" = "1" ]] || yesno --default no "A new version of Wordpress is available (${COREUPD}), update? [y/N] "; then
           cd "${APP_PATH}/${WPROOT}"; \
           if [[ "${QUIET}" != "1" ]]; then
-            "${wp_cmd}" core update --no-color &>> "${logFile}" &
+            "${wp_cmd}" core update --no-color &>> "${log_file}" &
             spinner $!
           else
-            "${wp_cmd}" core update --no-color &>> "${logFile}"
+            "${wp_cmd}" core update --no-color &>> "${log_file}"
           fi
 
           # Double check upgrade was successful if we still see 
           # 'version' in the output, we must have missed the upgrade 
           # somehow
-          "${wp_cmd}" core check-update --quiet --no-color &> "${trshFile}"
-          if grep -aq "version" "${trshFile}"; then
+          "${wp_cmd}" core check-update --quiet --no-color &> "${trash_file}"
+          if grep -aq "version" "${trash_file}"; then
             error "Core update failed.";
           else
             sleep 1
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index 628d6e4..33a5243 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -11,29 +11,29 @@ function wp_plugins() {
   info "The following updates are available:"
   # Clean the garbage out of the log for console display
   # This is all going to be rewritten
-  sed 's/[+|]//g' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
-  sed '/^\s*$/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed 's/[+|]//g' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
+  sed '/^\s*$/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Remove lines with multiple sequential hyphens
-  sed '/--/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed '/--/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Remove the column label row
-  sed '1,/update_version/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed '1,/update_version/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Remove everything left but the first and fourth "words"
-  awk '{print "  " $1,$4}' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  awk '{print "  " $1,$4}' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Work around the weird "Available" bug
-  sed '/Available/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed '/Available/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Work around for the odd "REQUEST:" occuring
-  sed '/REQUEST:/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
-  cat "${wpFile}" >> "${logFile}"
+  sed '/REQUEST:/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
+  cat "${wp_file}" >> "${log_file}"
 
   # Display plugin list
   if [[ "${QUIET}" != "1" ]]; then
-    cat "${wpFile}"; empty_line
+    cat "${wp_file}"; empty_line
   fi
 
   if [[ "${FORCE}" = "1" ]] || yesno --default no "Proceed with updates? [y/N] "; then
     # If ACFPRO needs an update, do it first via wget
     if [[ "${ACF_LOCK}" != "TRUE" ]]; then
-      if grep -aq "advanced-custom-fields-pro" "${wpFile}"; then
+      if grep -aq "advanced-custom-fields-pro" "${wp_file}"; then
         if [[ "${QUIET}" != "1" ]]; then
           acf_update &
         spinner $!
@@ -48,30 +48,30 @@ function wp_plugins() {
       trace "Found composer.json, updating"
       cd "${APP_PATH}"; \
       if [[ "${QUIET}" != "1" ]]; then
-        "${composer_cmd}" --no-progress update &>> "${logFile}" &
+        "${composer_cmd}" --no-progress update &>> "${log_file}" &
         spinner $!
       else
-        "${composer_cmd}" --no-progress update &>> "${logFile}"
+        "${composer_cmd}" --no-progress update &>> "${log_file}"
       fi
       cd "${WP_PATH}"; \
     fi
 
     # Now, run the rest of the needed updates via wp-cli
     if [[ "${QUIET}" != "1" ]]; then
-      "${wp_cmd}" plugin update --all --no-color &>> "${logFile}" &
+      "${wp_cmd}" plugin update --all --no-color &>> "${log_file}" &
       spinner $!
     else
-      "${wp_cmd}" plugin update --all --no-color &>> "${logFile}" 
+      "${wp_cmd}" plugin update --all --no-color &>> "${log_file}" 
     fi  
 
     # Any problems with plugin updates?
-    if grep -aq 'Warning: The update cannot be installed because we will be unable to copy some files.' "${logFile}"; then
+    if grep -aq 'Warning: The update cannot be installed because we will be unable to copy some files.' "${log_file}"; then
       error "One or more plugin updates have failed, probably due to problems with permissions."
-    elif grep -aq "Plugin update failed." "${logFile}"; then
+    elif grep -aq "Plugin update failed." "${log_file}"; then
       error "One or more plugin updates have failed."
-    elif grep -aq 'Warning: Update package not available.' "${logFile}"; then
+    elif grep -aq 'Warning: Update package not available.' "${log_file}"; then
       error "One or more update packages are not available. \nThis is often be caused by commercial plugins; check your log files."
-    elif grep -aq 'Error: Updated' "${logFile}"; then
+    elif grep -aq 'Error: Updated' "${log_file}"; then
       error "One or more plugin updates have failed."
     fi
 
diff --git a/lib/wp-wordfence.sh b/lib/wp-wordfence.sh
index a08c251..aa81a01 100755
--- a/lib/wp-wordfence.sh
+++ b/lib/wp-wordfence.sh
@@ -16,14 +16,14 @@ function wf_check() {
         error "Deployment can not continue while Wordfence firewall is enabled."
       else
         if yesno --default yes "Attempt to repair files? (sudo required) [Y/n] "; then
-          "${wp_cmd}" plugin deactivate --no-color wordfence &>> "${logFile}"; WFOFF="1"
-          sudo rm -rf "${WORKPATH}/${APP}${WPROOT}${WPAPP}/wflogs" &>> $logFile
+          "${wp_cmd}" plugin deactivate --no-color wordfence &>> "${log_file}"; WFOFF="1"
+          sudo rm -rf "${WORKPATH}/${APP}${WPROOT}${WPAPP}/wflogs" &>> $log_file
           # Remove from repo history, in case .gitignore doesn't have them excluded
           if ! grep -aq "wflog" "${WORKPATH}/${APP}/.gitignore"; then
             cd "${WORKPATH}"/"${APP}"; \
-            git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch ${WPROOT}${WPAPP}/wflogs > /dev/null" HEAD &>> "${logFile}" &
+            git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch ${WPROOT}${WPAPP}/wflogs > /dev/null" HEAD &>> "${log_file}" &
             spinner $!
-            rm -rf .git/refs/original/ && git reflog expire --all &&  git gc --aggressive --prune &>> "${logFile}" &
+            rm -rf .git/refs/original/ && git reflog expire --all &&  git gc --aggressive --prune &>> "${log_file}" &
             spinner $!
             cd "${WORKPATH}"/"${APP}${WPROOT}"; \
           fi
diff --git a/lib/wp.sh b/lib/wp.sh
index 5d71205..118c371 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -40,17 +40,17 @@ function wp() {
         wp_update_check &
         spinner $!
       else
-        "${wp_cmd}" plugin status --no-color >> "${logFile}"
-        "${wp_cmd}" plugin update --dry-run --no-color --all > "${wpFile}"
+        "${wp_cmd}" plugin status --no-color >> "${log_file}"
+        "${wp_cmd}" plugin update --dry-run --no-color --all > "${wp_file}"
       fi
 
       # Check the logs
-      #if grep -aq "U = Update Available" "${logFile}"; then
-      if grep -aq "Available plugin updates:" "${wpFile}"; then    
+      #if grep -aq "U = Update Available" "${log_file}"; then
+      if grep -aq "Available plugin updates:" "${wp_file}"; then    
         wp_plugins
       else
         # Was there a database glitch?
-        if grep -aq 'plugins can not be updated' "${wpFile}"; then
+        if grep -aq 'plugins can not be updated' "${wp_file}"; then
           sleep 1
         else
           info "Plugins are up to date."; UPD1="1"
@@ -69,11 +69,11 @@ function wp() {
 function wp_update_check() {
   "${wp_cmd}" cache delete &>> /dev/null
 
-  # For the logfile
-  "${wp_cmd}" plugin status --no-color &>> $logFile
+  # For the log_file
+  "${wp_cmd}" plugin status --no-color &>> $log_file
 
   # For the console/smart commit message
-  "${wp_cmd}" plugin update --dry-run --no-color --all &> "${wpFile}"
+  "${wp_cmd}" plugin update --dry-run --no-color --all &> "${wp_file}"
 
   # Other options, thanks Corey
   # wp plugin list --format=csv --all --fields=name,update_version,update | grep -a 'available'
@@ -99,7 +99,7 @@ function wp_check() {
       "${wp_cmd}" db check &>> /dev/null; EXITCODE=$?; 
       
       if [[ "${EXITCODE}" != "0" ]]; then 
-        "${wp_cmd}" db check &>> "${logFile}"; 
+        "${wp_cmd}" db check &>> "${log_file}"; 
         trace notime "FAIL"
         if [[ "${AUTOMATE}" == "1" ]]; then
           error "There is a problem with your Wordpress installation, check your configuration."
@@ -109,7 +109,7 @@ function wp_check() {
       else
         # Get info
         trace notime "OK"
-        "${wp_cmd}" core version --extra  &>> "${logFile}";
+        "${wp_cmd}" core version --extra  &>> "${log_file}";
       fi
     else
       WP_PATH="FALSE"
@@ -122,7 +122,7 @@ function wp_server_check {
   # "${wp_cmd}" server --host=localhost > /dev/null 2>&1; EXITCODE=$?; 
   # if [[ "${EXITCODE}" -eq "0" ]]; then
     # trace "Launching server"
-    # "${wp_cmd}" server --host=localhost >> "${logFile}" 2>&1 &
+    # "${wp_cmd}" server --host=localhost >> "${log_file}" 2>&1 &
     # Keep checking for server to come online
     # until $(${curl_cmd} --output /dev/null --silent --head --fail http://localhost:8080); do
     #   sleep 1
@@ -130,11 +130,11 @@ function wp_server_check {
   # fi
 
   trace "Activating plugins"
-  "${wp_cmd}" plugin activate --all >> "${logFile}" 2>&1
+  "${wp_cmd}" plugin activate --all >> "${log_file}" 2>&1
   # trace "Activating theme"
-  # "${wp_cmd}" theme activate site >> "${logFile}" 2>&1
+  # "${wp_cmd}" theme activate site >> "${log_file}" 2>&1
   
-  #"${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
+  #"${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${log_file}" 2>&1
   
   #if [[ -z "$(${curl_cmd} -sL localhost:8080 | grep -E "Warning:|Fatal:")" ]]; then
   #if "${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" > /dev/null; then
diff --git a/stir.sh b/stir.sh
index 195ddae..fd3f552 100755
--- a/stir.sh
+++ b/stir.sh
@@ -45,8 +45,8 @@ function init_startup() {
 
 # Temp files
 function init_temp() {
-  var=(logFile wpFile coreFile postFile trshFile scanFile statFile \
-    urlFile)
+  var=(log_file wp_file core_file post_file trash_file scan_file stat_file \
+    url_file)
   init_loop
 }
 
@@ -78,8 +78,8 @@ function init_env() {
 
 # Internal variables
 function init_internal() {
-  var=(optstring options logFile wpFile coreFile postFile trshFile statFile \
-  urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail stir_path \
+  var=(optstring options log_file wp_file core_file post_file trash_file stat_file \
+  url_file html_file htmlSendmail html_email client_email textSendmail stir_path \
   etc_path lib_path POSTEMAIL current_branch error_msg notes \
   UPDCORE TASKLOG PCA PCB PCC PCD PLUGINS slack_icon APPRC USERRC message_state \
   COMMITURL COMMITHASH UPD1 UPD2 UPDATE gitLock AUTOMERGE MERGE EXITCODE \
@@ -120,9 +120,9 @@ function temp_files() {
     exit 78
   else
   # Setup tempfile list
-  file=(trshFile postFile statFile scanFile scan_html wpFile \
-    urlFile htmlFile htmlEmail clientEmail coreFile statDir avatarDir \
-    stats logFile)
+  file=(trash_file post_file stat_file scan_file scan_html wp_file \
+    url_file html_file html_email client_email core_file stat_dir avatar_dir \
+    stats log_file)
 
     # Start the loop
     if [[ "${1}" == "remove" ]]; then
@@ -326,7 +326,7 @@ if [[ "${CURRENT}" == "1" ]]; then
   APP="${PWD##*/}"
 fi
 
-# Get the active switches for display in logfiles
+# Get the active switches for display in log_files
 [[ "${AUTOMATE}" == "1" ]] && STARTUP="${STARTUP} --automate"
 [[ "${UPGRADE}" == "1" ]] && STARTUP="${STARTUP} --update"
 [[ "${APPROVE}" == "1" ]] && STARTUP="${STARTUP} --approve" #; FORCE="1"
@@ -429,14 +429,14 @@ temp_files create
 
 # Fire up temporary log files. Consolidate this shit better someday, geez.
 # Main log file
-#logFile="/tmp/${APP}.log-$RANDOM.log"
-#(umask 077 && touch "${logFile}") || log_fail
-#wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail
-#coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail
+#log_file="/tmp/${APP}.log-$RANDOM.log"
+#(umask 077 && touch "${log_file}") || log_fail
+#wp_file="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wp_file}" &> /dev/null) || log_fail
+#core_file="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${core_file}" &> /dev/null) || log_fail
 
-# Start writing the logfile
-echo -e "Activity logfile for ${APP^^} - ${NOW}\r" >> "${logFile}"
-echo -e "Launching stir${STARTUP}\n" >> "${logFile}"
+# Start writing the log_file
+echo -e "Activity log_file for ${APP^^} - ${NOW}\r" >> "${log_file}"
+echo -e "Launching stir${STARTUP}\n" >> "${log_file}"
 
 # Function list
 if [[ "${FUNCTION_LIST}" == "1" ]]; then
@@ -555,7 +555,7 @@ fi
 
 # General info
 if [[ "${INCOGNITO}" != "TRUE" ]]; then
-  trace "Log file is ${logFile}"
+  trace "Log file is ${log_file}"
   trace "Project workpath is ${WORKPATH}"
 fi
 

From 9977cafedfd19203ebfa6a2c64458d11a2d06b81 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 31 Aug 2020 22:53:51 -0700
Subject: [PATCH 304/334] Variable changes

---
 CHANGELOG.md      |  2 +-
 lib/deployment.sh |  4 ++--
 lib/mail-log.sh   |  4 ----
 lib/main.sh       | 36 ++++++++++++++----------------------
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 097ac67..15ccf30 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -255,7 +255,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Cleaned up configuration files
 - Exit codes now pass more reliably to Slack messages 
 ### Fixed
-- Fixed issue with pkgDeploy() not executing deployment command correctly
+- Fixed issue with proj_deploy() not executing deployment command correctly
 
 ## [3.3.3] - 02-11-2016
 ### Added
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 2939cbb..3373917 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -11,7 +11,7 @@ var=(start_deploy)
 init_loop
 
 # Housekeeping tasks to run before final deployment
-function preDeploy() {
+function pre_deploy() {
   # If there are changes waiting in the repo, stop and ask for user input
   # This should probably be it's own function
   current_stash="0"
@@ -52,7 +52,7 @@ function preDeploy() {
   fi
 } 
 
-function pkgDeploy() {
+function proj_deploy() {
   empty_line
   if [[ -n "${DEPLOY}" ]]; then
     # Add ssh keys and double check directoy
diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index f07c97d..8615077 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -75,10 +75,6 @@ function email_test() {
   if [[ -z "${TO}" ]]; then
     empty_line; warning "No recipient address found."
     quiet_exit
-
-#  elif [[ ! -f "${sendmail_cmd}" ]]; then
-#    empty_line; warning "Mail system misconfigured or not found."
-#    quiet_exit
   else
     # Send HTML mail
     (
diff --git a/lib/main.sh b/lib/main.sh
index 7aaadf2..b8dbf93 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -45,14 +45,14 @@ function main() {
       ssh_check   # Check keys
     fi
     if [[ "${PUBLISH}" == "1" ]]; then
-      pkgDeploy   # Deploy project to live server
+      proj_deploy   # Deploy project to live server
     else
       checkout "${MASTER}"    # Checkout master branch
       garbage                 # If needed, clean up the trash
 
       # A simple way to repair a failed push
       if [[ "${REPAIR}" == "1" ]]; then 
-        preDeploy     # Get the status  
+        pre_deploy     # Get the status  
 
         confirm_branch "${MASTER}"
         push
@@ -70,10 +70,10 @@ function main() {
   
         checkout "${MASTER}"
 
-        pkgDeploy     # Deploy project to live server
+        proj_deploy      # Deploy project to live server
         return 0
       elif [[ ! -f "${WORKPATH}/${APP}/.queued" ]]; then
-        preDeploy   # Get the status
+        pre_deploy      # Get the status
       fi
 
 
@@ -81,38 +81,30 @@ function main() {
       if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ -f "${WORKPATH}/${APP}/.queued" ]]; then
         notice "Approval queue functions are deprecated and will be removed soon."
         if [[ "${APPROVE}" == "1" ]] || [[ -f "${WORKPATH}/${APP}/.approved" ]]; then
-          approve   # Approve proposed changes
+          approve     # Approve proposed changes
         else
           if [[ "${DENY}" == "1" ]] || [[ -f "${WORKPATH}/${APP}/.denied" ]]; then 
-            deny    # Deny proposed changes
+            deny      # Deny proposed changes
           fi
         fi
       fi
 
       # Continue normally
       if [[ "${APPROVE}" != "1" ]]; then
-        wp          # Run Wordpress upgrades if needed
-        build_check      # Run package manager
-        status      # Make sure there's something here to commit         
+        wp            # Run Wordpress upgrades if needed
+        build_check   # Run package manager
+        status        # Make sure there's something here to commit         
       fi
 
       if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ ! -f "${WORKPATH}/${APP}/.queued" ]]; then
         notice "Approval queue functions are deprecated and will be removed soon."
-        queue 		# Queue for approval if needed
+        queue 		    # Queue for approval if needed
       fi
 
       if [[ "${APPROVE}" != "1" ]] && [[ ! -f "${WORKPATH}/${APP}/.queued" ]]; then
-        stage       # Stage files     
-        gitCommit   # Commit, with message
-      fi
-
-      # Push, merge, deploy
-      # TODO: Roll this into its own function
-      # gitPushMstr   # Push master branch
-      # gitChkProd    # Checkout production branch
-      # gitMerge      # Merge master into production
-      # gitPushProd   # Push production branch
-      # gitChkMstr    # Checkout master once again  
+        stage         # Stage files     
+        gitCommit     # Commit, with message
+      fi 
       
       confirm_branch "${MASTER}"
       push
@@ -132,7 +124,7 @@ function main() {
         checkout "${MASTER}"
       fi
 
-      pkgDeploy     # Deploy project to live server
+      proj_deploy     # Deploy project to live server
     fi
   fi  
 }

From a40da038b3c8986ff2a111ddf720aee436198660 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 15 Sep 2020 22:39:44 -0700
Subject: [PATCH 305/334] Add socialInteractions graphic for digests

---
 lib/statistics.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/statistics.sh b/lib/statistics.sh
index d183bde..75358fd 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -141,7 +141,7 @@ function project_engagement() {
     ENGAGEMENT_DAYS="7"
   fi
 
-  ga_var=(hits users newUsers sessions organicSearches pageviews percentNewSessions)
+  ga_var=(hits users newUsers sessions organicSearches pageviews percentNewSessions socialInteractions)
   # Start the loop
   for i in "${ga_var[@]}" ; do
     ga_over_time ${i} ${ENGAGEMENT_DAYS}

From e23532198ebaf692be9bddf90d6560ced1b78701 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 24 Sep 2020 18:06:15 -0700
Subject: [PATCH 306/334] Add socialInteractions graphic for digests

---
 lib/statistics.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/statistics.sh b/lib/statistics.sh
index 3907b7b..814a845 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -141,7 +141,7 @@ function project_engagement() {
     ENGAGEMENT_DAYS="7"
   fi
 
-  ga_var=(hits users newUsers sessions organicSearches pageviews percentNewSessions)
+  ga_var=(hits users newUsers sessions organicSearches pageviews percentNewSessions socialInteractions)
   # Start the loop
   for i in "${ga_var[@]}" ; do
     ga_over_time ${i} ${ENGAGEMENT_DAYS}

From 9a049cbbb44a3a69efe5e77e20d460b19db38282 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 24 Sep 2020 20:43:20 -0700
Subject: [PATCH 307/334] Updated variable names in init_temp()

---
 CHANGELOG.md                       |  2 +-
 etc/html/default/remote/nolog.html |  2 +-
 etc/stir-global.conf               |  2 +-
 etc/stir-project.sh                |  4 +--
 lib/analytics.sh                   | 18 +++++-----
 lib/build.sh                       |  8 ++---
 lib/deployment.sh                  | 16 ++++-----
 lib/digest.sh                      | 18 +++++-----
 lib/display-styles.sh              | 16 ++++-----
 lib/env-check.sh                   | 18 +++++-----
 lib/error-check.sh                 | 46 ++++++++++++------------
 lib/git-obj.sh                     | 48 ++++++++++++-------------
 lib/git.sh                         | 12 +++----
 lib/invoice.sh                     | 14 ++++----
 lib/loader.sh                      | 12 +++----
 lib/log-handling.sh                | 56 +++++++++++++++---------------
 lib/mail-log.sh                    |  2 +-
 lib/monitor.sh                     |  6 ++--
 lib/post-integration.sh            |  6 ++--
 lib/process-html.sh                |  4 +--
 lib/quit.sh                        |  6 ++--
 lib/report.sh                      | 10 +++---
 lib/reset.sh                       |  8 ++---
 lib/rss.sh                         | 24 ++++++-------
 lib/scan.sh                        | 14 ++++----
 lib/scp.sh                         |  2 +-
 lib/slack.sh                       |  2 +-
 lib/smart-commits.sh               | 10 +++---
 lib/statistics.sh                  | 40 ++++++++++-----------
 lib/wp-acf.sh                      |  6 ++--
 lib/wp-clone.sh                    |  6 ++--
 lib/wp-core.sh                     | 32 ++++++++---------
 lib/wp-plugins.sh                  | 36 +++++++++----------
 lib/wp-wordfence.sh                |  8 ++---
 lib/wp.sh                          | 28 +++++++--------
 stir.sh                            | 32 ++++++++---------
 36 files changed, 287 insertions(+), 287 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 097ac67..223be87 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Deprecated the `WPCLI` and `MAILPATH` global variables
 - Deprecated approval functionality
 - Plugins are no longer activated by default, unless required for reliable upgrades
-- Composer now creates less noise in logfiles
+- Composer now creates less noise in log_files
 - Improved dependency checks
 - Improved temporary file management
 - Improved first-run install process
diff --git a/etc/html/default/remote/nolog.html b/etc/html/default/remote/nolog.html
index 04f68ab..85fec0c 100755
--- a/etc/html/default/remote/nolog.html
+++ b/etc/html/default/remote/nolog.html
@@ -62,7 +62,7 @@
 
 								
 								
-								
Darn it, there doesn't appear to be a logfile for that commit.

+								
Darn it, there doesn't appear to be a log_file for that commit.

 
 								
If you have any questions, feel free to ask us anything, using the live chat function on this page, or email. Thank you!

 								
diff --git a/etc/stir-global.conf b/etc/stir-global.conf
index ece52da..79aa123 100755
--- a/etc/stir-global.conf
+++ b/etc/stir-global.conf
@@ -97,7 +97,7 @@ GLOBAL_VERSION="3.8"
 # to "TRUE" and make sure ssmtp is properly installed and configured.
 # USE_SMTP="{{USE_SMTP}}"
 
-# Set the address the logfiles will be sent from
+# Set the address the log_files will be sent from
 # FROM="{{FROM}}"
 
 # Email log subject line "- project name" is appended to this,
diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 2881aff..8c6d17e 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -216,7 +216,7 @@ PROJECT_VERSION="3.8"
 # Logging
 ###############################################################################
 
-# If you need to send logfiles and email alerts to address(es) other than those
+# If you need to send log_files and email alerts to address(es) other than those
 # you may have configured globally, enter them below.
 # TO="{{TO}}"
 
@@ -226,7 +226,7 @@ PROJECT_VERSION="3.8"
 # folder name of your template.
 # HTMLTEMPLATE="{{HTMLTEMPLATE}}"
 
-# If you are using html logfiles, define the full URL to the client's logo
+# If you are using html log_files, define the full URL to the client's logo
 # CLIENTLOGO="{{CLIENTLOGO}}"
 
 # If you are using a digest theme that includes a cover image, at the URL below.
diff --git a/lib/analytics.sh b/lib/analytics.sh
index bdb06ff..24e08bf 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -58,9 +58,9 @@ function analytics() {
     ga_metrics
 
     # Update access token
-    "${curl_cmd}" -s -d "client_id=${CLIENTID}&client_secret=${CLIENTSECRET}&refresh_token=${REFRESHTOKEN}&grant_type=refresh_token" https://accounts.google.com/o/oauth2/token > "${trshFile}"
-    sed -i '/access_token/!d' "${trshFile}"
-    ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")"
+    "${curl_cmd}" -s -d "client_id=${CLIENTID}&client_secret=${CLIENTSECRET}&refresh_token=${REFRESHTOKEN}&grant_type=refresh_token" https://accounts.google.com/o/oauth2/token > "${trash_file}"
+    sed -i '/access_token/!d' "${trash_file}"
+    ACCESSTOKEN="$(awk -F\" '{print $4}' "${trash_file}")"
 
     # Grab data from Google
     ga_data
@@ -205,7 +205,7 @@ function ga_over_time() {
     max_value=""
 
     # Flush csv
-    [[ -f "${trshFile}" ]] && rm "${trshFile}"
+    [[ -f "${trash_file}" ]] && rm "${trash_file}"
 
     while [ "$ga_day" != "${GASTART}" ]; do 
       RESULT=$(${curl_cmd} -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${METRIC}&start-date=$ga_day&end-date=$ga_day&access_token=$ACCESSTOKEN" | tr , '\n' | grep -a "\"ga:$METRIC\":" | cut -d'"' -f4);
@@ -256,7 +256,7 @@ function ga_over_time() {
       eval $1_$n="${!var}"
       eval $1_percent_$n="${var_percent}"
       this_day=$(date '+%a' -d "$n days ago")
-      echo -e "${this_day}, ${!var}, ${var_percent}" >> "${trshFile}"
+      echo -e "${this_day}, ${!var}, ${var_percent}" >> "${trash_file}"
 
       if [[ "${PROJSTATS}" == "1" ]]; then
         sed -i -e "s^{{$1_$n}}^${!var}^g" \
@@ -266,7 +266,7 @@ function ga_over_time() {
       fi    
     done
 
-    tac "${trshFile}" > ${statDir}/"${METRIC}".csv
+    tac "${trash_file}" > ${statDir}/"${METRIC}".csv
 
     ${gnuplot_cmd} -p << EOF
     set encoding utf8
@@ -356,9 +356,9 @@ function ga_test() {
   fi
 
   notice "Refreshing token..."
-  "${curl_cmd}" -s -d "client_id=${CLIENTID}&client_secret=${CLIENTSECRET}&refresh_token=${REFRESHTOKEN}&grant_type=refresh_token" https://accounts.google.com/o/oauth2/token > "${trshFile}"
-  sed -i '/access_token/!d' "${trshFile}"
-  ACCESSTOKEN="$(awk -F\" '{print $4}' "${trshFile}")"
+  "${curl_cmd}" -s -d "client_id=${CLIENTID}&client_secret=${CLIENTSECRET}&refresh_token=${REFRESHTOKEN}&grant_type=refresh_token" https://accounts.google.com/o/oauth2/token > "${trash_file}"
+  sed -i '/access_token/!d' "${trash_file}"
+  ACCESSTOKEN="$(awk -F\" '{print $4}' "${trash_file}")"
   echo "${ACCESSTOKEN}"
 
   ga_data_loop
diff --git a/lib/build.sh b/lib/build.sh
index a48f6d8..ade0df0 100755
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -38,9 +38,9 @@ function build_grunt() {
       cd "${APP_PATH}" || error_check
       
       if [[ "${VERBOSE}" == "TRUE" ]]; then
-        "${grunt_cmd}" build --force 2>&1 | tee --append "${trshFile}"           
+        "${grunt_cmd}" build --force 2>&1 | tee --append "${trash_file}"           
       else
-        "${grunt_cmd}" build --force &>> "${trshFile}" &
+        "${grunt_cmd}" build --force &>> "${trash_file}" &
         spinner $!
         info "Packages successfully built."
       fi
@@ -79,9 +79,9 @@ function build_npm() {
   if [[ "${BUILD}" = "1" ]] || yesno --default no "Build assets? [y/N] "; then
     cd "${npm_json}" || error_check
     if [[ "${VERBOSE}" == "TRUE" ]]; then
-      "${npm_cmd}" run build | tee --append "${trshFile}"               
+      "${npm_cmd}" run build | tee --append "${trash_file}"               
     else
-      "${npm_cmd}" run build &>> "${trshFile}"; error_check
+      "${npm_cmd}" run build &>> "${trash_file}"; error_check
       info "Packages successfully built."
     fi
   else
diff --git a/lib/deployment.sh b/lib/deployment.sh
index 5a97141..2939cbb 100755
--- a/lib/deployment.sh
+++ b/lib/deployment.sh
@@ -24,9 +24,9 @@ function preDeploy() {
         empty_line
         trace "Stashing dirty files"
         if [[ "${VERBOSE}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then
-          git stash | tee --append "${logFile}"; error_check 
+          git stash | tee --append "${log_file}"; error_check 
         else
-          git stash >> "${logFile}"; error_check
+          git stash >> "${log_file}"; error_check
         fi
         current_stash="1"
       else
@@ -87,7 +87,7 @@ function pkgDeploy() {
           if [[ "${DEPLOY}" == "SCP" ]]; then
             deploy_scp
           else
-            eval "${DEPLOY}" | tee --append "${logFile}"            
+            eval "${DEPLOY}" | tee --append "${log_file}"            
           fi
           error_check
         else
@@ -96,14 +96,14 @@ function pkgDeploy() {
               deploy_scp &
               spinner $!
             else
-              eval "${DEPLOY}" &>> "${logFile}" &
+              eval "${DEPLOY}" &>> "${log_file}" &
               spinner $!
             fi
           else
             if [[ "${DEPLOY}" == "SCP" ]]; then
-              deploy_scp &>> "${logFile}"; error_check
+              deploy_scp &>> "${log_file}"; error_check
             else
-              eval "${DEPLOY}" &>> "${logFile}"; error_check
+              eval "${DEPLOY}" &>> "${log_file}"; error_check
             fi
           fi
         fi
@@ -119,7 +119,7 @@ function pkgDeploy() {
       fi
     else
       if [[ "${APPROVE}" == "1" ]]; then
-        eval "${DEPLOY}" &>> "${logFile}"
+        eval "${DEPLOY}" &>> "${log_file}"
       else
         if [[ "${APPROVE}" != "1" ]]; then
           if [[ -z "${PRODURL}" ]]; then 
@@ -136,7 +136,7 @@ function pkgDeploy() {
 
 function postDeploy() {
   # Check for deployment failure
-  if grep -aq "ERROR: Deploy failed." "${logFile}"; then
+  if grep -aq "ERROR: Deploy failed." "${log_file}"; then
     error "Deploy failed."
   fi
 
diff --git a/lib/digest.sh b/lib/digest.sh
index cb156b5..a99f099 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -60,22 +60,22 @@ function create_digest() {
 
     # If there have been no commits in the last week, skip creating the digest
     if [[ $(git log --since="7 days ago") ]]; then
-      git log --pretty=format:"%n$DIGESTWRAP%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s
" --since="7 days ago" > "${statFile}"; dot
-      sed -i '/^commit/ s/$/ <\/strong>
/' "${statFile}"
-      sed -i '/^Author:/ s/$/ 
/' "${statFile}"
-      sed -i '/^Date:/ s/$/ 

/' "${statFile}"
+      git log --pretty=format:"%n$DIGESTWRAP%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s
" --since="7 days ago" > "${stat_file}"; dot
+      sed -i '/^commit/ s/$/ <\/strong>
/' "${stat_file}"
+      sed -i '/^Author:/ s/$/ 
/' "${stat_file}"
+      sed -i '/^Date:/ s/$/ 

/' "${stat_file}"
 
       # Look for manual commits and strip their URLs 
-      grep -oP "(?<=href=\")[^\"]+(?=\")" "${statFile}" > "${trshFile}"; dot
+      grep -oP "(?<=href=\")[^\"]+(?=\")" "${stat_file}" > "${trash_file}"; dot
       while read URL; do
         CODE=$(${curl_cmd} -o /dev/null --silent --head --write-out '%{http_code}' "$URL")
         if [[ "${CODE}" != "200" ]]; then 
-          # sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${statFile}"
-          sed -i "s,${URL},${REPOHOST}/${REPO},g" "${statFile}"; dot
+          # sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${stat_file}"
+          sed -i "s,${URL},${REPOHOST}/${REPO},g" "${stat_file}"; dot
         fi
-      done < "${trshFile}"
+      done < "${trash_file}"
 
-      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${statFile}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${htmlFile}"; dot
+      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${htmlFile}"; dot
 
       # Randomize a positive Monday thought. Special characters must be escaped 
       # and use character codes
diff --git a/lib/display-styles.sh b/lib/display-styles.sh
index d1025b2..24ccda5 100755
--- a/lib/display-styles.sh
+++ b/lib/display-styles.sh
@@ -33,17 +33,17 @@ function console() {
   fi
 }
 
-# Standard text output to console and logfile
+# Standard text output to console and log_file
 function info() {
   if [[ "${QUIET}" != "1" ]]; then
     echo -e "${reset}$*${endColor}"
   fi
-  echo "$@" >> "${logFile}"
+  echo "$@" >> "${log_file}"
 }
 
 # Standard text output only to log
 function log() {
-  echo "$@" >> "${logFile}"
+  echo "$@" >> "${log_file}"
 }
 
 function input() {
@@ -57,7 +57,7 @@ function notice() {
   if [[ "${QUIET}" != "1" ]]; then
     echo; echo -e "${green}$*${endColor}"
   fi
-  echo "" >> "${logFile}"; echo "$@" >> "${logFile}"
+  echo "" >> "${log_file}"; echo "$@" >> "${log_file}"
 }
 
 function error() {
@@ -68,7 +68,7 @@ function error() {
   else
     echo -e "$@"
   fi
-  echo -e "\nERROR: $*" >> "${logFile}"
+  echo -e "\nERROR: $*" >> "${log_file}"
   error_msg="$*"
   error_exit
 }
@@ -77,14 +77,14 @@ function warning() {
   if [[ "${QUIET}" != "1" ]]; then
     echo -e "${red}$*${endColor}"
   fi
-  echo "WARNING: $*" >> "${logFile}"
+  echo "WARNING: $*" >> "${log_file}"
 }
 
 function empty_line() {
   if [[ "${QUIET}" != "1" ]]; then
     echo ""
-    echo "" >> "${logFile}"
+    echo "" >> "${log_file}"
   else
-    echo "" >> "${logFile}"
+    echo "" >> "${log_file}"
   fi
 }
diff --git a/lib/env-check.sh b/lib/env-check.sh
index c54d648..4523adc 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -101,7 +101,7 @@ function update_global() {
   fi
   info "Global configuration backup created at ${stir_path}/global.conf.bak"
   
-  cp "${stir_path}"/stir-global.conf "${trshFile}"
+  cp "${stir_path}"/stir-global.conf "${trash_file}"
 
   # Reload global values
   source "${stir_path}"/global.conf
@@ -115,9 +115,9 @@ function update_global() {
   # Install new files
   env_cleanup
   if [[ ! -w "${stir_path}/global.conf" ]]; then
-    sudo cp "${trshFile}" "${stir_path}"/global.conf
+    sudo cp "${trash_file}" "${stir_path}"/global.conf
   else
-    cp "${trshFile}" "${stir_path}"/global.conf
+    cp "${trash_file}" "${stir_path}"/global.conf
   fi
   
   console "Global configuration updated - restart stir to continue."
@@ -130,7 +130,7 @@ function update_user() {
   
   info "User configuration backup created at ~/.stirrc.bak"
   cp ~/.stirrc ~/.stirrc.bak
-  cp "${stir_path}"/stir-user.rc "${trshFile}"
+  cp "${stir_path}"/stir-user.rc "${trash_file}"
 
   # Reload user values
   source ~/.stirrc
@@ -143,7 +143,7 @@ function update_user() {
 
   # Install new files
   env_cleanup
-  cp "${trshFile}" ~/.stirrc
+  cp "${trash_file}" ~/.stirrc
 }
 
 function update_project() { 
@@ -166,7 +166,7 @@ function update_project() {
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
-  cp "${stir_path}"/stir-project.sh "${trshFile}"
+  cp "${stir_path}"/stir-project.sh "${trash_file}"
   # Loops through the variables
   for i in "${env_settings[@]}" ; do
     current_setting=$(grep -a "^${i}=" "${project_config}")
@@ -175,20 +175,20 @@ function update_project() {
 
   # Install new files
   env_cleanup
-  cp "${trshFile}" "${project_config}"
+  cp "${trash_file}" "${project_config}"
 }
 
 function insert_values() {
   if [[ -n "${!i:-}" ]]; then
     [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
-    sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${trshFile}; sed -i 's^# ${i}^${i}^g' ${trshFile}")
+    sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${trash_file}; sed -i 's^# ${i}^${i}^g' ${trash_file}")
     # Kludgy but works. Ugh.
     eval "${sed_hack}"
   fi
 }
 
 function env_cleanup() {
-  sed -i "s^{{.*}}^^g" "${trshFile}"
+  sed -i "s^{{.*}}^^g" "${trash_file}"
 }
 
 
diff --git a/lib/error-check.sh b/lib/error-check.sh
index 3bb3952..2e00049 100755
--- a/lib/error-check.sh
+++ b/lib/error-check.sh
@@ -40,14 +40,14 @@ function deploy_check() {
     DEPLOYTEST="mina --simulate deploy"
     # Get variables organized
     if [[ -f "${WORKPATH}/${APP}/${CONFIGDIR}/deploy.rb" ]]; then
-      grep -n -w "set :user" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
-      MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile})
-      echo -n "${MINAUSER}" > "${statFile}"
-      echo -n "@" >> ${statFile}
-      grep -n -w "set :domain" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trshFile}"
-      MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile})
-      echo -n "${MINADOMAIN}" >> "${statFile}"
-      SSHTARGET=$(sed -r 's/\s+//g' ${statFile})
+      grep -n -w "set :user" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trash_file}"
+      MINAUSER=$(awk -F\' '{print $2,$4}' ${trash_file})
+      echo -n "${MINAUSER}" > "${stat_file}"
+      echo -n "@" >> ${stat_file}
+      grep -n -w "set :domain" "${WORKPATH}/${APP}/${CONFIGDIR}"/deploy.rb > "${trash_file}"
+      MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trash_file})
+      echo -n "${MINADOMAIN}" >> "${stat_file}"
+      SSHTARGET=$(sed -r 's/\s+//g' ${stat_file})
       # SSH check
       if [[ "${INCOGNITO}" != "TRUE" ]]; then
         trace "Testing connection for ${SSHTARGET}"
@@ -58,26 +58,26 @@ function deploy_check() {
 
     elif [[ -f "${WORKPATH}/${APP}/.deploy.yml" ]]; then
       DEPLOYTEST="bundle exec mina --simulate deploy -f Minafile"
-      grep -n -w "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
+      grep -n -w "user:" "${WORKPATH}/${APP}"/.deploy.yml > "${trash_file}"
       
-      if grep -aq "'" "${trshFile}"; then
-        MINAUSER=$(awk -F\' '{print $2,$4}' ${trshFile}) # Single quote method
+      if grep -aq "'" "${trash_file}"; then
+        MINAUSER=$(awk -F\' '{print $2,$4}' ${trash_file}) # Single quote method
       else
-        MINAUSER=$(awk 'NF>1{print $NF}' ${trshFile})
+        MINAUSER=$(awk 'NF>1{print $NF}' ${trash_file})
       fi
 
-      echo -n "${MINAUSER}" > "${statFile}"
-      echo -n "@" >> ${statFile}
-      grep -n -w "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trshFile}"
+      echo -n "${MINAUSER}" > "${stat_file}"
+      echo -n "@" >> ${stat_file}
+      grep -n -w "domain:" "${WORKPATH}/${APP}"/.deploy.yml > "${trash_file}"
 
-      if grep -aq "'" "${trshFile}"; then
-        MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trshFile}) # Single quote method
+      if grep -aq "'" "${trash_file}"; then
+        MINADOMAIN=$(awk -F\' '{print $2,$4}' ${trash_file}) # Single quote method
       else
-        MINADOMAIN=$(awk 'NF>1{print $NF}' ${trshFile})
+        MINADOMAIN=$(awk 'NF>1{print $NF}' ${trash_file})
       fi
 
-      echo -n "${MINADOMAIN}" >> "${statFile}"
-      SSHTARGET=$(sed -r 's/\s+//g' ${statFile})  
+      echo -n "${MINADOMAIN}" >> "${stat_file}"
+      SSHTARGET=$(sed -r 's/\s+//g' ${stat_file})  
       # SSH check
       if [[ "${INCOGNITO}" != "TRUE" ]]; then
         trace "Testing connection for ${SSHTARGET}"
@@ -101,8 +101,8 @@ function deploy_check() {
         # Ok now offer to re-run mina in verbose mode if someone is at the console
         # If FORCE=1 then simply exit
         if [[ "${FORCE}" == "1" ]] || yesno --default yes "Retry ${DEPLOY} in verbose mode? [Y/n] "; then
-          eval "ssh ${SSHTARGET}" | tee --append "${logFile}"
-          # eval "${DEPLOY}" | tee --append "${logFile}"
+          eval "ssh ${SSHTARGET}" | tee --append "${log_file}"
+          # eval "${DEPLOY}" | tee --append "${log_file}"
         else
           error "Connection for ${SSHTARGET} not established, an unknown error occurred."
         fi
@@ -118,7 +118,7 @@ function deploy_check() {
       EXITCODE=$?;
       if [[ "${EXITCODE}" != 0 ]]; then
         warning "Could not locate Gemfile or .bundle/ directory, installing..." 
-        eval "bundle install" | tee --append "${logFile}"
+        eval "bundle install" | tee --append "${log_file}"
         eval "bundle check" &>> /dev/null
         EXITCODE=$?;
         if [[ "${EXITCODE}" != 0 ]]; then
diff --git a/lib/git-obj.sh b/lib/git-obj.sh
index ed1ebc5..79c6b0a 100644
--- a/lib/git-obj.sh
+++ b/lib/git-obj.sh
@@ -38,8 +38,8 @@ function verify_project() {
   fi
 
   # Make sure there has been at least one commit previously made
-  git rev-parse --abbrev-ref HEAD &>> "${trshFile}"
-  if grep -aq "fatal" "${trshFile}"; then 
+  git rev-parse --abbrev-ref HEAD &>> "${trash_file}"
+  if grep -aq "fatal" "${trash_file}"; then 
     error "Unable to start, push your first commit manually and try again."
   else  
     # If running --automate, force a branch check
@@ -61,9 +61,9 @@ function verify_project() {
   # If running --automate, pull and sync all branches
   if [[ "${AUTOMATE}" == "1" ]]; then
     trace "Syncing with origin"
-    "${git_cmd}" fetch --all &>> "${logFile}"; error_check
+    "${git_cmd}" fetch --all &>> "${log_file}"; error_check
     sleep 2 # Chill for a second (or 2 :p)
-    "${git_cmd}" pull --all &>> "${logFile}"; error_check
+    "${git_cmd}" pull --all &>> "${log_file}"; error_check
   fi
 
   # Try to clear out old git processes owned by this user, if they exist
@@ -83,13 +83,13 @@ function checkout() {
     notice "Checking out ${working_branch} branch...";
     
     if [[ "${VERBOSE}" == "TRUE" ]]; then
-      git checkout "${working_branch}" | tee --append "${logFile}"
+      git checkout "${working_branch}" | tee --append "${log_file}"
     else
       if [[ "${QUIET}" != "1" ]]; then
-        git checkout "${working_branch}" &>> "${logFile}" &
+        git checkout "${working_branch}" &>> "${log_file}" &
         show_progress
       else
-        git checkout "${working_branch}" &>> "${logFile}"
+        git checkout "${working_branch}" &>> "${log_file}"
       fi
     fi
   fi
@@ -119,9 +119,9 @@ function stage() {
     if [[ "${FORCE}" = "1" ]] || yesno --default yes "Stage files? [Y/n] "; then
       trace "Staging files"
       if [[ "${VERBOSE}" == "TRUE" ]]; then
-        git add --all :/ | tee --append "${logFile}"; error_check              
+        git add --all :/ | tee --append "${log_file}"; error_check              
       else  
-        git add --all :/ &>> "${logFile}"; error_check
+        git add --all :/ &>> "${log_file}"; error_check
       fi
     else
       trace "Exiting without staging files"; user_exit    
@@ -134,22 +134,22 @@ function push() {
   trace "Push ${working_branch}";
   empty_line
   if [[ "${VERBOSE}" == "TRUE" ]]; then
-    git push origin "${working_branch}" | tee --append "${logFile}"; error_check 
+    git push origin "${working_branch}" | tee --append "${log_file}"; error_check 
     trace "OK"              
   else
     if [[ "${FORCE}" = "1" ]] || yesno --default yes "Push ${working_branch} branch? [Y/n] "; then
       if [[ "${QUIET}" != "1" ]]; then
         sleep 1
-        git push origin "${working_branch}" &>> "${logFile}" &
+        git push origin "${working_branch}" &>> "${log_file}" &
         spinner $!
         info "Success.    "
       else
-        git push origin "${working_branch}" &>> "${logFile}"; error_check
+        git push origin "${working_branch}" &>> "${log_file}"; error_check
       fi
       sleep 1
       if [[ "$(git status --porcelain)" ]]; then
-        sleep 1; git add --all :/ &>> "${logFile}"
-        git push --force-with-lease  &>> "${logFile}"
+        sleep 1; git add --all :/ &>> "${log_file}"
+        git push --force-with-lease  &>> "${log_file}"
       fi
     else
       clean_exit
@@ -172,14 +172,14 @@ function merge() {
     # TODO: Find out why this is here, I can't remember what it was working around
     [[ -f "${gitLock}" ]] && rm "${gitLock}"
     if [[ "${VERBOSE}" == "TRUE" ]]; then
-      git merge "${MASTER}" | tee --append "${logFile}"              
+      git merge "${MASTER}" | tee --append "${log_file}"              
     else
       if [[ "${QUIET}" != "1" ]]; then
-        # git merge --no-edit master &>> "${logFile}" &
-        git merge "${MASTER}" &>> "${logFile}" &
+        # git merge --no-edit master &>> "${log_file}" &
+        git merge "${MASTER}" &>> "${log_file}" &
         show_progress
       else
-        git merge "${MASTER}" &>> "${logFile}"
+        git merge "${MASTER}" &>> "${log_file}"
       fi
     fi
   fi
@@ -203,13 +203,13 @@ function confirm_branch() {
     if  [[ "${FORCE}" = "1" ]] || yesno --default yes "Current branch is ${current_branch} and should be ${working_branch}, try again? [Y/n] "; then
       if [[ "${current_branch}" = "${MASTER}" ]]; then 
         [[ -f "${gitLock}" ]] && rm "${gitLock}"
-        git checkout "${working_branch}" &>> "${logFile}" #; error_check
+        git checkout "${working_branch}" &>> "${log_file}" #; error_check
       fi
     else
       clean_exit
     fi
     # Were there any conflicts checking out?
-    if grep -aq "error: Your local changes to the following files would be overwritten by checkout:" "${logFile}"; then
+    if grep -aq "error: Your local changes to the following files would be overwritten by checkout:" "${log_file}"; then
       error "There is a conflict checking out."
     else
       trace "OK"
@@ -221,9 +221,9 @@ function confirm_branch() {
 function garbage() {
   if [[ "${GARBAGE}" = "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then 
     notice "Preparing project files..."
-    git gc | tee --append "${logFile}"
+    git gc | tee --append "${log_file}"
     if [[ "${QUIET}" != "1" ]]; then
-      git gc &>> "${logFile}"
+      git gc &>> "${log_file}"
     fi
   fi
 }
@@ -232,8 +232,8 @@ function garbage() {
 function git_stats() {
   if [[ "${GITSTATS}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]] && [[ "${PUBLISH}" != "1" ]] && [[ "${APPROVE}" != "1" ]]; then
     console "Calculating..."
-    getent passwd "${USER}" | cut -d ':' -f 5 | cut -d ',' -f 1 > "${trshFile}"
-    FULLUSER=$(<"${trshFile}")
+    getent passwd "${USER}" | cut -d ':' -f 5 | cut -d ',' -f 1 > "${trash_file}"
+    FULLUSER=$(<"${trash_file}")
     git log --author="${FULLUSER}" --pretty=tformat: --numstat | \
     # The single quotes were messing with trying to line break this one
     awk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf "Your total lines of code contributed so far: %s\n(+%s added | -%s deleted)\n",loc,add,subs }' -
diff --git a/lib/git.sh b/lib/git.sh
index 1dc8556..3686ae5 100755
--- a/lib/git.sh
+++ b/lib/git.sh
@@ -19,9 +19,9 @@ function gitCommit() {
   smart_commit; empty_line
 
   # Do a dry run; check for anything to commit
-  git commit --dry-run &>> "${logFile}" 
+  git commit --dry-run &>> "${log_file}" 
 
-  if grep -aq "nothing to commit, working directory clean" "${logFile}"; then 
+  if grep -aq "nothing to commit, working directory clean" "${log_file}"; then 
     info "Nothing to commit, working directory clean."
     clean_exit
   else
@@ -77,13 +77,13 @@ function gitCommit() {
       trace "Queuing commit message"
       echo "${notes}" > "${WORKPATH}/${APP}/.queued"
     else
-      git commit -m "${notes}" &>> "${logFile}"; error_check
+      git commit -m "${notes}" &>> "${log_file}"; error_check
       trace "Commit message: ${notes}"
     fi
   fi
 
   # Check for bad characters in commit message
-  echo "${notes}" > "${trshFile}"
-  sed -i "s/\&/and/g" "${trshFile}"
-  notes=$(<$trshFile)
+  echo "${notes}" > "${trash_file}"
+  sed -i "s/\&/and/g" "${trash_file}"
+  notes=$(<$trash_file)
 }
diff --git a/lib/invoice.sh b/lib/invoice.sh
index e16ae9c..2f9b255 100755
--- a/lib/invoice.sh
+++ b/lib/invoice.sh
@@ -20,7 +20,7 @@ function create_invoice() {
   # Will create the invoice payload
   trace "Creating invoice..."
   invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\", \"cost\":${IN_ITEM_COST}, \"qty\":1}]}' -H \"X-Ninja-Token: ${IN_TOKEN}\"")
-  eval "${invoice_hack}" &>> "${logFile}"; error_check
+  eval "${invoice_hack}" &>> "${log_file}"; error_check
 
   get_current_invoice
 
@@ -32,15 +32,15 @@ function create_invoice() {
 }
 
 function get_current_invoice() {
-  "${curl_cmd}" --silent -X GET "${IN_HOST}/api/v1/clients/${IN_CLIENT_ID}?include=invoices" -H "X-Ninja-Token: ${IN_TOKEN}" > "${trshFile}"; error_check
+  "${curl_cmd}" --silent -X GET "${IN_HOST}/api/v1/clients/${IN_CLIENT_ID}?include=invoices" -H "X-Ninja-Token: ${IN_TOKEN}" > "${trash_file}"; error_check
 
   # Many sedtastic things
-  sed -i '/"invoice_number"/!d' "${trshFile}"
-  sed -i 's/ //g' "${trshFile}"
-  sed -i 's/[^0-9]*//g' "${trshFile}"
+  sed -i '/"invoice_number"/!d' "${trash_file}"
+  sed -i 's/ //g' "${trash_file}"
+  sed -i 's/[^0-9]*//g' "${trash_file}"
 
   # Store current invoice number
-  current_invoice=$(tail -1 ${trshFile})
+  current_invoice=$(tail -1 ${trash_file})
 
   trace "Invoice ${current_invoice} created"
 }
@@ -55,6 +55,6 @@ function send_invoice() {
 
   # Build out the command to send the email
   invoice_hack=$(echo "curl -X POST ${IN_HOST}/api/v1/email_invoice -d '{\"id\":${current_invoice_offset}}' -H "Content-Type:application/json" -H \"X-Ninja-Token: ${IN_TOKEN}\"")
-  eval "${invoice_hack}" &>> "${logFile}"; error_check
+  eval "${invoice_hack}" &>> "${log_file}"; error_check
   trace notime "OK"
 }
diff --git a/lib/loader.sh b/lib/loader.sh
index 17d1d66..a013eb3 100755
--- a/lib/loader.sh
+++ b/lib/loader.sh
@@ -33,22 +33,22 @@ function trace() {
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
       echo -e -n "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) ${2}"
-      echo -e -n "${TIMESTAMP} ${2}" >> "${logFile}"
+      echo -e -n "${TIMESTAMP} ${2}" >> "${log_file}"
     elif [[ "${1}" == "notime" ]]; then
       echo -e "${2}"
-      echo "${2}" >> "${logFile}"
+      echo "${2}" >> "${log_file}"
     else
       echo -e "$(tput setaf 3)${TIMESTAMP}$(tput sgr0) $*"
-      echo "${TIMESTAMP} $*" >> "${logFile}"
+      echo "${TIMESTAMP} $*" >> "${log_file}"
     fi
   else
     TIMESTAMP="$(date '+%H:%M:%S')"
     if [[ "${1}" == "status" ]]; then
-      echo -e -n "${TIMESTAMP} ${2}" >> "${logFile}"
+      echo -e -n "${TIMESTAMP} ${2}" >> "${log_file}"
     elif [[ "${1}" == "notime" ]]; then
-      echo "${2}" >> "${logFile}"
+      echo "${2}" >> "${log_file}"
     else
-      echo "${TIMESTAMP} $*" >> "${logFile}"
+      echo "${TIMESTAMP} $*" >> "${log_file}"
     fi
   fi
 }
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index fcf24c6..805d27e 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -11,7 +11,7 @@ function make_log() {
   sed -i -e '/git reset HEAD/d' \
     -e '/Checking out files:/d' \
     -e '/Unpacking objects:/d' \
-    "${logFile}"
+    "${log_file}"
 
   # Clean up stuff that has a small chance of being there
   sed -i -e '/--:--:--/d'  \
@@ -25,7 +25,7 @@ function make_log() {
     -e '/to update what/d' \
     -e '/to discard changes/d' \
     -e '/Changes not staged for/d' \
-    "${logFile}"
+    "${log_file}"
 
   # Clean up mina's goobers
   if [[ "${DEPLOY}" == *"mina"* ]]; then
@@ -35,41 +35,41 @@ function make_log() {
       -e '/0m Using this git commit/c\Using this git commit' \
       -e '/0m Cleaning up old releases/c\Cleaning up old releases' \
       -e '/0m Build finished/c\Build finished' \
-      "${logFile}"
+      "${log_file}"
 
     # Totally remove these lines
-    sed -i -e "/----->/d" "${logFile}" \
-      -e "/0m/d" "${logFile}" \
-      -e "/Resolving deltas:/d" "${logFile}" \
-      -e "/remote:/d" "${logFile}" \
-      -e "/Receiving objects:/d" "${logFile}" \
-      -e "/Resolving deltas:/d" "${logFile}" \
+    sed -i -e "/----->/d" "${log_file}" \
+      -e "/0m/d" "${log_file}" \
+      -e "/Resolving deltas:/d" "${log_file}" \
+      -e "/remote:/d" "${log_file}" \
+      -e "/Receiving objects:/d" "${log_file}" \
+      -e "/Resolving deltas:/d" "${log_file}" \
       -e "/No Kerberos credentials available/d" \
-      "${logFile}"
+      "${log_file}"
 
     # If incognito, remove this stuff for privacy
     if [[ "${INCOGNITO}" == "TRUE" ]]; then
-      sed -i "/Using cached file/d" "${logFile}"
+      sed -i "/Using cached file/d" "${log_file}"
     fi
   fi
 
   # Filter out ACF license key & wget stuff
   if [[ -n "${ACFKEY}" ]]; then
-    sed -i "s^${ACFKEY}^############^g" "${logFile}"
-    # sed -i "/........../d" "${logFile}"
+    sed -i "s^${ACFKEY}^############^g" "${log_file}"
+    # sed -i "/........../d" "${log_file}"
   fi
 
   # Filter out noise from scp deployment method
   if [[ "${DEPLOY}" == "SCP" ]]; then
-    sed -i "/Sending file modes:/d" "${logFile}"
-    sed -i "/Sink:/d" "${logFile}"
-    sed -i "/debug1:/d" "${logFile}"
+    sed -i "/Sending file modes:/d" "${log_file}"
+    sed -i "/Sink:/d" "${log_file}"
+    sed -i "/debug1:/d" "${log_file}"
   fi
 
   # Filter PHP log output as configured by user
   if [[ "${NOPHP}" == "TRUE" ]]; then
-    grep -vE "(PHP |Notice:|Warning:|Strict Standards:)" "${logFile}" > "${postFile}"
-    cat "${postFile}" > "${logFile}"
+    grep -vE "(PHP |Notice:|Warning:|Strict Standards:)" "${log_file}" > "${post_file}"
+    cat "${post_file}" > "${log_file}"
   fi
 
   # If logs should be terse, remove some more stuff
@@ -89,11 +89,11 @@ function make_log() {
       -e "/not found/d" \
       -e "/Checking for/d" \
       -e "/Continuing deploy/d" \
-      "${logFile}"
+      "${log_file}"
   fi
 
   # Remove double line breaks
-  sed -i '/^$/d' "${logFile}"
+  sed -i '/^$/d' "${log_file}"
   
   # Replace empty lines where we want
   sed -i -e '/Checking servers/s/^/\n/' \
@@ -104,7 +104,7 @@ function make_log() {
     -e '/Checking for updates/s/^/\n/' \
     -e '/The following updates/s/^/\n/' \
     -e '/installed plugins/s/^/\n/' \
-    "${logFile}"
+    "${log_file}"
 
   # Is this a publish only?
   if [[ "${PUBLISH}" == "1" ]] && [[ -z "${notes}" ]]; then   
@@ -118,21 +118,21 @@ function make_log() {
   # IF we're using HTML emails, let's get to work
   if [[ "${EMAILHTML}" == "TRUE" ]]; then
     [[ "${message_state}" != "DIGEST" ]] && build_html
-    cat "${htmlFile}" > "${trshFile}"
+    cat "${htmlFile}" > "${trash_file}"
 
     # If this is an approval email, strip out PHP
     if [[ "${message_state}" == "APPROVAL NEEDED" ]]; then 
-      sed -i '//d' "${trshFile}"
-      sed -e "s^EMAIL BUTTONS: BEGIN^EMAIL BUTTONS: BEGIN //-->^g" -i "${trshFile}"
+      sed -i '//d' "${trash_file}"
+      sed -e "s^EMAIL BUTTONS: BEGIN^EMAIL BUTTONS: BEGIN //-->^g" -i "${trash_file}"
     fi
 
     # Strip out logs if necessary
     if [[ "${SHORTEMAIL}" == "TRUE" ]]; then
-      sed -i '/LOG: BEGIN/,/LOG: END/d' "${trshFile}"
+      sed -i '/LOG: BEGIN/,/LOG: END/d' "${trash_file}"
     fi
 
     # Load the email into a variable
-    htmlSendmail=$(<"${trshFile}")
+    htmlSendmail=$(<"${trash_file}")
   fi
 
   # Create HTML/PHP logs for viewing online
@@ -215,9 +215,9 @@ function build_html() {
     fi
   fi
 
-  # Insert the full deployment logfile & button it all up
+  # Insert the full deployment log_file & button it all up
   if [[ "${REPORT}" != "1" ]]; then
-    cat "${logFile}" "${stir_path}/html/${HTMLTEMPLATE}/footer.html" >> "${htmlFile}"
+    cat "${log_file}" "${stir_path}/html/${HTMLTEMPLATE}/footer.html" >> "${htmlFile}"
     # There's probably a better place for this.
     process_html
   fi
diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index 151b23b..f07c97d 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -33,7 +33,7 @@ function mail_log() {
       ) | "${sendmail_cmd}" -t
     else
       # Compile and send text format email
-      textSendmail=$(<"${logFile}")
+      textSendmail=$(<"${log_file}")
       (
       echo "Sender: ${FROM}"
       echo "From: ${FROM} <${FROM}>"
diff --git a/lib/monitor.sh b/lib/monitor.sh
index 1f6b719..7ecd48d 100755
--- a/lib/monitor.sh
+++ b/lib/monitor.sh
@@ -53,9 +53,9 @@ function server_monitor_log() {
   # Load the password and setup the curl command
   MONITORPASS=$(<$MONITORPASS)
   MONITORAPI="${MONITORURL}?tag=serveruptime&email=${MONITORUSER}&app_password=${MONITORPASS}&server_id=${SERVERID}&HoursUnit=${MONITORHOURS}"
-  "${curl_cmd}" -s --request GET "${MONITORAPI}" -o "${trshFile}"
+  "${curl_cmd}" -s --request GET "${MONITORAPI}" -o "${trash_file}"
   # Uptime
-  UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trshFile})
+  UPTIME=$(grep -Po '"uptime":.*?[^\\]",' ${trash_file})
   UPTIME="$(cut -d ',' -f 1 <<< "${UPTIME}")"
   # Isolate the value we need
   UPTIME="$(sed 's/^[^:]*://g' <<< "${UPTIME}")"
@@ -67,7 +67,7 @@ function server_monitor_log() {
   fi
 
   # Latency
-  LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trshFile})"
+  LATENCY="$(grep -Po '"average_latency":.*?[^\\]",' ${trash_file})"
   LATENCY="$(cut -d ',' -f 1 <<< "${LATENCY}")"
   # Isolate the value we need
   LATENCY="$(sed 's/^[^:]*://g' <<< "${LATENCY}")"
diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index a561916..0eeeec8 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -29,7 +29,7 @@ function build_log() {
       notes="Marked as approved and deployed" 
     fi
 
-    echo "Commit ${COMMITHASH}: ${notes}" > "${postFile}"
+    echo "Commit ${COMMITHASH}: ${notes}" > "${post_file}"
   fi
 }
 
@@ -45,8 +45,8 @@ function mail_post() {
       return
     fi
 
-    echo "${COMMITURL}" >> "${postFile}"
-    post=$(<"${postFile}")
+    echo "${COMMITURL}" >> "${post_file}"
+    post=$(<"${post_file}")
     (
     # Is this an automated deployment?
     if [ "${AUTOMATE}" = "1" ]; then
diff --git a/lib/process-html.sh b/lib/process-html.sh
index bd79b3a..eecdb13 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -60,7 +60,7 @@ function process_html() {
     "${htmlFile}"
 
   # Insert commits
-  sed_commits=$(echo "sed -e '/{{COMMITS_RECENT}}/ {' -e 'r ${statFile}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_commits=$(echo "sed -e '/{{COMMITS_RECENT}}/ {' -e 'r ${stat_file}' -e 'd' -e '}' -i \"${htmlFile}\"")
   eval "${sed_commits}"
   
   # Insert scan results
@@ -68,7 +68,7 @@ function process_html() {
   eval "${sed_scan}"
 
   # Insert backup directory listings
-  sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trshFile}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trash_file}' -e 'd' -e '}' -i \"${htmlFile}\"")
   eval "${sed_backup}"
 
   # RSS news
diff --git a/lib/quit.sh b/lib/quit.sh
index 982e95d..bbdbf4f 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -76,7 +76,7 @@ function clean_up() {
   # If anything is stashed, unstash it.
   if [[ "${current_stash}" == "1" ]]; then
     trace "Unstashing files"
-    git stash pop >> "${logFile}"
+    git stash pop >> "${log_file}"
     current_stash="0"
   fi  
 
@@ -87,13 +87,13 @@ function clean_up() {
   if [[ -n "${start_branch}" ]]; then
     current_branch="$(git rev-parse --abbrev-ref HEAD)"
     if [[ "${current_branch}" != "${start_branch}" ]]; then
-      git checkout "${start_branch}" &>> "${logFile}" &
+      git checkout "${start_branch}" &>> "${log_file}" &
     fi
   fi
 
   # If Wordfence was an issue, restart the plugin
   if [[ "${WFOFF}" = "1" ]]; then
-    "${wp_cmd}" plugin activate --no-color wordfence &>> $logFile; error_check
+    "${wp_cmd}" plugin activate --no-color wordfence &>> $log_file; error_check
   fi
 
   # Was this an approval?
diff --git a/lib/report.sh b/lib/report.sh
index 9fb8dfb..4ea160f 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -50,19 +50,19 @@ function create_report() {
     if [[ "${INCLUDEHOSTING}" == "TRUE" ]]; then
       INCLUDEHOSTING="Web hosting for the month of ${last_month}"
     fi
-    echo "
${TASK}X
${INCLUDEHOSTING}
${TASK}X
${INCLUDEHOSTING}
%hX
%s
%hX
%s
%hX
%s
> "${logFile}"; error_check;
+    "${sshpass_cmd}" -p "${SCP_DEPLOY_PASS}" scp -o StrictHostKeyChecking=no -P "${SCP_DEPLOY_PORT}" -r -v "${WORKPATH}/${APP}/${STAGING_DEPLOY_PATH}"/* "${SCP_DEPLOY_USER}@${PRODUCTION_DEPLOY_HOST}:${PRODUCTION_DEPLOY_PATH}/"  &>> "${log_file}"; error_check;
 
     # Checkout master and move on
     checkout "${MASTER}"
diff --git a/lib/slack.sh b/lib/slack.sh
index 1d44a70..b36e640 100755
--- a/lib/slack.sh
+++ b/lib/slack.sh
@@ -83,7 +83,7 @@ function post_slack () {
     fi    
   fi
 
-  # Add a details link to online logfiles if they exist
+  # Add a details link to online log_files if they exist
   if [[ -n "${REMOTEURL}" ]] && [[ -n "${REMOTELOG}" ]] && [[ "${CREATE_INVOICE}" != "1" ]] && [[ -n "${LOGURL}" ]]; then
     slack_message="${slack_message} (<${LOGURL}|Details>)"
   fi
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index 34e737f..fe0ace6 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -9,24 +9,24 @@
 # Constructing smart *cough* commit messages
 function smart_commit() {
   if [[ "${SMARTCOMMIT}" == "TRUE" ]]; then 
-    PCA=$("${wc_cmd}" -l < "${wpFile}")
+    PCA=$("${wc_cmd}" -l < "${wp_file}")
 
     if [[ "${UPDATE_ACF}" == "1" ]]; then
       PCA=$((PCA+1))
     fi
 
-    if [[ "${PCA}" -gt "0" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wpFile}" ]]; then
+    if [[ "${PCA}" -gt "0" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wp_file}" ]]; then
       trace "Building commit message"
 
       if [[ "${PCA}" == "0" ]] && [[ -z "${ACFFILE}" ]]; then
         trace "No plugin updates"
       else
         # Get this thing ready; first remove the leading spaces 
-        awk '{print $1, $2}' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+        awk '{print $1, $2}' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
         # Add commas between the plugins with this
-        sed ':a;N;$!ba;s/\n/, /g' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+        sed ':a;N;$!ba;s/\n/, /g' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
         # Replace current commit message with plugin update info 
-        PLUGINS=$(<"${wpFile}")
+        PLUGINS=$(<"${wp_file}")
 
         # This whole thing is just so ugly
         if [[ "${UPDATE_ACF}" == "1" ]]; then
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 814a845..904f262 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -59,7 +59,7 @@ function project_stats() {
    
     # Get commits
     get_commits 6
-    validate_urls "${statFile}"
+    validate_urls "${stat_file}"
 
     # Process the HTML
     cat "${stir_path}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}"
@@ -97,7 +97,7 @@ function project_activity() {
   # Grab the total number of commits
   TOTAL_COMMITS=$(git rev-list --count ${MASTER})
   get_commits "${TOTAL_COMMITS}"
-  validate_urls "${statFile}"
+  validate_urls "${stat_file}"
 
   # Process the HTML
   cat "${stir_path}/html/${HTMLTEMPLATE}/stats/activity.html" > "${htmlFile}"
@@ -160,14 +160,14 @@ function project_css() {
 
 function project_backup() {
   # Get file directory
-  #echo "${BACKUP_FILES}" > "${trshFile}"
+  #echo "${BACKUP_FILES}" > "${trash_file}"
 
-  echo "${BACKUP_FILES}" | grep -Po '"path_display":.*?[^\\]",' > "${trshFile}"
-  sed -i 's/\"path_display\": \"//g' "${trshFile}"
-  sed -i 's/\",//g' "${trshFile}"
-  sed -i 's/$/
/' "${trshFile}"
-  BACKUP_FILES=$(tac ${trshFile})
-  echo "${BACKUP_FILES}" > "${trshFile}"
+  echo "${BACKUP_FILES}" | grep -Po '"path_display":.*?[^\\]",' > "${trash_file}"
+  sed -i 's/\"path_display\": \"//g' "${trash_file}"
+  sed -i 's/\",//g' "${trash_file}"
+  sed -i 's/$/
/' "${trash_file}"
+  BACKUP_FILES=$(tac ${trash_file})
+  echo "${BACKUP_FILES}" > "${trash_file}"
 
   # Process the HTML
   cat "${stir_path}/html/${HTMLTEMPLATE}/stats/backup.html" > "${htmlFile}"
@@ -185,22 +185,22 @@ function check_backup() {
     --header "Content-Type: application/json" \
     --data "{\"path\": \"${DB_BACKUP_PATH}\",\"recursive\": false,
       \"include_media_info\": false,\"include_deleted\": false,
-      \"include_has_explicit_shared_members\": false}" > "${trshFile}"
+      \"include_has_explicit_shared_members\": false}" > "${trash_file}"
 
     # Check for what we might assume is error output
-    if [[ $(grep -a "error" "${trshFile}") ]]; then
+    if [[ $(grep -a "error" "${trash_file}") ]]; then
       warning "Error in backup configuration"
       return
     fi
 
     # Store file list for later
-    BACKUP_FILES="$(<${trshFile})" 
+    BACKUP_FILES="$(<${trash_file})" 
 
     # Start the loop
     for i in $(seq 0 365)
       do 
       var="$(date -d "${i} day ago" +"%Y-%m-%d")"
-      if [[ $(grep -a "${var}" "${trshFile}") ]]; then
+      if [[ $(grep -a "${var}" "${trash_file}") ]]; then
         # Assume success
         BACKUP_STATUS="${SUCCESSC}"
         BACKUP_BTN="btn-success"
@@ -232,21 +232,21 @@ function check_backup() {
 
 # Usage: get_commits [number of commits]
 function get_commits() {
-  git log -n $1 --pretty=format:"%n
\"%aN\"%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s

" > "${statFile}"
-  sed -i '/^commit/ s/$/ <\/strong>
/' "${statFile}"
-  sed -i '/^Author:/ s/$/ 
/' "${statFile}"
-  sed -i '/^Date:/ s/$/ 

/' "${statFile}"
+  git log -n $1 --pretty=format:"%n
\"%aN\"%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s

" > "${stat_file}"
+  sed -i '/^commit/ s/$/ <\/strong>
/' "${stat_file}"
+  sed -i '/^Author:/ s/$/ 
/' "${stat_file}"
+  sed -i '/^Date:/ s/$/ 

/' "${stat_file}"
 }
 
 # Usage: url_check [source file]
 function validate_urls() {
-  grep -oP "(?<=href=\")[^\"]+(?=\")" $1 > "${trshFile}"
+  grep -oP "(?<=href=\")[^\"]+(?=\")" $1 > "${trash_file}"
   while read URL; do
     CODE=$(${curl_cmd} -o /dev/null --silent --head --write-out '%{http_code}' "$URL")
     if [[ "${CODE}" != "200" ]]; then 
-      sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${statFile}"
+      sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${stat_file}"
     fi
-  done < "${trshFile}"
+  done < "${trash_file}"
 }
 
 function assign_nav() {
diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh
index 454516d..9993f9e 100755
--- a/lib/wp-acf.sh
+++ b/lib/wp-acf.sh
@@ -14,14 +14,14 @@ function acf_update() {
   ACFFILE="/tmp/acfpro.zip"
   trace status "Updating ACF Pro... "
 	# Download the ACF Pro upgrade file
-	"${wget_cmd}" --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${logFile}"; error_check
+	"${wget_cmd}" --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${log_file}"; error_check
 
 	# Check file integrity
 	acf_filecheck
 
 	# Proceed with install
-	"${wp_cmd}" plugin delete --no-color advanced-custom-fields-pro &>> "${logFile}"
-	"${wp_cmd}" plugin install --no-color "${ACFFILE}" &>> "${logFile}"
+	"${wp_cmd}" plugin delete --no-color advanced-custom-fields-pro &>> "${log_file}"
+	"${wp_cmd}" plugin install --no-color "${ACFFILE}" &>> "${log_file}"
 	rm "${ACFFILE}"
   trace notime "OK"
 }
diff --git a/lib/wp-clone.sh b/lib/wp-clone.sh
index 994e3ae..42f8e41 100755
--- a/lib/wp-clone.sh
+++ b/lib/wp-clone.sh
@@ -70,7 +70,7 @@ function wp_clone() {
   fi
 
   # Copy plugins that are not part of repo (for update checking)
-  # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${logFile}";
+  # cp -nrp "${WP_PATH}/plugins" "${WP_TMP}/" &>> "${log_file}";
 
   # Reset our root working directory
   # APP_PATH="${WORKPATH}/${REPO}"
@@ -177,7 +177,7 @@ function wp_clone() {
       "${wp_cmd}" plugin is-active "${i}" #2>&1
       EXITCODE=$?; 
       if [[ "${EXITCODE}" -ne "0" ]]; then
-        "${wp_cmd}" plugin activate "${i}" >> "${logFile}" 2>&1
+        "${wp_cmd}" plugin activate "${i}" >> "${log_file}" 2>&1
       fi
     done
     trace notime "OK"
@@ -199,7 +199,7 @@ function create_env() {
         REMOVE_ME=".example"
       fi
       dest="$(printf '%s\n' ${arg//$REMOVE_ME/})"
-      cp "${arg}" "${dest}" &>> "${logFile}"
+      cp "${arg}" "${dest}" &>> "${log_file}"
       SET_ENV="1"
       env_file="${dest}"
     fi
diff --git a/lib/wp-core.sh b/lib/wp-core.sh
index c1fb10d..a672eb3 100755
--- a/lib/wp-core.sh
+++ b/lib/wp-core.sh
@@ -10,30 +10,30 @@ function wp_core() {
   # There's a little bug when certain plugins are spitting errors; work around 
   # seems to be to check for core updates a second time
   cd "${APP_PATH}"/"${WPROOT}"; \
-  "${wp_cmd}" core check-update --no-color &>> "${logFile}"
-  if grep -aq 'WordPress is at the latest version.' "${logFile}"; then
+  "${wp_cmd}" core check-update --no-color &>> "${log_file}"
+  if grep -aq 'WordPress is at the latest version.' "${log_file}"; then
     info "Wordpress core is up to date."; UPD2="1"
   else
     sleep 1
     # Get files setup for smart commit
-    "${wp_cmd}" core check-update --no-color &> "${coreFile}"
+    "${wp_cmd}" core check-update --no-color &> "${core_file}"
     
     # Strip out any randomly occuring debugging output
-    grep -vE 'Notice:|Warning:|Strict Standards:|PHP' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
+    grep -vE 'Notice:|Warning:|Strict Standards:|PHP' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}";
     
     # Clean out the gobbleygook from wp-cli
-    sed 's/[+|-]//g' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
-    cat "${coreFile}" | awk 'FNR == 1 {next} {print $1}' > "${trshFile}" && mv "${trshFile}" "${coreFile}";
+    sed 's/[+|-]//g' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}";
+    cat "${core_file}" | awk 'FNR == 1 {next} {print $1}' > "${trash_file}" && mv "${trash_file}" "${core_file}";
     
     # Just in case, try to remove all blank lines. DOS formatting is 
     # messing up output with PHP crap
-    sed '/^\s*$/d' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}";
+    sed '/^\s*$/d' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}";
     
     # Remove line breaks, value should noe equal 'version x.x.x' or some such.
-    sed ':a;N;$!ba;s/\n/ /g' "${coreFile}" > "${trshFile}" && mv "${trshFile}" "${coreFile}"
+    sed ':a;N;$!ba;s/\n/ /g' "${core_file}" > "${trash_file}" && mv "${trash_file}" "${core_file}"
     # Remove everything up to and including the first space (in case of multiple core updates)
-    sed -i 's/[^ ]* //' "${coreFile}"
-    COREUPD=$(<$coreFile)
+    sed -i 's/[^ ]* //' "${core_file}"
+    COREUPD=$(<$core_file)
 
     if [[ -n "${COREUPD}" ]]; then
       # Update available!  \o/
@@ -47,10 +47,10 @@ function wp_core() {
           # Execute the update
           info "Core update found, updating to ${COREUPD}"
           trace "Executing ${composer_cmd} update johnpbloch/wordpress-core"
-          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${logFile}" &
+          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${log_file}" &
           spinner $!
         else
-          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${logFile}"
+          "${composer_cmd}" --no-progress update johnpbloch/wordpress-core &>> "${log_file}"
         fi
         cd "${WP_PATH}"; \
 
@@ -61,17 +61,17 @@ function wp_core() {
         if [[ "${FORCE}" = "1" ]] || yesno --default no "A new version of Wordpress is available (${COREUPD}), update? [y/N] "; then
           cd "${APP_PATH}/${WPROOT}"; \
           if [[ "${QUIET}" != "1" ]]; then
-            "${wp_cmd}" core update --no-color &>> "${logFile}" &
+            "${wp_cmd}" core update --no-color &>> "${log_file}" &
             spinner $!
           else
-            "${wp_cmd}" core update --no-color &>> "${logFile}"
+            "${wp_cmd}" core update --no-color &>> "${log_file}"
           fi
 
           # Double check upgrade was successful if we still see 
           # 'version' in the output, we must have missed the upgrade 
           # somehow
-          "${wp_cmd}" core check-update --quiet --no-color &> "${trshFile}"
-          if grep -aq "version" "${trshFile}"; then
+          "${wp_cmd}" core check-update --quiet --no-color &> "${trash_file}"
+          if grep -aq "version" "${trash_file}"; then
             error "Core update failed.";
           else
             sleep 1
diff --git a/lib/wp-plugins.sh b/lib/wp-plugins.sh
index 628d6e4..33a5243 100755
--- a/lib/wp-plugins.sh
+++ b/lib/wp-plugins.sh
@@ -11,29 +11,29 @@ function wp_plugins() {
   info "The following updates are available:"
   # Clean the garbage out of the log for console display
   # This is all going to be rewritten
-  sed 's/[+|]//g' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
-  sed '/^\s*$/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed 's/[+|]//g' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
+  sed '/^\s*$/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Remove lines with multiple sequential hyphens
-  sed '/--/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed '/--/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Remove the column label row
-  sed '1,/update_version/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed '1,/update_version/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Remove everything left but the first and fourth "words"
-  awk '{print "  " $1,$4}' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  awk '{print "  " $1,$4}' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Work around the weird "Available" bug
-  sed '/Available/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
+  sed '/Available/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
   # Work around for the odd "REQUEST:" occuring
-  sed '/REQUEST:/d' "${wpFile}" > "${trshFile}" && mv "${trshFile}" "${wpFile}";
-  cat "${wpFile}" >> "${logFile}"
+  sed '/REQUEST:/d' "${wp_file}" > "${trash_file}" && mv "${trash_file}" "${wp_file}";
+  cat "${wp_file}" >> "${log_file}"
 
   # Display plugin list
   if [[ "${QUIET}" != "1" ]]; then
-    cat "${wpFile}"; empty_line
+    cat "${wp_file}"; empty_line
   fi
 
   if [[ "${FORCE}" = "1" ]] || yesno --default no "Proceed with updates? [y/N] "; then
     # If ACFPRO needs an update, do it first via wget
     if [[ "${ACF_LOCK}" != "TRUE" ]]; then
-      if grep -aq "advanced-custom-fields-pro" "${wpFile}"; then
+      if grep -aq "advanced-custom-fields-pro" "${wp_file}"; then
         if [[ "${QUIET}" != "1" ]]; then
           acf_update &
         spinner $!
@@ -48,30 +48,30 @@ function wp_plugins() {
       trace "Found composer.json, updating"
       cd "${APP_PATH}"; \
       if [[ "${QUIET}" != "1" ]]; then
-        "${composer_cmd}" --no-progress update &>> "${logFile}" &
+        "${composer_cmd}" --no-progress update &>> "${log_file}" &
         spinner $!
       else
-        "${composer_cmd}" --no-progress update &>> "${logFile}"
+        "${composer_cmd}" --no-progress update &>> "${log_file}"
       fi
       cd "${WP_PATH}"; \
     fi
 
     # Now, run the rest of the needed updates via wp-cli
     if [[ "${QUIET}" != "1" ]]; then
-      "${wp_cmd}" plugin update --all --no-color &>> "${logFile}" &
+      "${wp_cmd}" plugin update --all --no-color &>> "${log_file}" &
       spinner $!
     else
-      "${wp_cmd}" plugin update --all --no-color &>> "${logFile}" 
+      "${wp_cmd}" plugin update --all --no-color &>> "${log_file}" 
     fi  
 
     # Any problems with plugin updates?
-    if grep -aq 'Warning: The update cannot be installed because we will be unable to copy some files.' "${logFile}"; then
+    if grep -aq 'Warning: The update cannot be installed because we will be unable to copy some files.' "${log_file}"; then
       error "One or more plugin updates have failed, probably due to problems with permissions."
-    elif grep -aq "Plugin update failed." "${logFile}"; then
+    elif grep -aq "Plugin update failed." "${log_file}"; then
       error "One or more plugin updates have failed."
-    elif grep -aq 'Warning: Update package not available.' "${logFile}"; then
+    elif grep -aq 'Warning: Update package not available.' "${log_file}"; then
       error "One or more update packages are not available. \nThis is often be caused by commercial plugins; check your log files."
-    elif grep -aq 'Error: Updated' "${logFile}"; then
+    elif grep -aq 'Error: Updated' "${log_file}"; then
       error "One or more plugin updates have failed."
     fi
 
diff --git a/lib/wp-wordfence.sh b/lib/wp-wordfence.sh
index a08c251..aa81a01 100755
--- a/lib/wp-wordfence.sh
+++ b/lib/wp-wordfence.sh
@@ -16,14 +16,14 @@ function wf_check() {
         error "Deployment can not continue while Wordfence firewall is enabled."
       else
         if yesno --default yes "Attempt to repair files? (sudo required) [Y/n] "; then
-          "${wp_cmd}" plugin deactivate --no-color wordfence &>> "${logFile}"; WFOFF="1"
-          sudo rm -rf "${WORKPATH}/${APP}${WPROOT}${WPAPP}/wflogs" &>> $logFile
+          "${wp_cmd}" plugin deactivate --no-color wordfence &>> "${log_file}"; WFOFF="1"
+          sudo rm -rf "${WORKPATH}/${APP}${WPROOT}${WPAPP}/wflogs" &>> $log_file
           # Remove from repo history, in case .gitignore doesn't have them excluded
           if ! grep -aq "wflog" "${WORKPATH}/${APP}/.gitignore"; then
             cd "${WORKPATH}"/"${APP}"; \
-            git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch ${WPROOT}${WPAPP}/wflogs > /dev/null" HEAD &>> "${logFile}" &
+            git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch ${WPROOT}${WPAPP}/wflogs > /dev/null" HEAD &>> "${log_file}" &
             spinner $!
-            rm -rf .git/refs/original/ && git reflog expire --all &&  git gc --aggressive --prune &>> "${logFile}" &
+            rm -rf .git/refs/original/ && git reflog expire --all &&  git gc --aggressive --prune &>> "${log_file}" &
             spinner $!
             cd "${WORKPATH}"/"${APP}${WPROOT}"; \
           fi
diff --git a/lib/wp.sh b/lib/wp.sh
index 5d71205..118c371 100755
--- a/lib/wp.sh
+++ b/lib/wp.sh
@@ -40,17 +40,17 @@ function wp() {
         wp_update_check &
         spinner $!
       else
-        "${wp_cmd}" plugin status --no-color >> "${logFile}"
-        "${wp_cmd}" plugin update --dry-run --no-color --all > "${wpFile}"
+        "${wp_cmd}" plugin status --no-color >> "${log_file}"
+        "${wp_cmd}" plugin update --dry-run --no-color --all > "${wp_file}"
       fi
 
       # Check the logs
-      #if grep -aq "U = Update Available" "${logFile}"; then
-      if grep -aq "Available plugin updates:" "${wpFile}"; then    
+      #if grep -aq "U = Update Available" "${log_file}"; then
+      if grep -aq "Available plugin updates:" "${wp_file}"; then    
         wp_plugins
       else
         # Was there a database glitch?
-        if grep -aq 'plugins can not be updated' "${wpFile}"; then
+        if grep -aq 'plugins can not be updated' "${wp_file}"; then
           sleep 1
         else
           info "Plugins are up to date."; UPD1="1"
@@ -69,11 +69,11 @@ function wp() {
 function wp_update_check() {
   "${wp_cmd}" cache delete &>> /dev/null
 
-  # For the logfile
-  "${wp_cmd}" plugin status --no-color &>> $logFile
+  # For the log_file
+  "${wp_cmd}" plugin status --no-color &>> $log_file
 
   # For the console/smart commit message
-  "${wp_cmd}" plugin update --dry-run --no-color --all &> "${wpFile}"
+  "${wp_cmd}" plugin update --dry-run --no-color --all &> "${wp_file}"
 
   # Other options, thanks Corey
   # wp plugin list --format=csv --all --fields=name,update_version,update | grep -a 'available'
@@ -99,7 +99,7 @@ function wp_check() {
       "${wp_cmd}" db check &>> /dev/null; EXITCODE=$?; 
       
       if [[ "${EXITCODE}" != "0" ]]; then 
-        "${wp_cmd}" db check &>> "${logFile}"; 
+        "${wp_cmd}" db check &>> "${log_file}"; 
         trace notime "FAIL"
         if [[ "${AUTOMATE}" == "1" ]]; then
           error "There is a problem with your Wordpress installation, check your configuration."
@@ -109,7 +109,7 @@ function wp_check() {
       else
         # Get info
         trace notime "OK"
-        "${wp_cmd}" core version --extra  &>> "${logFile}";
+        "${wp_cmd}" core version --extra  &>> "${log_file}";
       fi
     else
       WP_PATH="FALSE"
@@ -122,7 +122,7 @@ function wp_server_check {
   # "${wp_cmd}" server --host=localhost > /dev/null 2>&1; EXITCODE=$?; 
   # if [[ "${EXITCODE}" -eq "0" ]]; then
     # trace "Launching server"
-    # "${wp_cmd}" server --host=localhost >> "${logFile}" 2>&1 &
+    # "${wp_cmd}" server --host=localhost >> "${log_file}" 2>&1 &
     # Keep checking for server to come online
     # until $(${curl_cmd} --output /dev/null --silent --head --fail http://localhost:8080); do
     #   sleep 1
@@ -130,11 +130,11 @@ function wp_server_check {
   # fi
 
   trace "Activating plugins"
-  "${wp_cmd}" plugin activate --all >> "${logFile}" 2>&1
+  "${wp_cmd}" plugin activate --all >> "${log_file}" 2>&1
   # trace "Activating theme"
-  # "${wp_cmd}" theme activate site >> "${logFile}" 2>&1
+  # "${wp_cmd}" theme activate site >> "${log_file}" 2>&1
   
-  #"${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${logFile}" 2>&1
+  #"${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" >> "${log_file}" 2>&1
   
   #if [[ -z "$(${curl_cmd} -sL localhost:8080 | grep -E "Warning:|Fatal:")" ]]; then
   #if "${curl_cmd}" -sL localhost:8080 | grep -E "Warning:|Fatal:" > /dev/null; then
diff --git a/stir.sh b/stir.sh
index 195ddae..b20a721 100755
--- a/stir.sh
+++ b/stir.sh
@@ -45,8 +45,8 @@ function init_startup() {
 
 # Temp files
 function init_temp() {
-  var=(logFile wpFile coreFile postFile trshFile scanFile statFile \
-    urlFile)
+  var=(log_file wp_file core_file post_file trash_file scan_file stat_file \
+    url_file)
   init_loop
 }
 
@@ -78,8 +78,8 @@ function init_env() {
 
 # Internal variables
 function init_internal() {
-  var=(optstring options logFile wpFile coreFile postFile trshFile statFile \
-  urlFile htmlFile htmlSendmail htmlEmail clientEmail textSendmail stir_path \
+  var=(optstring options log_file wp_file core_file post_file trash_file stat_file \
+  url_file htmlFile htmlSendmail htmlEmail clientEmail textSendmail stir_path \
   etc_path lib_path POSTEMAIL current_branch error_msg notes \
   UPDCORE TASKLOG PCA PCB PCC PCD PLUGINS slack_icon APPRC USERRC message_state \
   COMMITURL COMMITHASH UPD1 UPD2 UPDATE gitLock AUTOMERGE MERGE EXITCODE \
@@ -120,9 +120,9 @@ function temp_files() {
     exit 78
   else
   # Setup tempfile list
-  file=(trshFile postFile statFile scanFile scan_html wpFile \
-    urlFile htmlFile htmlEmail clientEmail coreFile statDir avatarDir \
-    stats logFile)
+  file=(trash_file post_file stat_file scan_file scan_html wp_file \
+    url_file htmlFile htmlEmail clientEmail core_file statDir avatarDir \
+    stats log_file)
 
     # Start the loop
     if [[ "${1}" == "remove" ]]; then
@@ -326,7 +326,7 @@ if [[ "${CURRENT}" == "1" ]]; then
   APP="${PWD##*/}"
 fi
 
-# Get the active switches for display in logfiles
+# Get the active switches for display in log_files
 [[ "${AUTOMATE}" == "1" ]] && STARTUP="${STARTUP} --automate"
 [[ "${UPGRADE}" == "1" ]] && STARTUP="${STARTUP} --update"
 [[ "${APPROVE}" == "1" ]] && STARTUP="${STARTUP} --approve" #; FORCE="1"
@@ -429,14 +429,14 @@ temp_files create
 
 # Fire up temporary log files. Consolidate this shit better someday, geez.
 # Main log file
-#logFile="/tmp/${APP}.log-$RANDOM.log"
-#(umask 077 && touch "${logFile}") || log_fail
-#wpFile="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wpFile}" &> /dev/null) || log_fail
-#coreFile="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${coreFile}" &> /dev/null) || log_fail
+#log_file="/tmp/${APP}.log-$RANDOM.log"
+#(umask 077 && touch "${log_file}") || log_fail
+#wp_file="/tmp/${APP}.wp-$RANDOM.log"; (umask 077 && touch "${wp_file}" &> /dev/null) || log_fail
+#core_file="/tmp/${APP}.core-$RANDOM.log"; (umask 077 && touch "${core_file}" &> /dev/null) || log_fail
 
-# Start writing the logfile
-echo -e "Activity logfile for ${APP^^} - ${NOW}\r" >> "${logFile}"
-echo -e "Launching stir${STARTUP}\n" >> "${logFile}"
+# Start writing the log_file
+echo -e "Activity log_file for ${APP^^} - ${NOW}\r" >> "${log_file}"
+echo -e "Launching stir${STARTUP}\n" >> "${log_file}"
 
 # Function list
 if [[ "${FUNCTION_LIST}" == "1" ]]; then
@@ -555,7 +555,7 @@ fi
 
 # General info
 if [[ "${INCOGNITO}" != "TRUE" ]]; then
-  trace "Log file is ${logFile}"
+  trace "Log file is ${log_file}"
   trace "Project workpath is ${WORKPATH}"
 fi
 

From 5089d1b528149bed15d7e667130f54368809832e Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Thu, 24 Sep 2020 20:53:46 -0700
Subject: [PATCH 308/334] Updated the rest of the variables in temp_files()

---
 lib/analytics.sh    | 18 +++++++-------
 lib/digest.sh       | 10 ++++----
 lib/log-handling.sh | 14 +++++------
 lib/post-log.sh     | 36 ++++++++++++++--------------
 lib/process-html.sh | 58 ++++++++++++++++++++++-----------------------
 lib/report.sh       |  2 +-
 lib/scan.sh         |  6 ++---
 lib/statistics.sh   | 52 ++++++++++++++++++++--------------------
 stir.sh             |  6 ++---
 9 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/lib/analytics.sh b/lib/analytics.sh
index 24e08bf..85e64b7 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -193,8 +193,8 @@ function ga_over_time() {
     fi
 
     # Make sure temp directory exists
-    if [[ ! -d "${statDir}" ]]; then
-      umask 077 && mkdir ${statDir} &> /dev/null
+    if [[ ! -d "${stat_dir}" ]]; then
+      umask 077 && mkdir ${stat_dir} &> /dev/null
     fi
     
     # Setup variables
@@ -262,11 +262,11 @@ function ga_over_time() {
         sed -i -e "s^{{$1_$n}}^${!var}^g" \
           -e "s^{{$1_percent_$n}}^${var_percent}^g" \
           -e "s^{{$1_date_$n}}^${this_day}^g" \
-          "${htmlFile}"
+          "${html_file}"
       fi    
     done
 
-    tac "${trash_file}" > ${statDir}/"${METRIC}".csv
+    tac "${trash_file}" > ${stat_dir}/"${METRIC}".csv
 
     ${gnuplot_cmd} -p << EOF
     set encoding utf8
@@ -277,7 +277,7 @@ function ga_over_time() {
     default = "${DEFAULTC}";
     set key off
     set datafile separator ","
-    set output '${statDir}/${METRIC}.png'
+    set output '${stat_dir}/${METRIC}.png'
     set boxwidth 0.5
     set style fill transparent solid 0.1 noborder
     set samples 1000
@@ -291,14 +291,14 @@ function ga_over_time() {
     
     # PNG
     set terminal png enhanced size 1280,600
-    set output '${statDir}/${METRIC}.png'
-    plot '${statDir}/${METRIC}.csv' using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info,\
+    set output '${stat_dir}/${METRIC}.png'
+    plot '${stat_dir}/${METRIC}.csv' using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info,\
       "" using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3
 
     # SVG
     set terminal svg dynamic enhanced size 1280,600
-    set output '${statDir}/${METRIC}.svg'
-    plot '${statDir}/${METRIC}.csv' using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info,\
+    set output '${stat_dir}/${METRIC}.svg'
+    plot '${stat_dir}/${METRIC}.csv' using 2:xtic(1) smooth bezier with lines lw 2 lc rgb info,\
       "" using 2:xtic(1) with linespoints lw 3 lc rgb primary pointtype 7 pointsize 3
 EOF
 fi
diff --git a/lib/digest.sh b/lib/digest.sh
index a99f099..f1cf94b 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -30,7 +30,7 @@ function get_avatars() {
       #if [[ ! -d "/tmp/avatar" ]]; then
       #  umask 077 && mkdir /tmp/avatar &> /dev/null
       #fi
-      IMGFILE="${avatarDir}/${AUTHORNAME}.png"
+      IMGFILE="${avatar_dir}/${AUTHORNAME}.png"
     fi
     "${curl_cmd}" -fso "${IMGFILE}" "${GRAVATAR}"; dot
   done 
@@ -75,7 +75,7 @@ function create_digest() {
         fi
       done < "${trash_file}"
 
-      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${htmlFile}"; dot
+      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${html_file}"; dot
 
       # Randomize a positive Monday thought. Special characters must be escaped 
       # and use character codes
@@ -93,15 +93,15 @@ function create_digest() {
 
       # Strip out useless analytics results
       if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
-        sed -i '/ANALYTICS/d' "${htmlFile}"
+        sed -i '/ANALYTICS/d' "${html_file}"
       # else
         if [[ "${METRIC}" == "hits" ]] && [[ "${RESULT}" -lt "499" ]]; then
-          sed -i '/ANALYTICS/d' "${htmlFile}"
+          sed -i '/ANALYTICS/d' "${html_file}"
         fi
       fi   
 
       # Get the email payload ready
-      digestSendmail=$(<"${htmlFile}")
+      digestSendmail=$(<"${html_file}")
     else
       console "No activity found, canceling digest."
       clean_exit
diff --git a/lib/log-handling.sh b/lib/log-handling.sh
index 805d27e..000973f 100755
--- a/lib/log-handling.sh
+++ b/lib/log-handling.sh
@@ -118,7 +118,7 @@ function make_log() {
   # IF we're using HTML emails, let's get to work
   if [[ "${EMAILHTML}" == "TRUE" ]]; then
     [[ "${message_state}" != "DIGEST" ]] && build_html
-    cat "${htmlFile}" > "${trash_file}"
+    cat "${html_file}" > "${trash_file}"
 
     # If this is an approval email, strip out PHP
     if [[ "${message_state}" == "APPROVAL NEEDED" ]]; then 
@@ -147,7 +147,7 @@ function make_log() {
     # build_html
 
     # Strip out the buttons that self-link
-    sed -e "s^// BUTTON: BEGIN //-->^BUTTON HIDE^g" -i "${htmlFile}"
+    sed -e "s^// BUTTON: BEGIN //-->^BUTTON HIDE^g" -i "${html_file}"
     post_log
   fi
 }
@@ -161,7 +161,7 @@ function build_html() {
     notes="${error_msg}"
     LOGTITLE="Deployment Error"
     # Create the header
-    cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/error.html" > "${htmlFile}"
+    cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/error.html" > "${html_file}"
   else
     # Does this project need to be approved before finalizing deployment?
     #if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${DIGEST}" != "1" ]] && [[ -f "${WORKPATH}/${APP}/.queued" ]]; then
@@ -169,8 +169,8 @@ function build_html() {
       message_state="APPROVAL NEEDED"
       LOGTITLE="Approval Needed"
       LOGSUFFIX="php"
-      # cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/approve.html" > "${htmlFile}"
-      cat "${stir_path}/html/${HTMLTEMPLATE}/approval.php" > "${htmlFile}"
+      # cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/approve.html" > "${html_file}"
+      cat "${stir_path}/html/${HTMLTEMPLATE}/approval.php" > "${html_file}"
     else
       if [[ "${AUTOMATE}" == "1" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${UPD1}" == "1" ]] && [[ "${UPD2}" == "1" ]]; then
         message_state="NOTICE"
@@ -190,7 +190,7 @@ function build_html() {
         if [[ "${REPAIR}" == "1" ]] && [[ -z "${notes}" ]]; then
           notes="Merged and deployed codebase"
         fi
-        cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/success.html" > "${htmlFile}"
+        cat "${stir_path}/html/${HTMLTEMPLATE}/header.html" "${stir_path}/html/${HTMLTEMPLATE}/success.html" > "${html_file}"
       fi
     fi
   fi
@@ -217,7 +217,7 @@ function build_html() {
 
   # Insert the full deployment log_file & button it all up
   if [[ "${REPORT}" != "1" ]]; then
-    cat "${log_file}" "${stir_path}/html/${HTMLTEMPLATE}/footer.html" >> "${htmlFile}"
+    cat "${log_file}" "${stir_path}/html/${HTMLTEMPLATE}/footer.html" >> "${html_file}"
     # There's probably a better place for this.
     process_html
   fi
diff --git a/lib/post-log.sh b/lib/post-log.sh
index ceb7208..524dd99 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -15,21 +15,21 @@ function post_log() {
   if [[ "${REMOTELOG}" == "TRUE" ]]; then
 
     # Post to localhost by simply copying files
-    if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -n "${LOCALHOSTPATH}" ]] && [[ -f "${htmlFile}" ]]; then
+    if [[ "${LOCALHOSTPOST}" == "TRUE" ]] && [[ -n "${LOCALHOSTPATH}" ]] && [[ -f "${html_file}" ]]; then
       
       # Check that directory exists
       html_dir
 
       # Post the file   
       if [[ -n "${REMOTEFILE}" ]] && [[ "${REPORT}" != "1" ]]; then #&& [[ -n "${COMMITHASH}" ]]; then
-        cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
+        cp "${html_file}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
         chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
       fi
 
       # Post the digest
       if [[ "${DIGEST}" == "1" ]]; then
         REMOTEFILE="digest-${EPOCH}.html"
-        cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
+        cp "${html_file}" "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}"
         chmod a+rw "${LOCALHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
         DIGESTURL="${REMOTEURL}/${APP}/${REMOTEFILE}"
       fi
@@ -37,7 +37,7 @@ function post_log() {
       # Post the report
       if [[ "${REPORT}" == "1" ]]; then
         REMOTEFILE="${EPOCH}.php"
-        cp "${htmlFile}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}"
+        cp "${html_file}" "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}"
         chmod a+rw "${LOCALHOSTPATH}/${APP}/report/${REMOTEFILE}" &> /dev/null
         REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}"
       fi
@@ -46,7 +46,7 @@ function post_log() {
       if [[ "${PROJSTATS}" == "1" ]]; then
         [[ ! -d "${LOCALHOSTPATH}/${APP}" ]] && mkdir "${LOCALHOSTPATH}/${APP}"
         [[ ! -d "${LOCALHOSTPATH}/${APP}/stats" ]] && mkdir "${LOCALHOSTPATH}/${APP}/stats"
-        cp -R "${statDir}" "${LOCALHOSTPATH}/${APP}"
+        cp -R "${stat_dir}" "${LOCALHOSTPATH}/${APP}"
         chmod -R a+rw "${stir_path}/html/${HTMLTEMPLATE}/stats" &> /dev/null
       fi
 
@@ -60,7 +60,7 @@ function post_log() {
     fi
 
     # Send the files through SSH/SCP
-    if [[ "${SCPPOST}" == "TRUE" ]] && [[ -f "${htmlFile}" ]]; then
+    if [[ "${SCPPOST}" == "TRUE" ]] && [[ -f "${html_file}" ]]; then
 
       # Setup up the proper command, depending on whether we're using key or password
       if [[ -n "${SCPPASS}" ]] && [[ -n "${sshpass_cmd}" ]]; then
@@ -89,17 +89,17 @@ function post_log() {
         #fi
       fi
 
-      if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" && -f "${statDir}/*" ]]; then
+      if [[ "${PROJSTATS}" == "1" || "${DIGEST}" == "1" && -f "${stat_dir}/*" ]]; then
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/stats"
-        eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
+        eval "${SCPCMD} -r" "${stat_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/avatar"
-        eval "${SCPCMD} -r" "${avatarDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/avatar/"
+        eval "${SCPCMD} -r" "${avatar_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/avatar/"
         # Clean up your mess
-        #if [[ -d "${statDir}" ]]; then
-        #  rm -R "${statDir}"
+        #if [[ -d "${stat_dir}" ]]; then
+        #  rm -R "${stat_dir}"
         #fi
-        if [[ -d "${avatarDir}" ]]; then
-          rm -R "${avatarDir}"
+        if [[ -d "${avatar_dir}" ]]; then
+          rm -R "${avatar_dir}"
         fi
       fi
 
@@ -108,10 +108,10 @@ function post_log() {
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/scan"
         eval "${SCPCMD} -r" "${scan_html}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/scan/index.html"
         # This stuff is for the new dashboard method
-        eval "${SCPCMD} -r" "${statDir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
+        eval "${SCPCMD} -r" "${stat_dir}/*" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/stats/"
         # Clean up your mess
-        #if [[ -d "${statDir}" ]]; then
-        #  rm -R "${statDir}"
+        #if [[ -d "${stat_dir}" ]]; then
+        #  rm -R "${stat_dir}"
         #fi
       fi
 
@@ -124,12 +124,12 @@ function post_log() {
         eval "${SCPCMD} -r" "${stir_path}/html/${HTMLTEMPLATE}/report/css" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/js"
         eval "${SCPCMD} -r" "${stir_path}/html/${HTMLTEMPLATE}/report/js" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report"
-        eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report/${REMOTEFILE}"
+        eval "${SCPCMD}" "${html_file}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/report/${REMOTEFILE}"
       fi
 
       # Send over the logs and set permissions
       if [[ "${REPORT}" != "1" ]] && [[ "${PROJSTATS}" != "1" ]]; then 
-        eval "${SCPCMD}" "${htmlFile}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
+        eval "${SCPCMD}" "${html_file}" "${SCPUSER}"@"${SCPHOST}":"${SCPHOSTPATH}/${APP}/${REMOTEFILE}" &> /dev/null
       fi
 
       # Remove logs older then X days
diff --git a/lib/process-html.sh b/lib/process-html.sh
index eecdb13..ad789a0 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -14,38 +14,38 @@ init_loop
 
 function process_html() {
   # Clean out the stuff we don't need
-  [[ -z "${DEVURL}" ]] && sed -i '/DEVURL/d' "${htmlFile}"
-  [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${htmlFile}"
-  [[ -z "${UPTIME}" ]] && sed -i '/UPTIME/d' "${htmlFile}"
-  [[ -z "${LATENCY}" ]] && sed -i '/LATENCY/d' "${htmlFile}"  
-  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_MSG/d' "${htmlFile}" 
-  [[ -z "${LAST_BACKUP}" ]] && sed -i '/LAST_BACKUP/d' "${htmlFile}" 
-  [[ -z "${PROJCLIENT}" ]] && sed -i 's/()//' "${htmlFile}"
-  [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${htmlFile}"
-  [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${htmlFile}"
-  [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${htmlFile}"
-  [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${htmlFile}"
-  [[ -z "${COMMITHASH}" ]] && sed -i '/COMMITHASH/d' "${htmlFile}"
-  [[ -z "${NEWS_URL}" ]] && sed -i '/RSS_NEWS/d' "${htmlFile}"
+  [[ -z "${DEVURL}" ]] && sed -i '/DEVURL/d' "${html_file}"
+  [[ -z "${PRODURL}" ]] && sed -i '/PRODURL/d' "${html_file}"
+  [[ -z "${UPTIME}" ]] && sed -i '/UPTIME/d' "${html_file}"
+  [[ -z "${LATENCY}" ]] && sed -i '/LATENCY/d' "${html_file}"  
+  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_MSG/d' "${html_file}" 
+  [[ -z "${LAST_BACKUP}" ]] && sed -i '/LAST_BACKUP/d' "${html_file}" 
+  [[ -z "${PROJCLIENT}" ]] && sed -i 's/()//' "${html_file}"
+  [[ -z "${CLIENTLOGO}" ]] && sed -i '/CLIENTLOGO/d' "${html_file}"
+  [[ -z "${CLIENTCONTACT}" ]] && sed -i '/CLIENTCONTACT/d' "${html_file}"
+  [[ -z "${notes}" ]] && sed -i '/NOTES/d' "${html_file}"
+  [[ -z "${SMOOCHID}" ]] && sed -i '/SMOOCHID/d' "${html_file}"
+  [[ -z "${COMMITHASH}" ]] && sed -i '/COMMITHASH/d' "${html_file}"
+  [[ -z "${NEWS_URL}" ]] && sed -i '/RSS_NEWS/d' "${html_file}"
 
   # Clean out dashboard nav menu
-  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_NAV/d' "${htmlFile}"
-  [[ -z "${FIREWALL_STATUS}" ]] && sed -i '/FIREWALL_NAV/d' "${htmlFile}"
-  [[ -z "${BACKUP_STATUS}" ]] && sed -i '/BACKUP_NAV/d' "${htmlFile}"
-  [[ -z "${PROFILEID}" ]] && sed -i '/ENGAGEMENT_NAV/d' "${htmlFile}"
+  [[ -z "${SCAN_MSG}" ]] && sed -i '/SCAN_NAV/d' "${html_file}"
+  [[ -z "${FIREWALL_STATUS}" ]] && sed -i '/FIREWALL_NAV/d' "${html_file}"
+  [[ -z "${BACKUP_STATUS}" ]] && sed -i '/BACKUP_NAV/d' "${html_file}"
+  [[ -z "${PROFILEID}" ]] && sed -i '/ENGAGEMENT_NAV/d' "${html_file}"
 
 
   if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
-    sed -i '/BEGIN ANALYTICS/,/END ANALYTICS/d' "${htmlFile}"
-    sed -i '/ANALYTICS/d' "${htmlFile}"
+    sed -i '/BEGIN ANALYTICS/,/END ANALYTICS/d' "${html_file}"
+    sed -i '/ANALYTICS/d' "${html_file}"
   fi
 
   if [[ -z "${RSS_URL}" ]]; then
     sed -i -e '/BEGIN WORK RSS/,/END WORK RSS/d' \
-      -e '/RSS_URL/d' "${htmlFile}" \
-    "${htmlFile}"
+      -e '/RSS_URL/d' "${html_file}" \
+    "${html_file}"
   #else
-  #  sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${htmlFile}"
+  #  sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${html_file}"
   fi
 
   # Prettify errors, warning, and successes
@@ -57,22 +57,22 @@ function process_html() {
     -e '/^SUCCESS/s/^//' \
     -e '/Deployed to/s/$/<\/span>/' \
     -e '/^Deployed to/s/^//' \
-    "${htmlFile}"
+    "${html_file}"
 
   # Insert commits
-  sed_commits=$(echo "sed -e '/{{COMMITS_RECENT}}/ {' -e 'r ${stat_file}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_commits=$(echo "sed -e '/{{COMMITS_RECENT}}/ {' -e 'r ${stat_file}' -e 'd' -e '}' -i \"${html_file}\"")
   eval "${sed_commits}"
   
   # Insert scan results
-  sed_scan=$(echo "sed -e '/{{SCAN_STATS}}/ {' -e 'r ${scan_html}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_scan=$(echo "sed -e '/{{SCAN_STATS}}/ {' -e 'r ${scan_html}' -e 'd' -e '}' -i \"${html_file}\"")
   eval "${sed_scan}"
 
   # Insert backup directory listings
-  sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trash_file}' -e 'd' -e '}' -i \"${htmlFile}\"")
+  sed_backup=$(echo "sed -e '/{{BACKUP_FILES}}/ {' -e 'r ${trash_file}' -e 'd' -e '}' -i \"${html_file}\"")
   eval "${sed_backup}"
 
   # RSS news
-  sed -i "s^{{RSS_NEWS}}^${RSS_NEWS}^g" "${htmlFile}"
+  sed -i "s^{{RSS_NEWS}}^${RSS_NEWS}^g" "${html_file}"
 
   # Setup variables to process
   process_var=(VIEWPORT NOW DEV LOGTITLE USER PROJNAME PROJCLIENT CLIENTLOGO \
@@ -92,7 +92,7 @@ function process_html() {
     #  should consolidate them into one function
     if [[ -n "${!i:-}" ]]; then
       # [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
-      sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${htmlFile}")
+      sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${html_file}")
       # Kludgy but works. Ugh.
       eval "${sed_hack}"
     fi
@@ -117,5 +117,5 @@ function process_html() {
     -e "s^{{STATURL}}^${REMOTEURL}\/${APP}\/stats^g" \
     -e "s^{{LASTMONTH}}^${last_month}^g" \
     -e "s^{{ANALYTICS_CHART}}^${REMOTEURL}/${APP}/stats/${METRIC}.png^g" \
-    "${htmlFile}"
+    "${html_file}"
   }
diff --git a/lib/report.sh b/lib/report.sh
index 4ea160f..686df1b 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -62,7 +62,7 @@ function create_report() {
   fi
 
   # Compile full report 
-  cat "${stir_path}/html/${HTMLTEMPLATE}/report/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/report/footer.html" > "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/report/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/report/footer.html" > "${html_file}"
 
   # Filter and replace template variables
   process_html
diff --git a/lib/scan.sh b/lib/scan.sh
index f3f1d2e..a9fd738 100755
--- a/lib/scan.sh
+++ b/lib/scan.sh
@@ -98,9 +98,9 @@ function scan_host() {
   assign_nav
   project_scan
 
-  cat "${stir_path}/html/${HTMLTEMPLATE}/scan/header.html" "${scan_html}" "${stir_path}/html/${HTMLTEMPLATE}/scan/footer.html" > "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/scan/header.html" "${scan_html}" "${stir_path}/html/${HTMLTEMPLATE}/scan/footer.html" > "${html_file}"
 
-  SCAN_MSG=$(grep -a "error" "${htmlFile}")
+  SCAN_MSG=$(grep -a "error" "${html_file}")
 
   # Create scan result text
   SCAN_RESULT=$(echo "${SCAN_MSG//  
}")
@@ -120,7 +120,7 @@ function scan_host() {
 
   process_html
 
-  cp "${htmlFile}" "${scan_html}"
+  cp "${html_file}" "${scan_html}"
   
   LOGTITLE="Malware Scan"
   notes="Malware scan on ${PRODURL}: ${SCAN_RESULT}"
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 904f262..75358fd 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -31,14 +31,14 @@ function project_stats() {
   queue_check
 
     # Setup up tmp work folder
-    #if [[ ! -d "${statDir}" ]]; then
-    #  umask 077 && mkdir "${statDir}" &> /dev/null
+    #if [[ ! -d "${stat_dir}" ]]; then
+    #  umask 077 && mkdir "${stat_dir}" &> /dev/null
     #fi
 
     # Prep assets
-    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/css" "${statDir}/"
-    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/fonts" "${statDir}/"
-    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/js" "${statDir}/"
+    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/css" "${stat_dir}/"
+    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/fonts" "${stat_dir}/"
+    cp -R "${stir_path}/html/${HTMLTEMPLATE}/stats/js" "${stat_dir}/"
 
     echo -n "Generating files"
 
@@ -62,19 +62,19 @@ function project_stats() {
     validate_urls "${stat_file}"
 
     # Process the HTML
-    cat "${stir_path}/html/${HTMLTEMPLATE}/stats/index.html" > "${htmlFile}"
+    cat "${stir_path}/html/${HTMLTEMPLATE}/stats/index.html" > "${html_file}"
     process_html
 
-    cat "${htmlFile}" > "${statDir}/index.html"
+    cat "${html_file}" > "${stat_dir}/index.html"
 
     # Create SVG charts
     # Spinners commented out for now, causing issues when running from a crontab
     repo_charts=(authors commits_day_week commits_hour_day commits_hour_week \
       commits_month commits_year commits_year_month files_type)
     for i in "${repo_charts[@]}" ; do
-      "${gitchart_cmd}" -r "${WORKPATH}/${APP}" "${i}" "${statDir}/${i}.svg" &>> /dev/null
-      sed -i "s/#9999ff/${CHARTC}/g" "${statDir}/${i}.svg" 
-      sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "${statDir}/${i}.svg"
+      "${gitchart_cmd}" -r "${WORKPATH}/${APP}" "${i}" "${stat_dir}/${i}.svg" &>> /dev/null
+      sed -i "s/#9999ff/${CHARTC}/g" "${stat_dir}/${i}.svg" 
+      sed -i 's/Consolas,"Liberation Mono",Menlo,Courier,monospace/Roboto, Helvetica, Arial, sans-serif/g' "${stat_dir}/${i}.svg"
     done #&
     #spinner $!
 
@@ -100,32 +100,32 @@ function project_activity() {
   validate_urls "${stat_file}"
 
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/activity.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/activity.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/activity.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/activity.html"
 }
 
 function project_statistics() {
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/stats.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/stats.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/stats.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/stats.html"
 }
 
 # This is a special snowflake for now, called from within scan_host()
 function project_scan(){
   
-  #if [[ ! -d "${statDir}" ]]; then
-  #  umask 077 && mkdir ${statDir} &> /dev/null
+  #if [[ ! -d "${stat_dir}" ]]; then
+  #  umask 077 && mkdir ${stat_dir} &> /dev/null
   #fi
   
   SCAN_STATS=$(<${scan_html})
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/scan.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/scan.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/scan.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/scan.html"
 }
 
 function project_firewall() {
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/firewall.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/firewall.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/firewall.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/firewall.html"
 }
 
 function project_engagement() {
@@ -134,7 +134,7 @@ function project_engagement() {
     return
   fi
   
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${htmlFile}"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/engagement.html" > "${html_file}"
 
   # How many days of analytics to display?
   if [[ -z "${ENGAGEMENT_DAYS}" ]]; then
@@ -149,13 +149,13 @@ function project_engagement() {
 
   # Process the HTML
   process_html; 
-  cat "${htmlFile}" > "${statDir}/engagement.html"
+  cat "${html_file}" > "${stat_dir}/engagement.html"
 }
 
 function project_css() {
   # Process the CSS files
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/css/${THEME_MODE}.css" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/css/${THEME_MODE}.css"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/css/${THEME_MODE}.css" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/css/${THEME_MODE}.css"
 }
 
 function project_backup() {
@@ -170,8 +170,8 @@ function project_backup() {
   echo "${BACKUP_FILES}" > "${trash_file}"
 
   # Process the HTML
-  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/backup.html" > "${htmlFile}"
-  process_html; cat "${htmlFile}" > "${statDir}/backup.html"
+  cat "${stir_path}/html/${HTMLTEMPLATE}/stats/backup.html" > "${html_file}"
+  process_html; cat "${html_file}" > "${stat_dir}/backup.html"
 }
 
 function check_backup() {
diff --git a/stir.sh b/stir.sh
index b20a721..4c87bc2 100755
--- a/stir.sh
+++ b/stir.sh
@@ -79,7 +79,7 @@ function init_env() {
 # Internal variables
 function init_internal() {
   var=(optstring options log_file wp_file core_file post_file trash_file stat_file \
-  url_file htmlFile htmlSendmail htmlEmail clientEmail textSendmail stir_path \
+  url_file html_file htmlSendmail html_email client_email textSendmail stir_path \
   etc_path lib_path POSTEMAIL current_branch error_msg notes \
   UPDCORE TASKLOG PCA PCB PCC PCD PLUGINS slack_icon APPRC USERRC message_state \
   COMMITURL COMMITHASH UPD1 UPD2 UPDATE gitLock AUTOMERGE MERGE EXITCODE \
@@ -121,7 +121,7 @@ function temp_files() {
   else
   # Setup tempfile list
   file=(trash_file post_file stat_file scan_file scan_html wp_file \
-    url_file htmlFile htmlEmail clientEmail core_file statDir avatarDir \
+    url_file html_file html_email client_email core_file stat_dir avatar_dir \
     stats log_file)
 
     # Start the loop
@@ -134,7 +134,7 @@ function temp_files() {
       done
     elif [[ "${1}" == "create" ]]; then
       for i in "${file[@]}" ; do
-        if [[ "${i}" != *"Dir"* ]]; then
+        if [[ "${i}" != *"_dir"* ]]; then
           var="/tmp/${APP}.${i}-${RANDOM}.log"; (umask 077 && touch "${var}" &> /dev/null) || log_fail ${var}
         else
           var="/tmp/${APP}.${i}-${RANDOM}"; (umask 077 && mkdir "${var}" &> /dev/null) || log_fail ${var}

From 3e052ef7f9ed9b27547d9afa76ec23e684e8949e Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 12 Oct 2020 23:06:27 -0700
Subject: [PATCH 309/334] More variable cleanup

---
 lib/git-obj.sh       | 91 +++++++++++++++++++++++++++++++++++++++++---
 lib/git.sh           | 89 -------------------------------------------
 lib/main.sh          |  2 +-
 lib/prepare.sh       |  2 +-
 lib/quit.sh          |  2 +-
 lib/smart-commits.sh |  2 +-
 lib/statistics.sh    |  2 +-
 lib/user-feedback.sh |  4 +-
 lib/utilities.sh     | 10 ++---
 lib/webhook.sh       |  4 +-
 lib/wp-acf.sh        | 14 +++----
 stir.sh              | 10 ++---
 12 files changed, 111 insertions(+), 121 deletions(-)
 delete mode 100755 lib/git.sh

diff --git a/lib/git-obj.sh b/lib/git-obj.sh
index 79c6b0a..c4caa67 100644
--- a/lib/git-obj.sh
+++ b/lib/git-obj.sh
@@ -7,9 +7,12 @@
 ###############################################################################
 
 # Initialize variables
-var=(working_branch)
+var=(working_branch full_user src_branch dest_branch)
 init_loop
 
+# Assign a variable to represent .git/index.lock
+git_lock="${APP_PATH}/.git/index.lock"
+
 function verify_project() {
   # If this is just a build, we won't require git repo functions
   if [[ "${BUILD}" == "1" ]]; then 
@@ -170,7 +173,7 @@ function merge() {
     notice "Merging ${MASTER} into ${working_branch}..."
     # Clear out the index.lock file, cause reasons
     # TODO: Find out why this is here, I can't remember what it was working around
-    [[ -f "${gitLock}" ]] && rm "${gitLock}"
+    [[ -f "${git_lock}" ]] && rm "${git_lock}"
     if [[ "${VERBOSE}" == "TRUE" ]]; then
       git merge "${MASTER}" | tee --append "${log_file}"              
     else
@@ -202,7 +205,7 @@ function confirm_branch() {
     # If the user is awake at the console, allow them to try again
     if  [[ "${FORCE}" = "1" ]] || yesno --default yes "Current branch is ${current_branch} and should be ${working_branch}, try again? [Y/n] "; then
       if [[ "${current_branch}" = "${MASTER}" ]]; then 
-        [[ -f "${gitLock}" ]] && rm "${gitLock}"
+        [[ -f "${git_lock}" ]] && rm "${git_lock}"
         git checkout "${working_branch}" &>> "${log_file}" #; error_check
       fi
     else
@@ -217,6 +220,81 @@ function confirm_branch() {
   fi
 }
 
+# Commit, with message
+function commit() {
+  # Smart commit stuff
+  smart_commit; empty_line
+
+  # Do a dry run; check for anything to commit
+  git commit --dry-run &>> "${log_file}" 
+
+  if grep -aq "nothing to commit, working directory clean" "${log_file}"; then 
+    info "Nothing to commit, working directory clean."
+    clean_exit
+  else
+    # Found stuff, let's get a commit message
+    if [[ -z "${COMMITMSG}" ]]; then
+      # while read -p "Enter commit message: " notes && [[ -z "$notes" ]]; do :; done
+      read -rp "Enter commit message: " notes
+      if [[ -z "${notes}" ]]; then
+        console "Commit message must not be empty."
+        read -rp "Enter commit message: " notes
+        if [[ -z "${notes}" ]]; then
+          console "Really?"
+          read -rp "Enter commit message: " notes
+        fi
+        if [[ -z "${notes}" ]]; then
+          console "Last chance."
+          read -rp "Enter commit message: " notes
+        fi
+        if [[ -z "${notes}" ]]; then
+          quiet_exit
+        fi
+      fi
+    else
+      # If running in -Fu (force updates only) mode, grab the Smart Commit 
+      # message and skip asking for user input. Nice for cron updates. 
+      if [[ "${FORCE}" = "1" ]] && [[ "${UPDATE}" = "1" ]]; then
+        # We need Smart commits enabled or this can't work
+        if [[ "${SMARTCOMMIT}" -ne "TRUE" ]]; then
+          console "Smart Commits must be enabled when forcing updates."
+          console "Set SMARTCOMMIT=TRUE in .stir.sh"; quiet_exit
+        else
+          if [[ -z "${COMMITMSG}" ]]; then
+            info "Commit message must not be empty."; quiet_exit
+          else
+            notes="${COMMITMSG}"
+          fi
+        fi
+      else
+        # We want to be able to edit the default commit if available
+        if [[ "${FORCE}" != "1" ]]; then
+          notes="${COMMITMSG}"
+          read -rp "Edit commit message: " -e -i "${COMMITMSG}" notes
+          # Update the commit message based on user input ()
+          notes="${notes:-$COMMITMSG}"
+        else
+          info "Using auto-generated commit message: ${COMMITMSG}"
+          notes="${COMMITMSG}"
+        fi
+      fi
+    fi
+
+    if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${DENY}" != "1" ]]; then 
+      trace "Queuing commit message"
+      echo "${notes}" > "${WORKPATH}/${APP}/.queued"
+    else
+      git commit -m "${notes}" &>> "${log_file}"; error_check
+      trace "Commit message: ${notes}"
+    fi
+  fi
+
+  # Check for bad characters in commit message
+  echo "${notes}" > "${trash_file}"
+  sed -i "s/\&/and/g" "${trash_file}"
+  notes=$(<$trash_file)
+}
+
 # Garbage collection
 function garbage() {
   if [[ "${GARBAGE}" = "TRUE" ]] && [[ "${QUIET}" != "1" ]]; then 
@@ -233,9 +311,10 @@ function git_stats() {
   if [[ "${GITSTATS}" == "TRUE" ]] && [[ "${QUIET}" != "1" ]] && [[ "${PUBLISH}" != "1" ]] && [[ "${APPROVE}" != "1" ]]; then
     console "Calculating..."
     getent passwd "${USER}" | cut -d ':' -f 5 | cut -d ',' -f 1 > "${trash_file}"
-    FULLUSER=$(<"${trash_file}")
-    git log --author="${FULLUSER}" --pretty=tformat: --numstat | \
+    full_user=$(<"${trash_file}")
+    git log --author="${full_user}" --pretty=tformat: --numstat | \
     # The single quotes were messing with trying to line break this one
     awk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf "Your total lines of code contributed so far: %s\n(+%s added | -%s deleted)\n",loc,add,subs }' -
   fi
-} 
\ No newline at end of file
+}
+
diff --git a/lib/git.sh b/lib/git.sh
deleted file mode 100755
index 3686ae5..0000000
--- a/lib/git.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-#
-# git.sh
-#
-###############################################################################
-# Handles git related processes
-###############################################################################
-
-# Initialize variables
-var=(FULLUSER SRC_BRANCH DEST_BRANCH)
-init_loop
-
-# Assign a variable to represent .git/index.lock
-gitLock="${APP_PATH}/.git/index.lock"
-
-# Commit, with message
-function gitCommit() {
-  # Smart commit stuff
-  smart_commit; empty_line
-
-  # Do a dry run; check for anything to commit
-  git commit --dry-run &>> "${log_file}" 
-
-  if grep -aq "nothing to commit, working directory clean" "${log_file}"; then 
-    info "Nothing to commit, working directory clean."
-    clean_exit
-  else
-    # Found stuff, let's get a commit message
-    if [[ -z "${COMMITMSG}" ]]; then
-      # while read -p "Enter commit message: " notes && [[ -z "$notes" ]]; do :; done
-      read -rp "Enter commit message: " notes
-      if [[ -z "${notes}" ]]; then
-        console "Commit message must not be empty."
-        read -rp "Enter commit message: " notes
-        if [[ -z "${notes}" ]]; then
-          console "Really?"
-          read -rp "Enter commit message: " notes
-        fi
-        if [[ -z "${notes}" ]]; then
-          console "Last chance."
-          read -rp "Enter commit message: " notes
-        fi
-        if [[ -z "${notes}" ]]; then
-          quiet_exit
-        fi
-      fi
-    else
-      # If running in -Fu (force updates only) mode, grab the Smart Commit 
-      # message and skip asking for user input. Nice for cron updates. 
-      if [[ "${FORCE}" = "1" ]] && [[ "${UPDATE}" = "1" ]]; then
-        # We need Smart commits enabled or this can't work
-        if [[ "${SMARTCOMMIT}" -ne "TRUE" ]]; then
-          console "Smart Commits must be enabled when forcing updates."
-          console "Set SMARTCOMMIT=TRUE in .stir.sh"; quiet_exit
-        else
-          if [[ -z "${COMMITMSG}" ]]; then
-            info "Commit message must not be empty."; quiet_exit
-          else
-            notes="${COMMITMSG}"
-          fi
-        fi
-      else
-        # We want to be able to edit the default commit if available
-        if [[ "${FORCE}" != "1" ]]; then
-          notes="${COMMITMSG}"
-          read -rp "Edit commit message: " -e -i "${COMMITMSG}" notes
-          # Update the commit message based on user input ()
-          notes="${notes:-$COMMITMSG}"
-        else
-          info "Using auto-generated commit message: ${COMMITMSG}"
-          notes="${COMMITMSG}"
-        fi
-      fi
-    fi
-
-    if [[ "${REQUIREAPPROVAL}" == "TRUE" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${DENY}" != "1" ]]; then 
-      trace "Queuing commit message"
-      echo "${notes}" > "${WORKPATH}/${APP}/.queued"
-    else
-      git commit -m "${notes}" &>> "${log_file}"; error_check
-      trace "Commit message: ${notes}"
-    fi
-  fi
-
-  # Check for bad characters in commit message
-  echo "${notes}" > "${trash_file}"
-  sed -i "s/\&/and/g" "${trash_file}"
-  notes=$(<$trash_file)
-}
diff --git a/lib/main.sh b/lib/main.sh
index b8dbf93..52f1aec 100755
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -103,7 +103,7 @@ function main() {
 
       if [[ "${APPROVE}" != "1" ]] && [[ ! -f "${WORKPATH}/${APP}/.queued" ]]; then
         stage         # Stage files     
-        gitCommit     # Commit, with message
+        commit     # Commit, with message
       fi 
       
       confirm_branch "${MASTER}"
diff --git a/lib/prepare.sh b/lib/prepare.sh
index 1a1a3ca..df6c743 100755
--- a/lib/prepare.sh
+++ b/lib/prepare.sh
@@ -10,7 +10,7 @@ function prepare() {
 
   # If running a command that is not going to touch code, we can skip the 
   # --prepare stuff altogether
-  startup_switch=(REPORT DIGEST SCAN SSHTEST EMAILTEST SLACKTEST POSTTEST \
+  startup_switch=(REPORT DIGEST SCAN SSHTEST EMAILTEST SLACKTEST test_webhook \
     PUBLISH PROJSTATS CREATE_INVOICE FUNCTION_LIST VARIABLE_LIST)
   for arg in "${startup_switch[@]}"; do
     if [[ "${arg}" == "1" ]]; then
diff --git a/lib/quit.sh b/lib/quit.sh
index bbdbf4f..ce0337f 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -28,7 +28,7 @@ function clean_exit() {
   fi
 
   # Fire webhook
-  postWebhook
+  post_webhook
 
   # Clean up your mess
   clean_up; exit 0
diff --git a/lib/smart-commits.sh b/lib/smart-commits.sh
index fe0ace6..46d77cd 100755
--- a/lib/smart-commits.sh
+++ b/lib/smart-commits.sh
@@ -18,7 +18,7 @@ function smart_commit() {
     if [[ "${PCA}" -gt "0" ]] || [[ ! -z "${UPDCORE}" ]] || [[ -s "${wp_file}" ]]; then
       trace "Building commit message"
 
-      if [[ "${PCA}" == "0" ]] && [[ -z "${ACFFILE}" ]]; then
+      if [[ "${PCA}" == "0" ]] && [[ -z "${acf_file}" ]]; then
         trace "No plugin updates"
       else
         # Get this thing ready; first remove the leading spaces 
diff --git a/lib/statistics.sh b/lib/statistics.sh
index 75358fd..630eb7e 100755
--- a/lib/statistics.sh
+++ b/lib/statistics.sh
@@ -53,7 +53,7 @@ function project_stats() {
     analytics
 
     # Code stats
-    CODE_STATS=$(git log --author="${FULLUSER}" --pretty=tformat: --numstat | \
+    CODE_STATS=$(git log --author="${full_user}" --pretty=tformat: --numstat | \
       awk '{ add += $1 ; subs += $2 ; loc += $1 - $2 } END { printf \
       "Total lines of code: %s
(+%s added | -%s deleted)\n",loc,add,subs }' -)
    
diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh
index 8d9143d..361eec8 100755
--- a/lib/user-feedback.sh
+++ b/lib/user-feedback.sh
@@ -31,7 +31,7 @@ function spinner() {
 }
 
 # Set up the progress bar function
-function progressBar() {
+function progress_bar() {
   # There is a bug in here I have not been able to track down yet, so 
   # overridding set -e in this function
   # set +e
@@ -52,7 +52,7 @@ function show_progress() {
     _end=100
     for number in $(seq ${_start} ${_end})
     do
-    progressBar "${number}" ${_end}
+    progress_bar "${number}" ${_end}
     done;
     empty_line; sleep 3
   fi
diff --git a/lib/utilities.sh b/lib/utilities.sh
index fca0be1..1983ae1 100755
--- a/lib/utilities.sh
+++ b/lib/utilities.sh
@@ -65,14 +65,14 @@ function go() {
   fi
 
   # if git.lock exists, do we want to remove it?
-  if [[ -f "${gitLock}" ]]; then
-    warning "Found ${gitLock}"
+  if [[ -f "${git_lock}" ]]; then
+    warning "Found ${git_lock}"
     # If running in --force mode we will not allow deployment to continue
     if [[ "${FORCE}" = "1" ]]; then
       warning "Can't continue using --force."; quiet_exit
     else
       if yesno --default no "Remove lockfile? [y/N] "; then
-        rm -f "${gitLock}" 2>/dev/null
+        rm -f "${git_lock}" 2>/dev/null
         sleep 1
       else
         quiet_exit
@@ -158,8 +158,8 @@ function user_tests() {
   fi
 
   # Webhook POST test
-  if [[ "${POSTTEST}" == "1" ]]; then
-    postTest; quiet_exit
+  if [[ "${test_webhook}" == "1" ]]; then
+    test_webhook; quiet_exit
   fi
 
   # Email test
diff --git a/lib/webhook.sh b/lib/webhook.sh
index 4869066..5a71746 100755
--- a/lib/webhook.sh
+++ b/lib/webhook.sh
@@ -6,7 +6,7 @@
 # Webhook POST functionality
 ###############################################################################
 
-function postWebhook {
+function post_webhook {
   if [[ -n "${POSTURL}" ]]; then
     # Create payload for digests
     if [[ "${DIGEST}" == "1" ]] && [[ -n "${GREETING}" ]]; then
@@ -25,7 +25,7 @@ function postWebhook {
 }
 
 # Webhook configuration test
-function postTest {
+function test_webhook {
   console "Testing POST integration..."
   echo "${POSTURL}"
   if [[ -z "${POSTURL}" ]]; then
diff --git a/lib/wp-acf.sh b/lib/wp-acf.sh
index 9993f9e..301bf5f 100755
--- a/lib/wp-acf.sh
+++ b/lib/wp-acf.sh
@@ -7,27 +7,27 @@
 ###############################################################################
 
 # Declare needed variables
-var=(ACFFILE)
+var=(acf_file)
 init_loop
 
 function acf_update() {
-  ACFFILE="/tmp/acfpro.zip"
+  acf_file="/tmp/acfpro.zip"
   trace status "Updating ACF Pro... "
 	# Download the ACF Pro upgrade file
-	"${wget_cmd}" --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${ACFFILE}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${log_file}"; error_check
+	"${wget_cmd}" --header="Accept: application/zip" --user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0" -O "${acf_file}" "http://connect.advancedcustomfields.com/index.php?p=pro&a=download&k=${ACFKEY}" &>> "${log_file}"; error_check
 
 	# Check file integrity
 	acf_filecheck
 
 	# Proceed with install
 	"${wp_cmd}" plugin delete --no-color advanced-custom-fields-pro &>> "${log_file}"
-	"${wp_cmd}" plugin install --no-color "${ACFFILE}" &>> "${log_file}"
-	rm "${ACFFILE}"
+	"${wp_cmd}" plugin install --no-color "${acf_file}" &>> "${log_file}"
+	rm "${acf_file}"
   trace notime "OK"
 }
 
 function acf_filecheck() {
-	if [[ -f "${ACFFILE}" ]]; then
+	if [[ -f "${acf_file}" ]]; then
 		hash unzip 2>/dev/null || {
 			if [[ "${AUTOMATE}" == "1" ]]; then
 				warning "Can not find unzip command, skipping ACF file integrity check."; return
@@ -37,6 +37,6 @@ function acf_filecheck() {
 		  }
 
 		# Run the check
-		unzip -t "${ACFFILE}" &>/dev/null; error_check
+		unzip -t "${acf_file}" &>/dev/null; error_check
 	fi
 }
\ No newline at end of file
diff --git a/stir.sh b/stir.sh
index 4c87bc2..cb3f27f 100755
--- a/stir.sh
+++ b/stir.sh
@@ -37,7 +37,7 @@ function init_startup() {
   var=(APP UPGRADE SKIPUPDATE CURRENT VERBOSE QUIET STRICT DEBUG FORCE \
     SLACKTEST FUNCTION_LIST VARIABLE_LIST AUTOMATE EMAILTEST APPROVE \
     DENY PUBLISH DIGEST ANALYTICS ANALYTICSTEST BUILD PROJSTATS UNLOCK  \
-    SSHTEST TIME UPDATEONLY POSTTEST REPORT REPAIR CREATE_INVOICE SCAN \
+    SSHTEST TIME UPDATEONLY test_webhook REPORT REPAIR CREATE_INVOICE SCAN \
     CHECK_BACKUP APP_PATH EXTENDED_HELP RESET PREPARE_WITH_RESET \
     SHOW_SETTINGS UNIT_TEST test_bugsnag UPDATE_ACF DEBUG_TO_FILE)
   init_loop
@@ -82,7 +82,7 @@ function init_internal() {
   url_file html_file htmlSendmail html_email client_email textSendmail stir_path \
   etc_path lib_path POSTEMAIL current_branch error_msg notes \
   UPDCORE TASKLOG PCA PCB PCC PCD PLUGINS slack_icon APPRC USERRC message_state \
-  COMMITURL COMMITHASH UPD1 UPD2 UPDATE gitLock AUTOMERGE MERGE EXITCODE \
+  COMMITURL COMMITHASH UPD1 UPD2 UPDATE git_lock AUTOMERGE MERGE EXITCODE \
   current_stash deploy_cmd deps start_branch postSendmail SLACKUSER NOCHECK \
   VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \
   WPAPP WPSYSTEM DONOTUPDATEWP gitHistory digestSendmail MINAUSER \
@@ -283,7 +283,7 @@ while [[ ${1:-unset} = -?* ]]; do
     --test-ssh) SSHTEST="1" ;;
     --test-slack) SLACKTEST="1" ;;
     --test-email) EMAILTEST="1" ;;
-    --test-webhook) POSTTEST="1" ;;
+    --test-webhook) test_webhook="1" ;;
     --test-analytics) ANALYTICSTEST="1" ;; 
     --test-monitor) MONITORTEST="1" ;;
     --test-bugsnag) test_bugsnag="1" ;;
@@ -349,7 +349,7 @@ fi
 
 # Probably not relevant but included because reasons
 [[ "${SLACKTEST}" == "1" ]] && STARTUP="${STARTUP} --slack-test"
-[[ "${POSTTEST}" == "1" ]] && STARTUP="${STARTUP} --post-test"
+[[ "${test_webhook}" == "1" ]] && STARTUP="${STARTUP} --post-test"
 [[ "${EMAILTEST}" == "1" ]] && STARTUP="${STARTUP} --email-test"
 [[ "${FUNCTION_LIST}" == "1" ]] && STARTUP="${STARTUP} --function-list"
 [[ "${VARIABLE_LIST}" == "1" ]] && STARTUP="${STARTUP} --variable-list"
@@ -574,7 +574,7 @@ fi
 trace "Current project is ${APP}"
 if [[ "${INCOGNITO}" != "TRUE" ]]; then
   trace "Current user is ${DEV}"
-  # trace "Git lock at ${gitLock}"
+  # trace "Git lock at ${git_lock}"
 fi
 
 # Start checking for errors

From 3e2230548e8edd14534224accb913062be84579f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 12 Oct 2020 23:22:08 -0700
Subject: [PATCH 310/334] Variable changes

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7acec83..e5eddb4 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- Variables changed to use more consistent naming 
 ### Fixed
 - Internal command variables are now correctly initialized
 

From 59d123197544ebde55c11092dcce8cf0af27ffc1 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 17 Oct 2020 13:37:22 -0700
Subject: [PATCH 311/334] Build is less talkative, swapped hits to pageviews

---
 CHANGELOG.md                           |  1 +
 etc/html/default/stats/engagement.html |  4 ++--
 etc/html/default/stats/index.html      |  2 +-
 lib/analytics.sh                       | 12 ++++++------
 lib/build.sh                           | 12 +++---------
 lib/digest.sh                          |  2 +-
 lib/utilities.sh                       |  2 +-
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5eddb4..df35066 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Changed
+- Engagement reports and digests now use the more useful `pageviews` instead of `hits`
 - Variables changed to use more consistent naming 
 ### Fixed
 - Internal command variables are now correctly initialized
diff --git a/etc/html/default/stats/engagement.html b/etc/html/default/stats/engagement.html
index f80d93d..f5f6564 100755
--- a/etc/html/default/stats/engagement.html
+++ b/etc/html/default/stats/engagement.html
@@ -95,9 +95,9 @@ 
{{GA_HITS}} pageviews (Last {{ENGAGEMENT_DAYS}} days)

                                 
                             
                             

-                                
+                                
                             

-                            
The total number of times a user has viewed an entire page including all text, images, etc.

+                            
The total number of pageviews across the entire site.

                         
                         

                         
 
 								
{{GREETING}}

-								
{{ANALYTICSMSG}}
Analytics Chart
View more analytics ››

+								
{{ANALYTICSMSG}}
Analytics Chart

 
-								
Here's a summary of code updates made to your website last week:

+								
+								
		
+									
+										
+											
+										
+										
+											
+											
+										
+
+										
+										
+											
+										
+										
+											
+											
+										
+										
+
+										
+										
+											
+										
+										
+											
+											
+										
+										
+
+									

+												
Overview

+											

+												Users: {{ga_users}}

+												New users: {{ga_newUsers}}

+												Sessions per user: {{ga_sessionsPerUser}}

+												Avg. time on site: {{ga_avgTimeOnPage}}s

+												Organic searches: {{ga_organicSearches}}
+													
+												Page views: {{ga_pageviews}}

+												Pageviews per session: {{ga_pageviewsPerSession}}

+												Avg. time on page: {{ga_avgTimeOnPage}}s

+												Bounce rate: {{ga_bounceRate}}%
+											

+												
AdWords Performance

+											

+												Impressions: {{ga_impressions}}

+												Ad clicks: {{ga_adClicks}}

+												Ad cost: ${{ga_adCost}}
+													
+												Cost per click: ${{ga_CPC}}

+												Click thru rate: {{ga_CTR}}%

+												Cost per conversion: ${{ga_costPerConversion}}

+											

+												
Ecommerce Performance

+											

+												Orders : {{ga_transactions}}

+												Total revenue: ${{ga_transactionRevenue}}

+												Avg. order revenue: ${{ga_revenuePerTransaction}}
+													
+												Avg. item cost: ${{ga_revenuePerItem}}

+												Orders per session: {{ga_transactionsPerSession}}

+												Orders per user: {{ga_transactionsPerUser}}

+											

+								

+								
+								
+								
View more analytics ››

+
+								
Here's a summary of code updates made to your website last week:

 								

\ No newline at end of file
diff --git a/etc/html/default/digest/mockup.html b/etc/html/default/digest/mockup.html
index 0e22af6..8ab2e77 100755
--- a/etc/html/default/digest/mockup.html
+++ b/etc/html/default/digest/mockup.html
@@ -82,7 +82,79 @@ 
Hope you had a good weekend!

-								
You had 635 hits in the last week. Awesome!
Analytics Chart
View more analytics ››

+								
You had 635 hits in the last week. Awesome!
Analytics Chart

+								
+								

+									
+										
+											
+										
+										
+										
+											
+											
+										
+
+										
+											
+										
+
+										
+											
+											
+										
+
+										
+											
+										
+
+										
+											
+											
+										
+
+										
+											
+										
+									

+												
Details

+											

+												Users: 239

+												New users: 214

+												Sessions per user: 1.13

+												Avg time on site: 107.97s

+												Organic searches: 1342
+													
+												Page views: 1451

+												Pageviews per session: 5.35

+												Average time on page: 24.66s

+												Bounce rate: 12.55%
+											

+												
AdWords Performance

+											

+												Impressions: 44477

+												Ad clicks: 2846

+												Ad cost: $854.56
+													
+												Cost per click (CPC)s: $.30

+												Click through rate (CTR): 6.4%

+												Cost per conversion (CPC): $2.06

+											

+												
Ecommerce Performance

+											

+												Orders : 2

+												Total revenue: $252.00

+												Avg. revenue per order: $126.00
+													
+												Avg. item cost: $121.00

+												Orders per session: .73%

+												Orders per user: 0.01%

+											

+												
 

+											

+								

+
+								
View more analytics ››

 
 								
Here's a summary of code updates made to your website last week:

 								

diff --git a/lib/analytics.sh b/lib/analytics.sh
index 4f90931..5de27b6 100755
--- a/lib/analytics.sh
+++ b/lib/analytics.sh
@@ -31,7 +31,8 @@ ga_var=(users newUsers percentNewSessions sessionsPerUser sessions bounces bounc
   speedMetricsSample domInteractiveTime avgDomInteractiveTime \
   domContentLoadedTime avgDomContentLoadedTime domLatencyMetricsSample \
   socialInteractions uniqueSocialInteractions socialInteractionsPerSession \
-  userTimingValue userTimingSample avgUserTimingValue)
+  userTimingValue userTimingSample avgUserTimingValue transactions transactionRevenue \
+  revenuePerTransaction revenuePerItem transactionsPerSession transactionsPerUser)
 
 for i in "${ga_var[@]}" ; do
   read -r ga_${i} <<< ""
@@ -132,41 +133,59 @@ function ga_data() {
 }
 
 function ga_data_loop() {
-  # Setup variables to process
-  console "${GASTART} - ${GAEND}"
-  ga_var=(users newUsers percentNewSessions sessionsPerUser sessions bounces bounceRate \
-    sessionDuration avgSessionDuration uniqueDimensionCombinations hits \
-    organicSearches pageValue entrances entranceRate pageviews \
-    pageviewsPerSession uniquePageviews timeOnPage avgTimeOnPage exits \
-    exitRate impressions adClicks adCost CPM CPC CTR costPerTransaction \
-    costPerGoalConversion costPerConversion RPC ROAS goalStartsAll \
-    goalCompletionsAll goalValueAll goalValuePerSession goalConversionRateAll \
-    goalAbandonsAll goalAbandonRateAll goalConversionRateAll goalAbandonsAll \
-    goalAbandonRateAll pageLoadTime pageLoadSample avgPageLoadTime \
-    domainLookupTime avgDomainLookupTime pageDownloadTime avgPageDownloadTime \
-    redirectionTime avgRedirectionTime serverConnectionTime \
-    avgServerConnectionTime serverResponseTime avgServerResponseTime \
-    speedMetricsSample domInteractiveTime avgDomInteractiveTime \
-    domContentLoadedTime avgDomContentLoadedTime domLatencyMetricsSample \
-    socialInteractions uniqueSocialInteractions socialInteractionsPerSession \
-    userTimingValue userTimingSample avgUserTimingValue)
+  if [[ "${ANALYTICSTEST}" == "1" ]]; then
+    # Setup variables to process
+    console "${GASTART} - ${GAEND}"
+    ga_var=(users newUsers percentNewSessions sessionsPerUser sessions bounces bounceRate \
+      sessionDuration avgSessionDuration uniqueDimensionCombinations hits \
+      organicSearches pageValue entrances entranceRate pageviews \
+      pageviewsPerSession uniquePageviews timeOnPage avgTimeOnPage exits \
+      exitRate impressions adClicks adCost CPM CPC CTR costPerTransaction \
+      costPerGoalConversion costPerConversion RPC ROAS goalStartsAll \
+      goalCompletionsAll goalValueAll goalValuePerSession goalConversionRateAll \
+      goalAbandonsAll goalAbandonRateAll goalConversionRateAll goalAbandonsAll \
+      goalAbandonRateAll pageLoadTime pageLoadSample avgPageLoadTime \
+      domainLookupTime avgDomainLookupTime pageDownloadTime avgPageDownloadTime \
+      redirectionTime avgRedirectionTime serverConnectionTime \
+      avgServerConnectionTime serverResponseTime avgServerResponseTime \
+      speedMetricsSample domInteractiveTime avgDomInteractiveTime \
+      domContentLoadedTime avgDomContentLoadedTime domLatencyMetricsSample \
+      socialInteractions uniqueSocialInteractions socialInteractionsPerSession \
+      userTimingValue userTimingSample avgUserTimingValue transactions transactionRevenue \
+      revenuePerTransaction revenuePerItem transactionsPerSession transactionsPerUser)
+  else 
+    if [[ "${DIGEST}" == "1" ]]; then
+      # Setup for extended digest analytics
+      ga_var=(users newUsers sessionsPerUser avgTimeOnPage pageviews \
+        pageviewsPerSession avgTimeOnPage organicSearches bounceRate \
+        impressions adClicks adCost CPC CTR costPerConversion transactions \
+        transactionRevenue revenuePerTransaction revenuePerItem transactionsPerSession \
+        transactionsPerUser)
+    fi
+  fi
 
   # Start the loop
   for i in "${ga_var[@]}" ; do
-    RESULT=$(${curl_cmd} -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${i}&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n\n' | grep -a "\"ga:${i}\":" | cut -d'"' -f4)
+    RESULT=$(${curl_cmd} -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${i}&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n\n' | grep -a "\"ga:${i}\":" | cut -d'"' -f4); dot
 
     # Workaround for buggy Google shit
     until [[ "${RESULT}" =~ ^[0-9]+([.][0-9]+)?$ ]];
     do
       RESULT=$(${curl_cmd} -s "https://www.googleapis.com/analytics/v3/data/ga?ids=ga:$PROFILEID&metrics=ga:${i}&start-date=$GASTART&end-date=$GAEND&access_token=$ACCESSTOKEN" | tr , '\n\n' | grep -a "\"ga:${i}\":" | cut -d'"' -f4)
     done
-
+  
     # Round to two decimal places if needed
     if [[ "${RESULT}" = *"."* ]]; then
       RESULT="$(printf '%0.2f\n' "${RESULT}")"
     fi
+
+    # Store value
+    eval "ga_${i}"="${RESULT}"
+
     # Output trace
-    trace "${i}: ${RESULT}"
+    if [[ "${ANALYTICSTEST}" == "1" ]]; then
+      trace "${i}: ${RESULT}"
+    fi
   done
 }
 
diff --git a/lib/digest.sh b/lib/digest.sh
index 9c0c0c6..40eb28c 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -55,6 +55,11 @@ function create_digest() {
     # Genereate the correct analytics chart
     ga_over_time "${METRIC}" 7; dot
 
+    # If we're displaying details, get them now
+    if [[ "${INCLUDE_DETAILS}" == "TRUE" ]] || [[ "${INCLUDE_ADWORDS}" == "TRUE" ]] || [[ "${INCLUDE_ECOMMERCE}" == "TRUE" ]]; then
+      ga_data_loop
+    fi
+    
     # Assemble the file
     DIGESTWRAP="$(<${stir_path}/html/${HTMLTEMPLATE}/digest/commit.html)"
 
diff --git a/lib/process-html.sh b/lib/process-html.sh
index ad789a0..cce8b3f 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -40,12 +40,21 @@ function process_html() {
     sed -i '/ANALYTICS/d' "${html_file}"
   fi
 
+  if [[ "${INCLUDE_DETAILS}" != "TRUE" ]]; then
+    sed -i '/BEGIN DETAILS/,/END DETAILS/d' "${html_file}"
+  else
+    if [[ "${INCLUDE_ADWORDS}" != "TRUE" ]] || [[ "${ga_impressions}" == "0" ]]; then
+      sed -i '/BEGIN ADWORDS/,/END ADWORDS/d' "${html_file}"
+    fi
+    if [[ "${INCLUDE_ECOMMERCE}" != "TRUE" ]] || [[ "${ga_transactions}" == "0" ]]; then
+      sed -i '/BEGIN ECOMMERCE/,/END ECOMMERCE/d' "${html_file}"
+    fi
+  fi
+
   if [[ -z "${RSS_URL}" ]]; then
     sed -i -e '/BEGIN WORK RSS/,/END WORK RSS/d' \
       -e '/RSS_URL/d' "${html_file}" \
     "${html_file}"
-  #else
-  #  sed -i "s^{{RSS_URL}}^${RSS_URL}^g" "${html_file}"
   fi
 
   # Prettify errors, warning, and successes
@@ -83,14 +92,20 @@ function process_html() {
     GA_PERCENT GA_SEARCHES GA_DURATION GA_SOCIAL CODE_STATS SCAN_BTN \
     UPTIME_BTN LATENCY_BTN BACKUP_BTN ACTIVITY_NAV STATISTICS_NAV SCAN_NAV \
     ENGAGEMENT_NAV FIREWALL_NAV BACKUP_NAV BACKUP_MSG TOTAL_COMMITS RSS_URL \
-    ga_hits ga_users ga_newUsers ga_sessions ga_organicSearches ga_pageviews \
-    THEME_MODE ENGAGEMENT_DAYS)
+    THEME_MODE ENGAGEMENT_DAYS \
+    ga_hits  ga_sessions ga_users ga_newUsers ga_sessionsPerUser \
+    ga_avgTimeOnPage ga_organicSearches ga_pageviews ga_pageviewsPerSession \
+    ga_avgTimeOnPage ga_bounceRate ga_impressions ga_adClicks ga_adCost \
+    ga_CPC ga_CTR ga_costPerConversion ga_transactions ga_transactionRevenue \
+    ga_revenuePerTransaction ga_revenuePerItem ga_transactionsPerSession \
+    ga_transactionsPerUser)
 
   # Start the loop
   for i in "${process_var[@]}" ; do
     # This is essentially the same as insert_values() [see env-check.sh], we
     #  should consolidate them into one function
     if [[ -n "${!i:-}" ]]; then
+      # Uncomment below to help debug
       # [[ "${INCOGNITO}" != "1" ]] && trace "${i}: ${!i}"
       sed_hack=$(echo "sed -i 's^{{${i}}}^${!i}^g' ${html_file}")
       # Kludgy but works. Ugh.
diff --git a/lib/user-feedback.sh b/lib/user-feedback.sh
index 361eec8..d6d3682 100755
--- a/lib/user-feedback.sh
+++ b/lib/user-feedback.sh
@@ -65,3 +65,11 @@ function dot {
     echo -n "."
   fi
 }
+
+function plus {  
+  if [[ "${1-default}" == "newline" ]]; then
+    echo "+"
+  else
+    echo -n "+"
+  fi
+}

From e2fe7e893d09446e4ca163c29aff2f1320b88029 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 17 Oct 2020 20:14:19 -0700
Subject: [PATCH 314/334] Slight change to how digest details work

---
 etc/stir-project.sh | 9 ++-------
 lib/process-html.sh | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 2af82d3..1b1f1d2 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -280,15 +280,10 @@ PROJECT_VERSION="3.8.1"
 # URL below.
 # NEWS_URL="{{NEWS_URL}}"
 
-# To include a detailed breakdown of some select analytics, set to TRUE
+# To include a detailed breakdown of some select traffic, AdWords, and 
+# ecommerce analytics, set to TRUE
 # INCLUDE_DETAILS="{{INCLUDE_DETAILS}}"
 
-# To include paid advertising (Adwords) analytics, set to TRUE
-# INCLUDE_ADWORDS="{{INCLUDE_ADWORDS}}"
-
-# To include ecommerce analytics, set to TRUE
-# INCLUDE_ECOMMERCE="{{INCLUDE_ADWORDS}}"
-
 
 ###############################################################################
 # Monthly Reporting
diff --git a/lib/process-html.sh b/lib/process-html.sh
index cce8b3f..0ee25cc 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -43,10 +43,10 @@ function process_html() {
   if [[ "${INCLUDE_DETAILS}" != "TRUE" ]]; then
     sed -i '/BEGIN DETAILS/,/END DETAILS/d' "${html_file}"
   else
-    if [[ "${INCLUDE_ADWORDS}" != "TRUE" ]] || [[ "${ga_impressions}" == "0" ]]; then
+    if [[ "${ga_impressions}" == "0" ]]; then
       sed -i '/BEGIN ADWORDS/,/END ADWORDS/d' "${html_file}"
     fi
-    if [[ "${INCLUDE_ECOMMERCE}" != "TRUE" ]] || [[ "${ga_transactions}" == "0" ]]; then
+    if [[ "${ga_transactions}" == "0" ]]; then
       sed -i '/BEGIN ECOMMERCE/,/END ECOMMERCE/d' "${html_file}"
     fi
   fi

From 4f273dd7f0a153824e15ada65eac1c392b3e10c5 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 17 Oct 2020 20:43:38 -0700
Subject: [PATCH 315/334] Release 3.8.2

---
 CHANGELOG.md         | 5 +++--
 etc/stir-global.conf | 2 +-
 etc/stir-project.sh  | 2 +-
 etc/stir-user.rc     | 2 +-
 lib/digest.sh        | 2 +-
 lib/env-check.sh     | 2 +-
 stir.sh              | 5 ++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c6b7aa..3b6493f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [3.8.2] - 10-17-2020
 ### Added
 - Digests can now display detailed traffic, AdWords, and ecommerce activity data 
 ### Changed
@@ -296,7 +296,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Old monolithic script rewritten
 
-[Unreleased]: https://github.com/EMRL/deploy/compare/v3.8...HEAD
+[Unreleased]: https://github.com/EMRL/deploy/compare/v3.8.2...HEAD
+[3.8]: https://github.com/EMRL/deploy/compare/v3.8...v3.8.2
 [3.8]: https://github.com/EMRL/deploy/compare/v3.7.4...v3.8
 [3.7.4]: https://github.com/EMRL/deploy/compare/v3.7.3...v3.7.4
 [3.7.3]: https://github.com/EMRL/deploy/compare/v3.7.2...v3.7.3
diff --git a/etc/stir-global.conf b/etc/stir-global.conf
index 79aa123..47046a5 100755
--- a/etc/stir-global.conf
+++ b/etc/stir-global.conf
@@ -7,7 +7,7 @@
 # This value indicates the version number when this file was last changed:
 # it does not necessarily reflect stir's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-GLOBAL_VERSION="3.8"
+GLOBAL_VERSION="3.8.2"
 
 
 ###############################################################################
diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 1b1f1d2..8792bc8 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -9,7 +9,7 @@
 # This value indicates the version number when this file was last changed:
 # it does not necessarily reflect stir's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-PROJECT_VERSION="3.8.1"
+PROJECT_VERSION="3.8.2"
 
 
 ###############################################################################
diff --git a/etc/stir-user.rc b/etc/stir-user.rc
index 1ec0e15..dee779f 100755
--- a/etc/stir-user.rc
+++ b/etc/stir-user.rc
@@ -11,7 +11,7 @@
 # This value indicates the version number when this file was last changed:
 # it does not necessarily reflect stir's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-USER_VERSION="3.8"
+USER_VERSION="3.8.2"
 
 # Clear screen on startup, when not running with --quiet or --verbose switch
 # CLEARSCREEN="{{CLEARSCREEN}}"
diff --git a/lib/digest.sh b/lib/digest.sh
index 40eb28c..75d79dc 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -56,7 +56,7 @@ function create_digest() {
     ga_over_time "${METRIC}" 7; dot
 
     # If we're displaying details, get them now
-    if [[ "${INCLUDE_DETAILS}" == "TRUE" ]] || [[ "${INCLUDE_ADWORDS}" == "TRUE" ]] || [[ "${INCLUDE_ECOMMERCE}" == "TRUE" ]]; then
+    if [[ "${INCLUDE_DETAILS}" == "TRUE" ]]; then
       ga_data_loop
     fi
     
diff --git a/lib/env-check.sh b/lib/env-check.sh
index 4dec28e..717f9fd 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -162,7 +162,7 @@ function update_project() {
     PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER \
     SCP_DEPLOY_PASS SCP_DEPLOY_PORT NIKTO NIKTO_CONFIG NIKTO_PROXY \
     DB_BACKUP_PATH PREPARE PREPARE_CONFIG ACF_LOCK STAGING \
-    GRAVITY_FORMS_LICENSE INCLUDE_DETAILS INCLUDE_ADWORDS INCLUDE_ECOMMERCE)
+    GRAVITY_FORMS_LICENSE INCLUDE_DETAILS)
 
   info "Project configuration backup created at ${project_config}.bak"
   cp "${project_config}" "${project_config}.bak"
diff --git a/stir.sh b/stir.sh
index f83bfef..db72be1 100755
--- a/stir.sh
+++ b/stir.sh
@@ -11,7 +11,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.8.1-dev"
+VERSION="3.8.2"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 last_month="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"
@@ -73,8 +73,7 @@ function init_env() {
   SHORTEMAIL INCOGNITO REPORTURL CLIENTCONTACT INCLUDEHOSTING GLOBAL_VERSION \
   USER_VERSION PROJECT_VERSION TERSE NOTIFYCLIENT HTMLTEMPLATE PREPARE \
   PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH PREPARE_CONFIG \
-  GRAVITY_FORMS_LICENSE NEWS_URL BUGSNAG_AUTH USE_SMTP INCLUDE_DETAILS \
-  INCLUDE_ADWORDS INCLUDE_ECOMMERCE)
+  GRAVITY_FORMS_LICENSE NEWS_URL BUGSNAG_AUTH USE_SMTP INCLUDE_DETAILS)
   init_loop
 }
 

From 44f5b37a05c17bc82d2a0dcdb607f937ff4f868f Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Sat, 17 Oct 2020 20:47:51 -0700
Subject: [PATCH 316/334] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d0e293c..5afc46f 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
 
-[![release](https://img.shields.io/badge/release-v3.8-blue.svg?style=flat)](https://github.com/EMRL/stir/releases/latest)
+[![release](https://img.shields.io/badge/release-v3.8.2-blue.svg?style=flat)](https://github.com/EMRL/stir/releases/latest)
 [![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)](https://travis-ci.org/EMRL/stir)
 
 `stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 

From e4052c6294215051ef1becd206a9f8b8b0f702a9 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 19 Oct 2020 09:22:44 -0700
Subject: [PATCH 317/334] Tweak to digest formatting

---
 etc/html/default/digest/header.html | 12 ++++++------
 stir.sh                             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html
index ea538cf..7bb45fd 100755
--- a/etc/html/default/digest/header.html
+++ b/etc/html/default/digest/header.html
@@ -93,14 +93,14 @@ 

+											

 												Users: {{ga_users}}

 												New users: {{ga_newUsers}}

 												Sessions per user: {{ga_sessionsPerUser}}

 												Avg. time on site: {{ga_avgTimeOnPage}}s

 												Organic searches: {{ga_organicSearches}}
 													
+											
 												Page views: {{ga_pageviews}}

 												Pageviews per session: {{ga_pageviewsPerSession}}

 												Avg. time on page: {{ga_avgTimeOnPage}}s

@@ -115,12 +115,12 @@ 

+											

 												Impressions: {{ga_impressions}}

 												Ad clicks: {{ga_adClicks}}

 												Ad cost: ${{ga_adCost}}
 													
+											
 												Cost per click: ${{ga_CPC}}

 												Click thru rate: {{ga_CTR}}%

 												Cost per conversion: ${{ga_costPerConversion}}

@@ -135,12 +135,12 @@ 

+											

 												Orders : {{ga_transactions}}

 												Total revenue: ${{ga_transactionRevenue}}

 												Avg. order revenue: ${{ga_revenuePerTransaction}}
 													
+											
 												Avg. item cost: ${{ga_revenuePerItem}}

 												Orders per session: {{ga_transactionsPerSession}}

 												Orders per user: {{ga_transactionsPerUser}}

diff --git a/stir.sh b/stir.sh
index db72be1..a003aa1 100755
--- a/stir.sh
+++ b/stir.sh
@@ -11,7 +11,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.8.2"
+VERSION="3.8.1-dev"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 last_month="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"

From e70bd78440870003c5bdc6e9c3b1fb0efa3e509d Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 19 Oct 2020 14:28:10 -0700
Subject: [PATCH 318/334] Fixed responsive digest issue

---
 CHANGELOG.md                        |   4 +
 etc/html/default/digest/header.html | 277 ++++++++++++++++++++++------
 etc/html/default/digest/mockup.html | 248 ++++++++++++++++---------
 stir.sh                             |   2 +-
 4 files changed, 386 insertions(+), 145 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b6493f..8817259 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Cleaned up some reposnsive layout issues with digests
+
 ## [3.8.2] - 10-17-2020
 ### Added
 - Digests can now display detailed traffic, AdWords, and ecommerce activity data 
diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html
index 7bb45fd..797fe02 100755
--- a/etc/html/default/digest/header.html
+++ b/etc/html/default/digest/header.html
@@ -82,77 +82,232 @@ 
{{GREETING}}

-								
{{ANALYTICSMSG}}
Analytics Chart

+								
{{ANALYTICSMSG}}
Analytics Chart

+							

-										
-											
-										
-										
-											
+							
-											
-										
-										
-											
+									
+								

-												
Overview

-											

-												Users: {{ga_users}}

-												New users: {{ga_newUsers}}

-												Sessions per user: {{ga_sessionsPerUser}}

-												Avg. time on site: {{ga_avgTimeOnPage}}s

-												Organic searches: {{ga_organicSearches}}
+						
+						

+								
+								
+								
+									
+										
+									
+									
+										
+									
+								
+								
 
-										
-										

-												
AdWords Performance

-											

-												Impressions: {{ga_impressions}}

-												Ad clicks: {{ga_adClicks}}

-												Ad cost: ${{ga_adCost}}
+								
+								
+								
+									
+										
+									
+																	
+										
+											
+											
+										

+								
+								
 
-										
-										

-												
Ecommerce Performance

-											

-												Orders : {{ga_transactions}}

-												Total revenue: ${{ga_transactionRevenue}}

-												Avg. order revenue: ${{ga_revenuePerTransaction}}
+								
+								
+								
+									
+										
+									
+									
+										
+											
+											
+										

+								
+								
+							

 
-									

-								

-								
-								
-								
View more analytics ››

+								
View more analytics ››

 
 								
Here's a summary of code updates made to your website last week:

 								

\ No newline at end of file
diff --git a/etc/html/default/digest/mockup.html b/etc/html/default/digest/mockup.html
index 8ab2e77..b25d30a 100755
--- a/etc/html/default/digest/mockup.html
+++ b/etc/html/default/digest/mockup.html
@@ -61,9 +61,9 @@
 								
Your Weekly Digest

 								
 								

-								June 07, 2020 – June 14, 2020

-								
-								
EMRL

+								October 12, 2020 – October 19, 2020

+								
+								
Purpose

 								
 								
 								 
 								

-									

Scan passed ◢

+									

Scan passed ◢

 
-									

100% uptime ◢

+									

100% uptime ◢

 
-									

2.08s latency ◢

+									

2.79s latency ◢

                 				

 								 
 
-								
Hope you had a good weekend!

-								
You had 635 hits in the last week. Awesome!
Analytics Chart

-								
-								

-									
-										
-											
-										
-										
-										
-											
-											
-										
-
-										
-											
-										
+								
Alright Monday, let's do this.

+								
You had traffic from 144 organic searches last week. Not bad!
Analytics Chart

+							
+						
 
-										
-											
+							
-											
-										
 
-										
-											
+						
+						
+						
+						
+							
@@ -172,18 +256,16 @@ 

-												
Details

-											

-												Users: 239

-												New users: 214

-												Sessions per user: 1.13

-												Avg time on site: 107.97s

-												Organic searches: 1342
-													
-												Page views: 1451

-												Pageviews per session: 5.35

-												Average time on page: 24.66s

-												Bounce rate: 12.55%
-											

-												
AdWords Performance

-											

-												Impressions: 44477

-												Ad clicks: 2846

-												Ad cost: $854.56
+						
+						

+								
+								
+								
+									
+										
+									
+									
+										
+									
+								
+								
 
-										

-												
Ecommerce Performance

-											

-												Orders : 2

-												Total revenue: $252.00

-												Avg. revenue per order: $126.00
+								
+								
+								
+									
+										
+									
+									
+										
+									
+								
+								
+								
+							

 
-								
View more analytics ››

+								
View more analytics ››

 
-								
Here's a summary of code updates made to your website last week:

+								
Here's a summary of code updates made to your website last week:

 								

-

-commit c67227bc 

+

+commit 7489eb4 

 Author: Update System 

-Date: Thu, 11 Jun 2020 21:23:54 -0700 (3 days ago) 


-Updated 4 plugins (cache-enabler 1.3.5, enable-media-replace 3.4.0, ewww-image-optimizer 5.4.0, wordpress-seo 14.3)

+Date: Thu, 15 Oct 2020 02:08:13 -0700 (5 days ago) 


+Updated 8 plugins (facebook-for-woocommerce 2.0.5, gravityforms 2.4.21, pw-woocommerce-gift-cards 1.148, woocommerce 4.6.0, woo-gutenberg-products-block 3.6.0, woocommerce-google-analytics-integrati 1.4.24, on , wordpress-seo 15.1)

 								
 								
 

 							

 							
-								View Dashboard
+								View Dashboard
 							
 						

 					

 
-					
 
What's new at EMRL?
Sometimes we write stuff in our agency journal.
					
-					
+					
 
What's new at EMRL?
Sometimes we write stuff about what we're thinking and doing.
					
+					
diff --git a/stir.sh b/stir.sh
index a003aa1..3ebbc22 100755
--- a/stir.sh
+++ b/stir.sh
@@ -11,7 +11,7 @@
 ###############################################################################
 
 IFS=$'\n\t'
-VERSION="3.8.1-dev"
+VERSION="3.8.2-dev"
 EPOCH="$(date +%s)"
 NOW="$(date +"%B %d, %Y")"
 last_month="$(date --date="$(date +%Y-%m-15) -1 month" +'%B')"

From 4ad4ad5c69614a874d184c2a873cbe93c1ceb051 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 19 Oct 2020 18:18:39 -0700
Subject: [PATCH 319/334] Resolve #184

---
 CHANGELOG.md                        | 1 +
 etc/html/default/digest/header.html | 2 +-
 lib/analytics.sh                    | 2 +-
 lib/process-html.sh                 | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8817259..d10b25f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Fixed
 - Cleaned up some reposnsive layout issues with digests
+- Avg. session duration is displayed correctly in digests
 
 ## [3.8.2] - 10-17-2020
 ### Added
diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html
index 797fe02..5bae93c 100755
--- a/etc/html/default/digest/header.html
+++ b/etc/html/default/digest/header.html
@@ -116,7 +116,7 @@ 

Date: Mon, 19 Oct 2020 18:35:55 -0700
Subject: [PATCH 320/334] Testing integration issue

---
 lib/post-integration.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index 0eeeec8..02fddc9 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -74,6 +74,9 @@ function mail_post() {
     echo
     echo "${post}";
     ) | "${sendmail_cmd}" -t
+    trace "Integration payload sent"
+    trace "------------------------"
+    console "${post}"
   fi
 }
 

From abeafb0e43b5a9a179c9e71bad17fac61adef7ae Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 19 Oct 2020 18:48:00 -0700
Subject: [PATCH 321/334] Some hideous code buried deep

---
 lib/post-integration.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index 02fddc9..95f9a32 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -61,6 +61,8 @@ function mail_post() {
       # If not an automated deployment, use address from .deployrc, or current user email address
       if [[ -n "${FROMUSER}" ]]; then
         echo "From: ${FROMUSER}@${FROMDOMAIN}"
+      elif [[ -n "${TASKUSER}" ]]; then
+        echo "From: ${TASKUSER}"
       else
         echo "From: ${USER}@${FROMDOMAIN}"
       fi

From 8973e22cf30265990f7fe82a0b3e97449538ce40 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Mon, 19 Oct 2020 18:52:57 -0700
Subject: [PATCH 322/334] Sgetthi mess

---
 lib/post-integration.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/post-integration.sh b/lib/post-integration.sh
index 95f9a32..0eeeec8 100755
--- a/lib/post-integration.sh
+++ b/lib/post-integration.sh
@@ -61,8 +61,6 @@ function mail_post() {
       # If not an automated deployment, use address from .deployrc, or current user email address
       if [[ -n "${FROMUSER}" ]]; then
         echo "From: ${FROMUSER}@${FROMDOMAIN}"
-      elif [[ -n "${TASKUSER}" ]]; then
-        echo "From: ${TASKUSER}"
       else
         echo "From: ${USER}@${FROMDOMAIN}"
       fi
@@ -76,9 +74,6 @@ function mail_post() {
     echo
     echo "${post}";
     ) | "${sendmail_cmd}" -t
-    trace "Integration payload sent"
-    trace "------------------------"
-    console "${post}"
   fi
 }
 

From 4c329e3f47c7297c43f0c461992efdfd66ff42f8 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 20 Oct 2020 10:05:03 -0700
Subject: [PATCH 323/334] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5afc46f..198eed7 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 ![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
 
-[![release](https://img.shields.io/badge/release-v3.8.2-blue.svg?style=flat)](https://github.com/EMRL/stir/releases/latest)
-[![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)](https://travis-ci.org/EMRL/stir)
+![GitHub release](https://img.shields.io/github/v/release/emrl/stir?sort=semver) ![GitHub issues](https://img.shields.io/github/issues/emrl/stir) ![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)
 
 `stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 

From c18e5a9f21f68470cae2b9ab51b243b66e000c74 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 20 Oct 2020 10:29:57 -0700
Subject: [PATCH 324/334] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 198eed7..fb1e094 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 ![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
 
-![GitHub release](https://img.shields.io/github/v/release/emrl/stir?sort=semver) ![GitHub issues](https://img.shields.io/github/issues/emrl/stir) ![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)
+[![release](https://img.shields.io/github/v/release/emrl/stir?sort=semver)](https://github.com/EMRL/stir/releases/latest)
+[![Github issues](https://img.shields.io/github/issues/emrl/stir)](https://github.com/EMRL/stir/releases/latest)
+[![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)](https://travis-ci.org/EMRL/stir)
 
 `stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 
 

From 6517d772f2dc97c77a455db70dc9e278f323a6ab Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 3 Nov 2020 17:17:06 -0800
Subject: [PATCH 325/334] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb1e094..64fb417 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![Stir](https://raw.githubusercontent.com/EMRL/stir/master/img/logo.png)
 
 [![release](https://img.shields.io/github/v/release/emrl/stir?sort=semver)](https://github.com/EMRL/stir/releases/latest)
-[![Github issues](https://img.shields.io/github/issues/emrl/stir)](https://github.com/EMRL/stir/releases/latest)
+[![Github issues](https://img.shields.io/github/issues/emrl/stir)](https://github.com/EMRL/stir/issues)
 [![Build Status](https://travis-ci.org/EMRL/stir.svg?branch=master)](https://travis-ci.org/EMRL/stir)
 
 `stir` is designed to speed up, automate, and integrate project commits, management, and deployment. Its main focus is Wordpress websites, but it can be used with any code repository. 

From aae18924a14289d3c0a71d39afc2bf1977dd1f26 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Tue, 3 Nov 2020 17:42:38 -0800
Subject: [PATCH 326/334] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 64fb417..298a91d 100755
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ Other Options:
 
 Configuration is handled globally in the `/etc/stir/global.conf` file. Individual users also have their own settings in `~/.stirrc`
 
-Repositories can each have their own configuration. An example of this file can be [found here](https://github.com/EMRL/stir/blob/master/etc/stir.sh).
+Repositories can each have their own configuration. An example of this file can be [found here](https://github.com/EMRL/stir/blob/master/etc/stir-global.conf).
 
 ## Integration
 

From cb8c02bb5c5abf382458fcc3c3c4e0600bf31239 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 4 Nov 2020 18:24:05 -0800
Subject: [PATCH 327/334] New default digest email behavior

---
 CHANGELOG.md                        |   2 +
 etc/html/default/digest/header.html |   6 +-
 lib/digest.sh                       | 112 +++++++++++++++-------------
 lib/mail-log.sh                     |   7 +-
 lib/process-html.sh                 |   6 ++
 stir.sh                             |   2 +-
 6 files changed, 79 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d10b25f..a50879e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- If there are analytics to report, digest emails will now be sent even if there are no code updates to report
 ### Fixed
 - Cleaned up some reposnsive layout issues with digests
 - Avg. session duration is displayed correctly in digests
diff --git a/etc/html/default/digest/header.html b/etc/html/default/digest/header.html
index 5bae93c..5db40fb 100755
--- a/etc/html/default/digest/header.html
+++ b/etc/html/default/digest/header.html
@@ -306,8 +306,10 @@ 

-
+								
 								
View more analytics ››

 
 								
Here's a summary of code updates made to your website last week:

-								

\ No newline at end of file
+								

+								
+								
\ No newline at end of file
diff --git a/lib/digest.sh b/lib/digest.sh
index 75d79dc..4340925 100755
--- a/lib/digest.sh
+++ b/lib/digest.sh
@@ -8,7 +8,7 @@
 
 # Initializa needed variables
 var=(AUTHOR AUTHOREMAIL AUTHORNAME GRAVATAR IMGFILE DIGESTWRAP \
-  DIGESTSLACK GREETING)
+  DIGESTSLACK GREETING NO_ACTIVITY)
 init_loop
 
 function get_avatars() {
@@ -36,6 +36,32 @@ function get_avatars() {
   done 
 }
 
+function get_digest_commits() {
+  # Get ready
+  DIGESTWRAP="$(<${stir_path}/html/${HTMLTEMPLATE}/digest/commit.html)"
+  > "${stat_file}"
+
+  # If there have been no commits in the last week, skip
+  if [[ $(git log --since="7 days ago") ]]; then
+    git log --pretty=format:"%n$DIGESTWRAP%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s

 						

 							
-								EMRL
+								EMRL
 					  			
EMRL • 1020 Tenth Street • Sacramento, CA 95814 • (916) 446-2440

 								We ♥ your code

 							
" --since="7 days ago" > "${stat_file}"; dot
+    sed -i '/^commit/ s/$/ <\/strong>
/' "${stat_file}"
+    sed -i '/^Author:/ s/$/ 
/' "${stat_file}"
+    sed -i '/^Date:/ s/$/ 

/' "${stat_file}"
+
+    # Look for manual commits and strip their URLs 
+    grep -oP "(?<=href=\")[^\"]+(?=\")" "${stat_file}" > "${trash_file}"; dot
+    while read URL; do
+      CODE=$(${curl_cmd} -o /dev/null --silent --head --write-out '%{http_code}' "$URL")
+      if [[ "${CODE}" != "200" ]]; then 
+        # sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${stat_file}"
+        sed -i "s,${URL},${REPOHOST}/${REPO},g" "${stat_file}"; dot
+      fi
+    done < "${trash_file}"
+  else
+    NO_ACTIVITY="1"
+  fi
+}
+
 function create_digest() {
   if [[ -z "${DIGESTSLACK}" || "${DIGESTSLACK}" == "FALSE" ]] && [[ -z "${DIGESTEMAIL} " ]]; then 
     return
@@ -60,56 +86,40 @@ function create_digest() {
       ga_data_loop
     fi
     
-    # Assemble the file
-    DIGESTWRAP="$(<${stir_path}/html/${HTMLTEMPLATE}/digest/commit.html)"
-
-    # If there have been no commits in the last week, skip creating the digest
-    if [[ $(git log --since="7 days ago") ]]; then
-      git log --pretty=format:"%n$DIGESTWRAP%ncommit %h%nAuthor: %aN%nDate: %aD (%cr)%n%s
" --since="7 days ago" > "${stat_file}"; dot
-      sed -i '/^commit/ s/$/ <\/strong>
/' "${stat_file}"
-      sed -i '/^Author:/ s/$/ 
/' "${stat_file}"
-      sed -i '/^Date:/ s/$/ 

/' "${stat_file}"
-
-      # Look for manual commits and strip their URLs 
-      grep -oP "(?<=href=\")[^\"]+(?=\")" "${stat_file}" > "${trash_file}"; dot
-      while read URL; do
-        CODE=$(${curl_cmd} -o /dev/null --silent --head --write-out '%{http_code}' "$URL")
-        if [[ "${CODE}" != "200" ]]; then 
-          # sed -i "s,${URL},${REMOTEURL}/nolog.html,g" "${stat_file}"
-          sed -i "s,${URL},${REPOHOST}/${REPO},g" "${stat_file}"; dot
-        fi
-      done < "${trash_file}"
-
-      cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${html_file}"; dot
-
-      # Randomize a positive Monday thought. Special characters must be escaped 
-      # and use character codes
-      array[0]="Hope you had a good weekend!"
-      array[1]="Alright Monday, let\'s do this."
-      array[2]="Oh, hello Monday."
-      array[3]="Welcome back, how was your weekend?"
-      array[4]="Happy Monday and welcome back!"
-      array[5]="Hello and good morning!"
-      SIZE="${#array[@]}"
-      RND="$(($RANDOM % $SIZE))"
-      GREETING="${array[$RND]}"
-
-      process_html; dot
-
-      # Strip out useless analytics results
-      if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
-        sed -i '/ANALYTICS/d' "${html_file}"
-      # else
-        if [[ "${METRIC}" == "pageviews" ]] && [[ "${RESULT}" -lt "200" ]]; then
-          sed -i '/ANALYTICS/d' "${html_file}"
-        fi
-      fi   
-
-      # Get the email payload ready
-      digestSendmail=$(<"${html_file}")
-    else
-      console "No activity found, canceling digest."
-      clean_exit
+    get_digest_commits
+
+    # If there's no analytics and no commit activity, there's no need for a digest
+    if [[ -z "${ANALYTICSMSG}" ]] && [[ "${NO_ACTIVITY}" == "1" ]]; then
+      console " No activity found."
+      quiet_exit
     fi
+
+    cat "${stir_path}/html/${HTMLTEMPLATE}/digest/header.html" "${stat_file}" "${stir_path}/html/${HTMLTEMPLATE}/digest/footer.html" > "${html_file}"; dot
+
+    # Randomize a positive Monday thought. Special characters must be escaped 
+    # and use character codes
+    array[0]="Hope you had a good weekend!"
+    array[1]="Alright Monday, let\'s do this."
+    array[2]="Oh, hello Monday."
+    array[3]="Welcome back, how was your weekend?"
+    array[4]="Happy Monday and welcome back!"
+    array[5]="Hello and good morning!"
+    SIZE="${#array[@]}"
+    RND="$(($RANDOM % $SIZE))"
+    GREETING="${array[$RND]}"
+
+    process_html; dot
+
+    # Strip out useless analytics results
+    if [[ -z "${RESULT}" ]] || [[ "${RESULT}" == "0" ]] || [[ "${SIZE}" == "0" ]]; then
+      sed -i '/ANALYTICS/d' "${html_file}"
+    # else
+      if [[ "${METRIC}" == "pageviews" ]] && [[ "${RESULT}" -lt "200" ]]; then
+        sed -i '/ANALYTICS/d' "${html_file}"
+      fi
+    fi   
+
+    # Get the email payload ready
+    digest_payload=$(<"${html_file}")
   fi
 }
diff --git a/lib/mail-log.sh b/lib/mail-log.sh
index 8615077..c1dba4a 100755
--- a/lib/mail-log.sh
+++ b/lib/mail-log.sh
@@ -48,7 +48,7 @@ function mail_log() {
   fi
 
   # Is this a digest email?
-  if [[ -n "${DIGESTEMAIL}" ]] && [[ "${DIGEST}" == "1" ]] && [[ -n "${digestSendmail}" ]]; then
+  if [[ "${message_state}" == "DIGEST" ]]; then
     # Send the email
     (
     echo "Sender: ${FROM}"
@@ -58,12 +58,15 @@ function mail_log() {
     echo "Subject: ${PROJNAME} updates for the week of ${WEEKOF}"               
     echo "Content-Type: text/html"
     echo
-    echo "${digestSendmail}";
+    echo "${digest_payload}";
     ) | "${sendmail_cmd}" -t
   fi
 }
 
 function email_test() {
+  # If the user has SMTP configured, overwrite sendmail command with ssmtp
+  check_smtp
+  
   # Make sure mail transport exists and is configured 
   if [[ -z "${sendmail_cmd}" ]]; then
     error >&2 "Mail system misconfigured or not found.";
diff --git a/lib/process-html.sh b/lib/process-html.sh
index b2c7f21..92e4a3a 100755
--- a/lib/process-html.sh
+++ b/lib/process-html.sh
@@ -57,6 +57,12 @@ function process_html() {
     "${html_file}"
   fi
 
+  if [[ "${NO_ACTIVITY}" == "1" ]]; then
+    sed -i -e '/BEGIN REMOVE IF NO_ACTIVITY/,/END REMOVE IF NO_ACTIVITY/d' \
+      -e '/NO_ACTIVITY/d' "${html_file}" \
+    "${html_file}"
+  fi
+
   # Prettify errors, warning, and successes
   sed -i -e '/ERROR/s/$/<\/span>/' \
     -e '/^ERROR/s/^//' \
diff --git a/stir.sh b/stir.sh
index 3ebbc22..848e35b 100755
--- a/stir.sh
+++ b/stir.sh
@@ -86,7 +86,7 @@ function init_internal() {
   COMMITURL COMMITHASH UPD1 UPD2 UPDATE git_lock AUTOMERGE MERGE EXITCODE \
   current_stash deploy_cmd deps start_branch postSendmail SLACKUSER NOCHECK \
   VIEWPORT VIEWPORTPRE LOGTITLE LOGURL TIMESTAMP STARTUP WPROOT \
-  WPAPP WPSYSTEM DONOTUPDATEWP gitHistory digestSendmail MINAUSER \
+  WPAPP WPSYSTEM DONOTUPDATEWP gitHistory digest_payload MINAUSER \
   MINADOMAIN SSHTARGET SSHSTATUS REMOTEFILE  LOGSUFFIX \
   DISABLESSHCHECK URL CODE DEPLOYPID DEPLOYTEST payload reportFile \
   TMP MONITORURL MONITORUSER MONITORPASS SERVERID \

From 2e87b4fa714f8be4c4eab33a9272d8c187f10a48 Mon Sep 17 00:00:00 2001
From: Floyd Diebel 
Date: Wed, 11 Nov 2020 20:44:49 -0800
Subject: [PATCH 328/334] Improved invoice handling

---
 CHANGELOG.md        |  1 +
 etc/stir-project.sh |  5 ++++-
 lib/env-check.sh    | 12 ++++++------
 lib/invoice.sh      | 47 ++++++++++++++++++++++++++++++++-------------
 lib/post-log.sh     |  2 --
 lib/quit.sh         | 37 +++++++++++++++++++----------------
 lib/report.sh       | 10 ++++++++--
 lib/slack.sh        |  2 +-
 lib/utilities.sh    |  2 ++
 stir.sh             | 31 +++++++++++++++---------------
 10 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a50879e..9f05552 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 - If there are analytics to report, digest emails will now be sent even if there are no code updates to report
+- Monthly PDF format reports can now be attached to invoices when using the `--invoice` switch
 ### Fixed
 - Cleaned up some reposnsive layout issues with digests
 - Avg. session duration is displayed correctly in digests
diff --git a/etc/stir-project.sh b/etc/stir-project.sh
index 8792bc8..6c687fa 100755
--- a/etc/stir-project.sh
+++ b/etc/stir-project.sh
@@ -9,7 +9,7 @@
 # This value indicates the version number when this file was last changed:
 # it does not necessarily reflect stir's current version number.
 # DO NOT EDIT THIS NUMBER OR YOU MAY BLOW SOMETHING UP
-PROJECT_VERSION="3.8.2"
+PROJECT_VERSION="3.8.3"
 
 
 ###############################################################################
@@ -332,6 +332,9 @@ PROJECT_VERSION="3.8.2"
 # Set to TRUE if invoices should be immediately be emailed upon creation
 # IN_EMAIL="{{IN_EMAIL}}"
 
+# Include monthly commit report
+# IN_INCLUDE_REPORT="{{IN_INCLUDE_REPORT}}"
+
 
 ###############################################################################
 # Google Analytics
diff --git a/lib/env-check.sh b/lib/env-check.sh
index 717f9fd..e25e458 100755
--- a/lib/env-check.sh
+++ b/lib/env-check.sh
@@ -156,12 +156,12 @@ function update_project() {
     INCOGNITO REMOTELOG REMOTEURL REMOTETEMPLATE SCPPOST SCPUSER SCPHOST \
     SCPHOSTPATH SCPPORT SCPPASS LOCALHOSTPOST LOCALHOSTPATH DIGESTEMAIL \
     CLIENTCONTACT INCLUDEHOSTING IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST \
-    IN_ITEM_QTY IN_NOTES IN_EMAIL CLIENTID CLIENTSECRET REDIRECTURI \
-    AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN PROFILEID MONITORURL \
-    MONITORUSER MONITORPASS SERVERID NIKTO NIKTO_CONFIG STAGING_DEPLOY_PATH \
-    PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH SCP_DEPLOY_USER \
-    SCP_DEPLOY_PASS SCP_DEPLOY_PORT NIKTO NIKTO_CONFIG NIKTO_PROXY \
-    DB_BACKUP_PATH PREPARE PREPARE_CONFIG ACF_LOCK STAGING \
+    IN_ITEM_QTY IN_NOTES IN_INCLUDE_REPORT IN_EMAIL CLIENTID CLIENTSECRET \
+    REDIRECTURI AUTHORIZATIONCODE ACCESSTOKEN REFRESHTOKEN PROFILEID \
+    MONITORURL MONITORUSER MONITORPASS SERVERID NIKTO NIKTO_CONFIG \
+    STAGING_DEPLOY_PATH PRODUCTION_DEPLOY_HOST PRODUCTION_DEPLOY_PATH \
+    SCP_DEPLOY_USER SCP_DEPLOY_PASS SCP_DEPLOY_PORT NIKTO NIKTO_CONFIG \
+    NIKTO_PROXY DB_BACKUP_PATH PREPARE PREPARE_CONFIG ACF_LOCK STAGING \
     GRAVITY_FORMS_LICENSE INCLUDE_DETAILS)
 
   info "Project configuration backup created at ${project_config}.bak"
diff --git a/lib/invoice.sh b/lib/invoice.sh
index 2f9b255..60763fb 100755
--- a/lib/invoice.sh
+++ b/lib/invoice.sh
@@ -7,22 +7,35 @@
 ###############################################################################
 
 # Initialize variables
-var=(IN_HOST IN_TOKEN IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \
-  IN_NOTES IN_EMAIL invoice_hack current_invoice IN_OFFSET \
-  current_invoice_offset)
+var=(IN_CLIENT_ID IN_PRODUCT IN_ITEM_COST IN_ITEM_QTY \
+  IN_NOTES IN_EMAIL invoice_hack current_invoice \
+  IN_INCLUDE_REPORT IN_PUBLIC_NOTES current_invoice_offset)
 init_loop
 
 function create_invoice() {
   if [[ -z "${IN_HOST}" || -z "${IN_TOKEN}" || -z "${IN_CLIENT_ID}" || -z "${IN_PRODUCT}" || -z "${IN_ITEM_COST}" || -z "${IN_ITEM_QTY}" ]]; then
     console "Invoicing not configured correctly, can not create payload."; quiet_exit
-  fi    
+  fi
+
+  # Report creation is coming soon, currently bugged
+  if [[ "${IN_INCLUDE_REPORT}" == "TRUE" ]]; then
+    create_report
+    if [[ -n "${IN_NOTES}" ]]; then
+      IN_NOTES="${IN_NOTES}\n"
+    fi
+    IN_NOTES="${IN_NOTES}View your full monthly update report at ${REPORTURL}"
+    IN_PUBLIC_NOTES="View your monthly update report at ${REPORTURL}"
+  fi
 
   # Will create the invoice payload
   trace "Creating invoice..."
-  invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\", \"cost\":${IN_ITEM_COST}, \"qty\":1}]}' -H \"X-Ninja-Token: ${IN_TOKEN}\"")
+  invoice_hack=$(echo "curl -X POST \"${IN_HOST}/api/v1/invoices\" -H \"Content-Type:application/json\" -d '{\"client_id\":\"${IN_CLIENT_ID}\", \"invoice_items\":[{\"product_key\": \"${IN_PRODUCT}\", \"notes\":\"${IN_NOTES}\",\"public_notes\":\"${IN_PUBLIC_NOTES}\", \"cost\":\"${IN_ITEM_COST}\", \"qty\":\"$IN_ITEM_QTY\"}]}' -H \"X-Ninja-Token:${IN_TOKEN}\"")
   eval "${invoice_hack}" &>> "${log_file}"; error_check
 
   get_current_invoice
+  if [[ -n "${REPORTURL}" ]]; then
+    attach_pdf2invoice
+  fi 
 
   if [[ "${IN_EMAIL}" == "TRUE" ]]; then
     send_invoice
@@ -41,20 +54,28 @@ function get_current_invoice() {
 
   # Store current invoice number
   current_invoice=$(tail -1 ${trash_file})
-
   trace "Invoice ${current_invoice} created"
-}
-
-function send_invoice() {
-  trace status "Emailing invoice ${current_invoice}... "
 
   # Apply an offset to the invoice number if needed
-  if [[ "${IN_OFFSET}" -gt "0" ]]; then
-    current_invoice_offset="$(($current_invoice-$IN_OFFSET))"
+  if [[ -n "${IN_OFFSET}" ]]; then
+    current_invoice_offset="$((${current_invoice}-${IN_OFFSET}))"
   fi
+}
 
+function send_invoice() {
+  trace status "Emailing invoice ${current_invoice}... "
   # Build out the command to send the email
-  invoice_hack=$(echo "curl -X POST ${IN_HOST}/api/v1/email_invoice -d '{\"id\":${current_invoice_offset}}' -H "Content-Type:application/json" -H \"X-Ninja-Token: ${IN_TOKEN}\"")
+  invoice_hack=$(echo "curl -X POST ${IN_HOST}/api/v1/email_invoice -d '{\"id\":$current_invoice_offset}' -H \"Content-Type:application/json\" -H \"X-Ninja-Token: ${IN_TOKEN}\"")
   eval "${invoice_hack}" &>> "${log_file}"; error_check
   trace notime "OK"
 }
+
+function attach_pdf2invoice() {
+  trace status "Attaching PDF report... "
+  "${wkhtmltopdf_cmd}" "${REPORTURL}" "/tmp/${APP}_${current_year}-${current_month}.pdf" &>> "${log_file}"; error_check
+
+  "${curl_cmd}" --silent -X POST "${IN_HOST}/api/v1/documents?invoice_id=${current_invoice_offset}" -H "Content-Type:multipart/form-data" -H "X-Requested-With: XMLHttpRequest" -H "X-Ninja-Token:${IN_TOKEN}" -F "file=@/tmp/${APP}_${current_year}-${current_month}.pdf" &>> "${log_file}"; error_check
+
+  rm "/tmp/${APP}_${current_year}-${current_month}.pdf"
+  trace notime "OK"
+}
diff --git a/lib/post-log.sh b/lib/post-log.sh
index 524dd99..4460af0 100755
--- a/lib/post-log.sh
+++ b/lib/post-log.sh
@@ -116,8 +116,6 @@ function post_log() {
       fi
 
       if [[ "${REPORT}" == "1" ]]; then
-        REMOTEFILE="${current_year}-${current_month}.php"
-        REPORTURL="${REMOTEURL}/${APP}/report/${REMOTEFILE}"
         trace "Running \"${SSHCMD}\" \"${SCPUSER}\"@\"${SCPHOST}\" \"mkdir -p ${SCPHOSTPATH}/${APP}/report\""
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report"
         eval "${SSHCMD}" "${SCPUSER}"@"${SCPHOST}" "mkdir -p ${SCPHOSTPATH}/${APP}/report/css"
diff --git a/lib/quit.sh b/lib/quit.sh
index ce0337f..ecace64 100755
--- a/lib/quit.sh
+++ b/lib/quit.sh
@@ -9,26 +9,29 @@
 # Clean exit
 function clean_exit() {
   notice "Closing ${APP} (${REPOHOST}/${REPO})"
-  make_log # Compile log
-  # Check email settings
-  if [[ "${EMAILSUCCESS}" == "TRUE" ]]; then
-     mail_log
-  fi
 
-  # Is Slack integration configured?
-  # Ghetto but will do for now
-  if [[ "${POSTTOSLACK}" == "TRUE" ]] && [[ "${AUTOMATE}" == "1" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${UPD1}" = "1" ]] && [[ "${UPD2}" = "1" ]]; then
-    message_state="NOTICE"
-    notes="No updates available for deployment"
-    post_slack
-  else
-    if [[ "${POSTTOSLACK}" == "TRUE" ]]; then
-      build_log; post_slack > /dev/null 2>&1
+  if [[ "${NO_LOG}" != "1" ]]; then
+    make_log # Compile log
+    # Check email settings
+    if [[ "${EMAILSUCCESS}" == "TRUE" ]]; then
+      mail_log
+    fi
+
+    # Is Slack integration configured?
+    # Ghetto but will do for now
+    if [[ "${POSTTOSLACK}" == "TRUE" ]] && [[ "${AUTOMATE}" == "1" ]] && [[ "${APPROVE}" != "1" ]] && [[ "${UPD1}" = "1" ]] && [[ "${UPD2}" = "1" ]]; then
+      message_state="NOTICE"
+      notes="No updates available for deployment"
+      post_slack
+    else
+      if [[ "${POSTTOSLACK}" == "TRUE" ]]; then
+        build_log; post_slack > /dev/null 2>&1
+      fi
     fi
-  fi
 
-  # Fire webhook
-  post_webhook
+    # Fire webhook
+    post_webhook
+  fi
 
   # Clean up your mess
   clean_up; exit 0
diff --git a/lib/report.sh b/lib/report.sh
index 686df1b..6bbd99b 100755
--- a/lib/report.sh
+++ b/lib/report.sh
@@ -11,7 +11,6 @@ var=(current_month current_year previous_month previous_year last_day)
 init_loop
 
 function create_report() {
-
   # Make sure we've got cal, or don't bother
   if [[ -z "${cal_cmd}" ]]; then
     console "Creating reports requires the cal utility which cannot be found."; quiet_exit
@@ -53,7 +52,6 @@ function create_report() {
     echo "
${TASK}X
${INCLUDEHOSTING}
%hX
%s
%hX
%s