Přidán balik pro denní zálohy FlexiBee

.gitignore

@@ -10,4 +10,7 @@ debian/lastversion
 debian/md5sums
 flexibee_*
 debian/files
-/.vagrant/
+/.vagrant/
+*_all.deb
+/debian/flexibee-server-backup/
+/debian/flexibee-server-backup.substvars

README.md

@@ -1,6 +1,6 @@
 # flexibee-server - deb balíček
 
-[EN] Debian Package for FlexiBee server-only deploy
+[EN] Debian Package for server-only deploy of czech accounting system FlexiBee
 
 Balíček je uzpůsoben k běhu na serveru bez závislosti na grafickém prostředí.
 Generován je z původního instalačního balíku poskytovaným společností Abra:
@@ -13,6 +13,7 @@ Kromě toho obsahuje jěště tyto dodatečné opravy a vylepšení.
   * doplněna podpora pro službu Avahi
   * doplněn nástroj pro kontrolu licence
   * opravena chyba s java-8-openjdk-amd64 accessibility
+  * speciální balík **flexibee-server-backup** pro denní zálohy do souboru
 
 Instalace
 ---------
@@ -21,8 +22,8 @@ Pro Debian či Ubuntu prosím použijte [repozitář](http://vitexsoftware.cz/re
 
     wget -O - http://v.s.cz/info@vitexsoftware.cz.gpg.key|sudo apt-key add -
     echo deb http://v.s.cz/ stable main > /etc/apt/sources.list.d/vitexsoftware.list
-    aptitude update
-    aptitude install flexibee-server
+    apti update
+    apti install flexibee-server flexibee-server-backup
 
 
 Přihlášení
@@ -36,7 +37,7 @@ Po dokončení instalace je možné se k serveru přihlásit protokolem https na
 Problémy při instalaci
 ----------------------
 
-Pokud se při po aktualizaci z jessie na stretch objeví při pokusu o instalací balíku 
+Pokud se při po aktualizaci z Jessie na Stretch objeví při pokusu o instalací balíku 
 flexibee-server hláška: 
 
 **Není nainstována správná verze pltcl. Nainstalujte prosím balík postgresql-pltcl-9.4 resp. postgresql-pltcl
@@ -54,10 +55,75 @@ a nainstalovat je příkazem dpkg a následně dokončit instalaci FlexiBee serv
 
 
 Následující balíky již nejsou potřeba:
-  at-spi2-core dconf-gsettings-backend dconf-service glib-networking glib-networking-common glib-networking-services gsettings-desktop-schemas libasyncns0 libatk-bridge2.0-0 libatk-wrapper-java
-  libatk-wrapper-java-jni libatspi2.0-0 libcairo-gobject2 libcolord2 libdconf1 libdrm-amdgpu1 libdrm-intel1 libdrm-nouveau2 libdrm-radeon1 libdrm2 libegl1-mesa libepoxy0 libflac8 libfontenc1
-  libgbm1 libgif7 libgl1-mesa-dri libgl1-mesa-glx libglapi-mesa libgtk-3-0 libgtk-3-bin libgtk-3-common libice6 libjson-glib-1.0-0 libjson-glib-1.0-common libllvm3.9 libpciaccess0 libproxy1v5
-  libpulse0 librest-0.7-0 libsm6 libsndfile1 libsoup-gnome2.4-1 libsoup2.4-1 libtxc-dxtn-s2tc libvorbisenc2 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwayland-server0
-  libx11-xcb1 libxaw7 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 libxft2 libxkbcommon0 libxmu6 libxpm4 libxshmfence1 libxt6 libxv1
-  libxxf86dga1 libxxf86vm1 openjdk-8-jre x11-utils
 
+
+    * at-spi2-core
+    * dconf-gsettings-backend
+    * dconf-service
+    * glib-networking
+    * glib-networking-common
+    * glib-networking-services
+    * gsettings-desktop-schemas
+    * libasyncns0
+    * libatk-bridge2.0-0
+    * libatk-wrapper-java
+    * libatk-wrapper-java-jni
+    * libatspi2.0-0
+    * libcairo-gobject2
+    * libcolord2
+    * libdconf1
+    * libdrm-amdgpu1
+    * libdrm-intel1
+    * libdrm-nouveau2
+    * libdrm-radeon1
+    * libdrm2
+    * libegl1-mesa
+    * libepoxy0
+    * libflac8
+    * libfontenc1
+    * libgbm1
+    * libgif7
+    * libgl1-mesa-dri
+    * libgl1-mesa-glx
+    * libglapi-mesa
+    * libgtk-3-0
+    * libgtk-3-bin
+    * libgtk-3-common
+    * libice6
+    * libjson-glib-1.0-0
+    * libjson-glib-1.0-common
+    * libllvm3.9
+    * libpciaccess0
+    * libproxy1v5
+    * libpulse0
+    * librest-0.7-0
+    * libsm6
+    * libsndfile1
+    * libsoup-gnome2.4-1
+    * libsoup2.4-1
+    * libtxc-dxtn-s2tc
+    * libvorbisenc2
+    * libwayland-client0
+    * libwayland-cursor0
+    * libwayland-egl1-mesa
+    * libwayland-server0
+    * libx11-xcb1
+    * libxaw7
+    * libxcb-dri2-0
+    * libxcb-dri3-0
+    * libxcb-glx0
+    * libxcb-present0
+    * libxcb-shape0
+    * libxcb-sync1
+    * libxcb-xfixes0
+    * libxft2
+    * libxkbcommon0
+    * libxmu6
+    * libxpm4
+    * libxshmfence1
+    * libxt6
+    * libxv1
+    * libxxf86dga1
+    * libxxf86vm1
+    * openjdk-8-jre
+    * x11-utils

backup/flexibee-server-backup

@@ -0,0 +1,2 @@
+BACKUPDIR="/var/backup/flexibee"
+

backup/flexibee-server-backup-logrotate

@@ -0,0 +1,10 @@
+/var/log/postgresql/*.log {
+       weekly
+       rotate 10
+       copytruncate
+       delaycompress
+       compress
+       notifempty
+       missingok
+       su root root
+}

debian/control

@@ -9,22 +9,21 @@ Homepage: https://www.vitexsoftware.cz/
 
 Package: flexibee-server
 Architecture: all
-Depends: openjdk-8-jre-headless, postgresql-client-common, postgresql-9.6 | postgresql-9.5 | postgresql-9.4 | postgresql-9.3 | postgresql-9.2 | postgresql-9.1 | postgresql-9.0 | postgresql-8.4 | postgresql-8.3 | postgresql (>= 8.3), postgresql-pltcl | postgresql-pltcl-9.6 | postgresql-pltcl-9.5 | postgresql-pltcl-9.4 | postgresql-pltcl-9.3 | postgresql-pltcl-9.2 | postgresql-pltcl-9.1 | postgresql-pltcl-9.0 | postgresql-pltcl-8.4 | postgresql-pltcl-8.3, postgresql-contrib-9.6 | postgresql-contrib-9.5 | postgresql-contrib-9.4 | postgresql-contrib-9.3 | postgresql-contrib-9.2 | postgresql-contrib-9.1 | postgresql-contrib-9.0 | postgresql-contrib-8.4 | postgresql-contrib-8.3, debconf | debconf-2.0
+Depends: openjdk-8-jre-headless, postgresql-client-common, postgresql-9.6 | postgresql-9.5 | postgresql-9.4 | postgresql-9.3 | postgresql-9.2 | postgresql-9.1 | postgresql-9.0 | postgresql-8.4 | postgresql-8.3 | postgresql (>= 8.3), postgresql-pltcl | postgresql-pltcl-9.6 | postgresql-pltcl-9.5 | postgresql-pltcl-9.4 | postgresql-pltcl-9.3 | postgresql-pltcl-9.2 | postgresql-pltcl-9.1 | postgresql-pltcl-9.0 | postgresql-pltcl-8.4 | postgresql-pltcl-8.3, postgresql-contrib-9.6 | postgresql-contrib-9.5 | postgresql-contrib-9.4 | postgresql-contrib-9.3 | postgresql-contrib-9.2 | postgresql-contrib-9.1 | postgresql-contrib-9.0 | postgresql-contrib-8.4 | postgresql-contrib-8.3, debconf | debconf-2.0, lsb-base (>= 3.0-6)
 Conflicts: flexibee-client,flexibee, winstrom, winstrom-client
 Replaces: flexibee-client,flexibee, winstrom
+Recommends: autopostgresqlbackup, flexibe-server-backup
 Section: contrib/office
 Priority: optional
 Homepage: http://www.flexibee.eu/
-Description: Ekonomický systém ABRA FlexiBee
- Internetový ekonomický systém ABRA FlexiBee.
- .
- Upozornění pro uživatele Ubuntu 14.04 LTS a vyšší:
- ABRA FlexiBee k nastavení typu instalace používá nástroj 
- DebConf, který k zobrazení dotazů využívá knihovnu libgtk2-perl. 
- Tento balíček ale nemusí být ve Vašem systému dostupný a Centrum 
- softwaru pro Ubuntu kvůli tomu na konci instalace přestane 
- odpovídat. Nedojde tak k výběru typu instalace a FlexiBee poběží 
- v režimu "Lokální instalace". K dodatečnému nastavení typu 
- instalace otevřete terminál a zadejte příkaz 
- "sudo dpkg-reconfigure flexibee". 
- Instalace v terminálu tímto problémem netrpí.
+Description: Ekonomický systém ABRA FlexiBee - REST API a HTML rozhraní
+ Serverová verze Internetového ekonomického systému ABRA FlexiBee.
+
+Package: flexibee-server-backup
+Architecture: all
+Depends: flexibee-server
+Section: contrib/office
+Priority: optional
+Homepage: http://www.flexibee.eu/
+Description: Každodení zálhoa dat
+ Každý den uloží zálohu firmy do /var/lib/backup/flexibee nebo jinam dle volby

debian/flexibee-server-backup.conffiles

@@ -0,0 +1 @@
+/etc/cron.daily/flexibee-server-backup

debian/flexibee-server-backup.config

@@ -0,0 +1,12 @@
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_version 2.0
+
+
+# FlexiBee URL
+db_input high flexbee-server-backup/BACKUPDIR || true
+db_go
+
+
+exit 0

debian/flexibee-server-backup.cron.daily

@@ -0,0 +1,4 @@
+#!/bin/bash
+. /etc/default/flexibee-server-backup
+/usr/share/flexibee/bin/flexibee-backup ${BACKUPDIR}
+

debian/flexibee-server-backup.debhelper.log

@@ -0,0 +1,23 @@
+dh_update_autotools_config
+dh_auto_configure
+dh_auto_build
+dh_auto_test
+dh_prep
+dh_auto_install
+override_dh_install dh_install
+dh_install
+dh_installdocs
+dh_installchangelogs
+dh_installcron
+dh_installdebconf
+dh_perl
+dh_link
+dh_strip_nondeterminism
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_builddeb

debian/flexibee-server-backup.install

@@ -0,0 +1 @@
+backup/flexibee-server-backup etc/default

debian/flexibee-server-backup.postinst

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+
+. /usr/share/debconf/confmodule
+
+db_get flexbee-server-backup/BACKUPDIR
+sed -i "/BACKUPDIR/c\BACKUPDIR=\"${RET}\"" /etc/default/flexibee-server-backup
+
+exit 0

debian/flexibee-server-backup.postrm.debhelper

@@ -0,0 +1,6 @@
+# Automatically added by dh_installdebconf
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_purge
+fi
+# End automatically added section

debian/flexibee-server-backup.rules

@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+

debian/flexibee-server-backup.templates

@@ -0,0 +1,6 @@
+Template: flexbee-server-backup/BACKUPDIR
+Type: string
+_Default: /var/backup/flexibee
+_Description: FlexiBee Backup directory
+ Path to directory where to stora FlexiBee daily backups
+

debian/po/POTFILES.in

@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates

debian/po/cs_CZ.po

@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: flexibee-server-backup\n"
+"Report-Msgid-Bugs-To: flexibee-server-backup@packages.debian.org\n"
+"POT-Creation-Date: 2017-06-18 00:43+0200\n"
+"PO-Revision-Date: 2017-06-18 00:45+0200\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"Last-Translator: Vítězslav Dvořák <info@vitexsoftware.cz>\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Language: cs\n"
+
+#. Type: string
+#. Default
+#: ../templates:1001
+msgid "FlexiBee Backup directory"
+msgstr "Adresář záloh FlexiBee"
+
+#. Type: string
+#. Description
+#: ../templates:1002
+msgid "Path to directory where to stora FlexiBee daily backups"
+msgstr "Složka kam se budou každý den ukládat zálohy"

debian/po/en.po

@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: flexibee-server-backup\n"
+"Report-Msgid-Bugs-To: flexibee-server-backup@packages.debian.org\n"
+"POT-Creation-Date: 2017-06-18 00:45+0200\n"
+"PO-Revision-Date: 2017-06-18 00:45+0200\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"Last-Translator: Vítězslav Dvořák <info@vitexsoftware.cz>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en\n"
+
+#. Type: string
+#. Default
+#: ../templates:1001
+msgid "FlexiBee Backup directory"
+msgstr "FlexiBee Backup directory"
+
+#. Type: string
+#. Description
+#: ../templates:1002
+msgid "Path to directory where to stora FlexiBee daily backups"
+msgstr "Path to directory where to store FlexiBee daily backups"

debian/po/templates.pot

@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: flexibee-server-backup\n"
+"Report-Msgid-Bugs-To: flexibee-server-backup@packages.debian.org\n"
+"POT-Creation-Date: 2016-09-26 01:50+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Default
+#: ../templates:1001
+msgid "FlexiBee Backup directory"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:1002
+msgid "Path to directory where to stora FlexiBee daily backups"
+msgstr ""
+

debian/revision

@@ -1 +1 @@
-7
+1

debian/rules

@@ -16,8 +16,11 @@ override_dh_install:
 	rm -rf data/usr/share/mimelnk
 	rm -rf data/usr/share/pixmaps
 	mkdir -p data/etc/avahi/services/
-	cp bonus/flexibee.service  data/etc/avahi/services/
-	cp bonus/flexibee-licensecheck  data/usr/bin/flexibee-licensecheck
+	cp server/flexibee.service  data/etc/avahi/services/
+	cp server/flexibee-licensecheck  data/usr/bin/flexibee-licensecheck
 	echo FLEXIBEE_CFG=server >> data/etc/default/flexibee
 	mv data/*	debian/flexibee-server
 
+#override_dh_clean:
+#	debconf-updatepo
+#	dh_clean

test.sh

@@ -4,7 +4,7 @@ rm ../flexibee-server_*_all.deb
 rm flexibee-server_*_all.deb
 
 ./build.sh
-mv ../flexibee-server_*_all.deb .
+mv ../flexibee-server*_all.deb .
 vagrant up
 
-curl https://127.0.0.1:5434/status.json
+#curl https://127.0.0.1:5434/status.json