Merge pull request #13 from foglamp/develop

update master with develop

Author: praveen-garg

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 Dianomic Systems
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.rst

@@ -44,6 +44,16 @@ The make_deb Script
    cleanall - Remove all the versions, including the last one
   $
 
+.. warning::
+
+  Postgres dependencies will not be installed automatically.
+  In order to use postgres storage engine, you will need manual installation of `postgresql`.
+
+    .. code-block:: console
+
+       yes Y | sudo apt install postgresql
+
+
 
 Building a Package
 ==================

packages/Debian/armhf/DEBIAN/control

@@ -3,7 +3,7 @@ Version: 1.0.0
 Section: devel
 Priority: optional
 Architecture: armhf
-Depends: autoconf,libtool,libboost-dev,libboost-system-dev,libboost-thread-dev,libpq-dev,postgresql,python3-pip,python3-setuptools,sqlite3
+Depends: autoconf,libtool,libboost-dev,libboost-system-dev,libboost-thread-dev,libpq-dev,python3-pip,python3-setuptools,sqlite3,sudo
 Conflicts:
 Maintainer: Dianomic Systems, Inc. <[email protected]>
 Homepage: http://www.dianomic.com

packages/Debian/common/DEBIAN/postinst

@@ -21,7 +21,7 @@
 ## @postinst DEBIAN/postinst
 ## This script is used to execute post installation tasks.
 ##
-## Author: Ivan Zoratti
+## Author: Ivan Zoratti, Massimiliano Pinto
 ##
 ##--------------------------------------------------------------------
 
@@ -31,6 +31,19 @@ set -e
 SSL_NAME="foglamp"
 SSL_DAYS="365"
 
+link_update_task() {
+    echo "Changing setuid of update_task.apt"
+    chmod ugo+s /usr/local/foglamp/bin/update_task.apt
+    echo "Removing task/update"
+    [ -e /usr/local/foglamp/scripts/tasks/update ] && rm  /usr/local/foglamp/scripts/tasks/update
+    echo "Create link file"
+    ln -s /usr/local/foglamp/bin/update_task.apt /usr/local/foglamp/scripts/tasks/update
+}
+
+copy_foglamp_sudoer_file() {
+    cp /usr/local/foglamp/bin/foglamp.sudoers /etc/sudoers.d/foglamp
+}
+
 copy_service_file() {
     cp /usr/local/foglamp/extras/scripts/foglamp.service /etc/init.d/foglamp
 }
@@ -74,6 +87,24 @@ install_pip3_packages () {
     pip3 install -r /usr/local/foglamp/python/requirements.txt
 }
 
+# Call FogLAMP package update script
+# Any message will be written by called update script
+call_package_update_script () {
+    # File created by presinstall hook
+    installed_version_file="/usr/local/foglamp/.current_installed_version"
+    if [ -s "${installed_version_file}" ]; then
+        current_installed_version=`cat ${installed_version_file}`
+        update_script="/usr/local/foglamp/scripts/package/debian/package_update.sh"
+        # Check update script exists
+        if [ -x "${update_script}" ] && [ -s "${update_script}" ] && [ -O "${update_script}" ]; then
+            # Call Debian update script passing the previous version
+            ${update_script} ${current_installed_version}
+        fi
+        # Update done: remove temp file
+        rm ${installed_version_file}
+    fi
+}
+
 # main
 echo "Install python dependencies"
 install_pip3_packages
@@ -85,6 +116,16 @@ echo "Generating certificate files"
 generate_certs
 echo "Setting ownership of FogLAMP files"
 set_files_ownership
+
+# Call FogLAMP package update script
+call_package_update_script
+
+echo "Linking update task"
+link_update_task
+
+echo "Copying sodoers file"
+copy_foglamp_sudoer_file
+
 echo "Enabling FogLAMP service"
 enable_foglamp_service
 echo "Starting FogLAMP service"

packages/Debian/common/DEBIAN/preinst

@@ -21,7 +21,7 @@
 ## @preinst DEBIAN/preinst
 ## This script is used to execute pre installation tasks.
 ##
-## Author: Ivan Zoratti, Ashwin Gopalakrishnan
+## Author: Ivan Zoratti, Ashwin Gopalakrishnan, Massimiliano Pinto
 ##
 ##--------------------------------------------------------------------
 
@@ -83,7 +83,18 @@ then
         echo "*** ERROR. FogLAMP is currently running. Stop FogLAMP and try again. ***"
         exit 1
     fi
-    
+
+    # Persist current version in case of upgrade/downgrade
+    installed_version=`dpkg -s ${PKG_NAME} | grep '^Version:' | awk '{print $2}'`
+    if [ "${installed_version}" ]
+    then
+        # Persist current FogLAMP version: it will be removed by postinstall script
+        this_dir=`pwd`
+        cd usr/local/foglamp/
+        echo "${installed_version}" > .current_installed_version
+        cd ${this_dir}
+    fi
+
     # check schema version file, exit if schema change path does not exist
     CURRENT_VERSION_FILE=$(get_current_version_file)
     CURRENT_SCHEMA_VERSION=$(get_schema_version $CURRENT_VERSION_FILE)

packages/Debian/x86_64/DEBIAN/control

@@ -3,7 +3,7 @@ Version: 1.0.0
 Section: devel
 Priority: optional
 Architecture: amd64
-Depends: autoconf,curl,libtool,libboost-dev,libboost-system-dev,libboost-thread-dev,libpq-dev,postgresql,python3-pip,python3-setuptools,sqlite3
+Depends: autoconf,curl,libtool,libboost-dev,libboost-system-dev,libboost-thread-dev,libpq-dev,python3-pip,python3-setuptools,sqlite3,sudo
 Conflicts:
 Maintainer: Dianomic Systems, Inc. <[email protected]>
 Homepage: http://www.dianomic.com