Update Changelog

Merge pull request #6 from skylord123/skylord123-patch-1
Fix influx args as well as some errors in the log
2025-12-22 13:44:08 +01:00 · 2018-11-18 15:18:46 -08:00 · 2018-11-18 15:16:03 -08:00 · 2018-11-18 16:09:57 -07:00 · 2018-11-18 16:08:07 -07:00 · 2018-11-18 10:18:38 -08:00
3 changed files with 16 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.11 - 2018-11-19 - <skylord123 at github>
+
+* Fix for Urnary Operator Error
+
+## 1.10 - 2018-11-19 - <dave at tiredofit dot ca>
+
+* Fix for InfluxDB for backing up and supporting DB_PORT variable - Thanks skylord123@github
+
 ## 1.9 - 2018-11-03 - <dave at tiredofit dot ca>

 * Switch from OpenSSL to LibreSSL
--- a/install/etc/cont-finish.d/10-db-backup
+++ b/install/etc/cont-finish.d/10-db-backup
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+pkill bash
+
--- a/install/etc/s6/services/10-db-backup/run
+++ b/install/etc/s6/services/10-db-backup/run
@@ -2,7 +2,7 @@

 date >/dev/null

-if [ $1 != "NOW" ]; then
+if [ "$1" != "NOW" ]; then
    sleep 10
 fi

@@ -37,7 +37,7 @@ MD5=${MD5:-TRUE}
 SPLIT_DB=${SPLIT_DB:-FALSE}
 TMPDIR=/tmp/backups

-if [ $1 = "NOW" ]; then
+if [ "$1" = "NOW" ]; then
    DB_DUMP_BEGIN=+0
    MANUAL=TRUE
 fi
@@ -126,7 +126,7 @@ function backup_mysql() {

 function backup_influx() {
    for DB in $DB_NAME; do
-        influxd backup -database $DB -host {DBHOST} ${TMPDIR}/${TARGET}
+        influxd backup -database $DB -host ${DBHOST}:${DBPORT} ${TMPDIR}/${TARGET}
        generate_md5
        compression
        move_backup
@@ -298,4 +298,4 @@ echo '** [db-backup] Initialized at at '$(date)
    fi

  done
-fi
+fi
Author	SHA1	Message	Date
Dave Conroy	49356629fe	Update Changelog	2018-11-18 15:18:46 -08:00
Dave Conroy	b938c8a761	Merge pull request #6 from skylord123/skylord123-patch-1 Fix influx args as well as some errors in the log	2018-11-18 15:16:03 -08:00
Skylar Sadlier	5807ba07e3	Update run influx command actually doesn't accept a port argument, so instead pass it in as part of the host (to keep a uniform config with the other DB types)	2018-11-18 16:09:57 -07:00
Skylar Sadlier	96f3120e35	Update run Fix "unary operator expected" that appears in the first couple lines of the log	2018-11-18 16:08:07 -07:00
Dave Conroy	af5c6198ce	InfluxDB fixes	2018-11-18 10:18:38 -08:00