Allow spaces between Currency codes in configuration

Author: Vitexus

Makefile

@@ -34,3 +34,15 @@ migration: ## Run database migrations
 .PHONY: newmigration
 newmigration: ## Prepare new Database Migration
 	read -p "Enter CamelCase migration name : " migname ; cd src ; ../vendor/bin/phinx create $$migname -c ../phinx-adapter.php ; cd ..
+
+.PHONY: deb
+deb: ## Make Debian package
+	debuild -us -uc
+
+.PHONY: purge
+purge: ## Clean Uninstall debian package
+	sudo apt -y purge cnb-cache cnb-cache-mysql cnb-cache-sqlite
+
+.PHONY: probe
+probe: ## Perform test install
+	sudo DEBCONF_DEBUG=developer apt install ../cnb-cache_0.1.0_all.deb ../cnb-cache-sqlite_0.1.0_all.deb 

debian/cnb-cache.config

@@ -7,10 +7,9 @@ set -e
 db_version 2.0
 
 db_title Reconfigure webserever
-db_input low cnb-cache/reconfigure-webserver || true
-
+db_input high cnb-cache/reconfigure-webserver || true
 db_go || true
 
 db_title Choose currencies to cache
-db_input low cnb-cache/currencies || true
+db_input high cnb-cache/currencies || true
 db_go || true

debian/cnb-cache.postinst

@@ -1,10 +1,8 @@
 #!/bin/sh
 set -e
-#set -x
 
 composer-debian cnb-cache
 
-
 . /usr/share/debconf/confmodule
 
 db_version 2.0
@@ -49,11 +47,8 @@ apache_install() {
     fi
 }
 
-
-
 case "$1" in
-    configure)
-
+configure)
 
     # If the package has default file it could be sourced, so that
     # the local admin can overwrite the defaults
@@ -109,7 +104,9 @@ case "$1" in
         fi
     fi
 
-    db_title "Reconfigure web server"
+    echo "Reconfigurning Web Server"
+
+
     db_get cnb-cache/reconfigure-webserver || true
     webservers="$RET"
     restart=""
@@ -128,10 +125,9 @@ case "$1" in
         restart="$restart $webserver"
     done
 
-    db_title "Restarting web server"
     db_get cnb-cache/restart-webserver || true
     res="$RET"
-    db_stop || true
+    db_go || true
     if [ "$res" = "true" ]; then
         for webserver in $restart; do
             webserver=${webserver%,}
@@ -145,33 +141,36 @@ case "$1" in
         done
     fi
 
-    db_title "Choose currencies to cache"
     db_get cnb-cache/currencies || true
     currencies="$RET"
+    db_go || true
+
+    echo "Currencies to cache: $currencies"
 
     # Update or populate CURRENCIES key in /etc/cnb-cache/cnb-cache.env with $currencies
     if [ -n "$currencies" ]; then
         if grep -q "^CURRENCIES=" /etc/cnb-cache/cnb-cache.env; then
             sed -i "s/^CURRENCIES=.*/CURRENCIES=\"$currencies\"/" /etc/cnb-cache/cnb-cache.env
         else
-            echo "CURRENCIES=\"$currencies\"" >> /etc/cnb-cache/cnb-cache.env
+            echo "CURRENCIES=\"$currencies\"" >>/etc/cnb-cache/cnb-cache.env
         fi
     fi
 
-    cnb-cache-init
+    echo "Initializing cache"
 
-    ;;
 
-    abort-upgrade|abort-remove|abort-deconfigure)
+    APP_DEBUG=True cnb-cache-init
+
     ;;
 
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
+abort-upgrade | abort-remove | abort-deconfigure) ;;
+
+*)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
     ;;
 esac
 
-
 #DEBHELPER#
 
 exit 0

debian/conf/.env.template

@@ -5,4 +5,5 @@ DB_DATABASE=/var/lib/dbconfig-common/sqlite3/cnb-cache/_DBC_DBNAME_
 DB_USERNAME=_DBC_DBUSER_
 DB_PASSWORD=_DBC_DBPASS_
 CURRENCIES=USD,EUR
-EASE_LOGGER=syslog
+EASE_LOGGER=syslog|console
+

debian/conf/phinx-adapter.php

@@ -35,7 +35,7 @@
     \Ease\Shared::instanced()->loadConfig('/etc/cnb-cache/cnb-cache.env', true);
 }
 
-$prefix = "/usr/lib/multiflexi/db/";
+$prefix = "/usr/lib/cnb-cache/db/";
 
 $sqlOptions = [];
 

debian/templates

@@ -1,5 +1,6 @@
 Template: cnb-cache/reconfigure-webserver
 Type: multiselect
+Default: apache2
 Choices: apache2, lighttpd
  Description: Web server to reconfigure automatically:
  Please choose the web server that should be automatically configured

src/SpojeNet/Cnb/ExchangeRate.php

@@ -34,7 +34,7 @@ public function __construct()
     {
         $this->setMyTable('rates');
         $this->setObjectName();
-        $currencies = explode(',', \Ease\Shared::cfg('CURRENCIES', 'EUR'));
+        $currencies = explode(',', str_replace(' ', '', \Ease\Shared::cfg('CURRENCIES', 'EUR')));
         $this->currencies = array_combine($currencies, $currencies);
         parent::__construct();
     }

src/init.php

@@ -17,7 +17,7 @@
 
 require_once '../vendor/autoload.php';
 
-// Nastavení MultiFlexi
+define('APP_NAME', 'CNB Cache Init');
 
 $options = getopt('e::', ['environment::']);
 
@@ -28,6 +28,10 @@
 
 $engine = new \SpojeNet\Cnb\ExchangeRate();
 
+if(\Ease\Shared::cfg('APP_DEBUG')){
+ $engine->logBanner();
+}
+
 $engine->storeDay(0);
 $engine->storeDay(1);
 $engine->storeDay(2);