From 4befb72b2a3832449dd4a5289e58e2e403367d43 Mon Sep 17 00:00:00 2001 From: bradymiller Date: Sat, 28 Jun 2014 14:28:27 -0700 Subject: [PATCH] ZEND project: set writable permissions to zend module config file at interface/modules/zend_modules/config/application.config.php --- contrib/util/ubuntu_package_scripts/development/README.Debian | 4 ++-- contrib/util/ubuntu_package_scripts/development/changelog.Debian | 7 +++++++ contrib/util/ubuntu_package_scripts/development/control | 2 +- contrib/util/ubuntu_package_scripts/development/copyright | 2 +- contrib/util/ubuntu_package_scripts/development/postinst | 1 + contrib/util/ubuntu_package_scripts/production/changelog.Debian | 7 +++++++ contrib/util/ubuntu_package_scripts/production/control | 2 +- contrib/util/ubuntu_package_scripts/production/postinst | 4 +++- contrib/util/ubuntu_package_scripts/production/preinst | 6 ++++-- setup.php | 4 +++- 10 files changed, 30 insertions(+), 9 deletions(-) diff --git a/contrib/util/ubuntu_package_scripts/development/README.Debian b/contrib/util/ubuntu_package_scripts/development/README.Debian index f0e6057d2..f88a68f97 100644 --- a/contrib/util/ubuntu_package_scripts/development/README.Debian +++ b/contrib/util/ubuntu_package_scripts/development/README.Debian @@ -48,5 +48,5 @@ just installed it is very helpful. Authors of debianized OpenEMR: ------------------------------ --- Brady Miller Tue, 29 Apr 2014 18:59:45 -0700 --- Amalu Obinna Tue, 29 Apr 2014 18:59:45 -0700 +-- Brady Miller Sat, 28 Jun 2014 14:43:21 -0700 +-- Amalu Obinna Sat, 28 Jun 2014 14:43:21 -0700 diff --git a/contrib/util/ubuntu_package_scripts/development/changelog.Debian b/contrib/util/ubuntu_package_scripts/development/changelog.Debian index b90e09192..db82e84fb 100644 --- a/contrib/util/ubuntu_package_scripts/development/changelog.Debian +++ b/contrib/util/ubuntu_package_scripts/development/changelog.Debian @@ -1,3 +1,10 @@ +git-openemr (1.0.0-3) stable; urgency=low + + * Fixes to work with Zend: + * Set permission for application.config.php file. + + -- Brady Miller Sat, 28 Jun 2014 14:43:21 -0700 + git-openemr (1.0.0-2) stable; urgency=low * Fixes to work on Ubuntu 14.04. diff --git a/contrib/util/ubuntu_package_scripts/development/control b/contrib/util/ubuntu_package_scripts/development/control index 4742ff2ed..6714431a1 100644 --- a/contrib/util/ubuntu_package_scripts/development/control +++ b/contrib/util/ubuntu_package_scripts/development/control @@ -1,5 +1,5 @@ Package: git-openemr -Version: 1.0.0-2 +Version: 1.0.0-3 Maintainer: Brady Miller Installed-Size: 46000 Priority: optional diff --git a/contrib/util/ubuntu_package_scripts/development/copyright b/contrib/util/ubuntu_package_scripts/development/copyright index 24d970922..d93849958 100644 --- a/contrib/util/ubuntu_package_scripts/development/copyright +++ b/contrib/util/ubuntu_package_scripts/development/copyright @@ -1,5 +1,5 @@ This package was debianized by Brady Miller on -Tue, 29 Apr 2014 18:59:45 -0700. +Sat, 28 Jun 2014 14:43:21 -0700. Upstream Author: http://www.open-emr.org diff --git a/contrib/util/ubuntu_package_scripts/development/postinst b/contrib/util/ubuntu_package_scripts/development/postinst index 0c9140b29..450cb7a97 100644 --- a/contrib/util/ubuntu_package_scripts/development/postinst +++ b/contrib/util/ubuntu_package_scripts/development/postinst @@ -222,6 +222,7 @@ case "$1" in # Set file and directory permissions chmod 666 $SITEDIR/sqlconf.php + chown $WEB_GROUP.$WEB_USER $OPENEMR/interface/modules/zend_modules/config/application.config.php chown -R $WEB_GROUP.$WEB_USER $SITEDIR/documents chown -R $WEB_GROUP.$WEB_USER $SITEDIR/edi chown -R $WEB_GROUP.$WEB_USER $SITEDIR/era diff --git a/contrib/util/ubuntu_package_scripts/production/changelog.Debian b/contrib/util/ubuntu_package_scripts/production/changelog.Debian index 1a9c9a850..630718f3b 100644 --- a/contrib/util/ubuntu_package_scripts/production/changelog.Debian +++ b/contrib/util/ubuntu_package_scripts/production/changelog.Debian @@ -1,3 +1,10 @@ +openemr (4.1.3-1) stable; urgency=low + + * Fixes to work with Zend: + * Set permission for application.config.php file. + + -- Brady Miller Tue, 29 Apr 2014 19:12:02 -0700 + openemr (4.1.2-3) stable; urgency=low * New upstream patch (patch number 7) diff --git a/contrib/util/ubuntu_package_scripts/production/control b/contrib/util/ubuntu_package_scripts/production/control index 46f537d50..7d772349e 100644 --- a/contrib/util/ubuntu_package_scripts/production/control +++ b/contrib/util/ubuntu_package_scripts/production/control @@ -1,5 +1,5 @@ Package: openemr -Version: 4.1.2-3 +Version: 4.1.3-1 Maintainer: Brady Miller Installed-Size: 127000 Priority: optional diff --git a/contrib/util/ubuntu_package_scripts/production/postinst b/contrib/util/ubuntu_package_scripts/production/postinst index dfaf93c35..a336a18f4 100644 --- a/contrib/util/ubuntu_package_scripts/production/postinst +++ b/contrib/util/ubuntu_package_scripts/production/postinst @@ -235,7 +235,8 @@ case "$1" in chmod 600 $OPENEMR/ippf_upgrade.php chmod 600 $OPENEMR/gacl/setup.php - #set writable directories (that are not within sites directory) + #set writable files and directories (that are not within sites directory) + chown $WEB_GROUP.$WEB_USER $OPENEMR/interface/modules/zend_modules/config/application.config.php chown -R $WEB_GROUP.$WEB_USER $OPENEMR/library/freeb chown -R $WEB_GROUP.$WEB_USER $OPENEMR/interface/main/calendar/modules/PostCalendar/pntemplates/cache chown -R $WEB_GROUP.$WEB_USER $OPENEMR/interface/main/calendar/modules/PostCalendar/pntemplates/compiled @@ -504,6 +505,7 @@ case "$1" in # Set file and directory permissions (note use default site directory for new install) chmod 666 $SITEDIR/default/sqlconf.php + chown $WEB_GROUP.$WEB_USER $OPENEMR/interface/modules/zend_modules/config/application.config.php chown -R $WEB_GROUP.$WEB_USER $SITEDIR/default/documents chown -R $WEB_GROUP.$WEB_USER $SITEDIR/default/edi chown -R $WEB_GROUP.$WEB_USER $SITEDIR/default/era diff --git a/contrib/util/ubuntu_package_scripts/production/preinst b/contrib/util/ubuntu_package_scripts/production/preinst index 9d8bf922e..b10569ded 100644 --- a/contrib/util/ubuntu_package_scripts/production/preinst +++ b/contrib/util/ubuntu_package_scripts/production/preinst @@ -215,15 +215,17 @@ upgrade_function () { OLD_VERSION="4.1.0-1" elif [ "$OLD_VERSION" == "4.1.1" ]; then OLD_VERSION="4.1.1-1" + elif [ "$OLD_VERSION" == "4.1.2" ]; then + OLD_VERSION="4.1.2-1" else prompt_input openemr/upgrade_not_supported critical ret_result unable_exit "Unable to upgrade from $OLD_VERSION version package with $UPGRADETYPE method, so can not upgrade the OpenEMR Package." fi fi # - # ONLY acceptable package and converted raw is 3.0.1-1 or 3.1.0-1 or 3.2.0-1 or 4.0.0-1 or 4.1.0-1 or 4.1.1-1 + # ONLY acceptable package and converted raw is 3.0.1-1 or 3.1.0-1 or 3.2.0-1 or 4.0.0-1 or 4.1.0-1 or 4.1.1-1 or 4.1.2-1 or 4.1.2-2 or 4.1.2-3 # - if [ "$OLD_VERSION" != "3.0.1-1" ] && [ "$OLD_VERSION" != "3.1.0-1" ] && [ "$OLD_VERSION" != "3.2.0-1" ] && [ "$OLD_VERSION" != "4.0.0-1" ] && [ "$OLD_VERSION" != "4.1.0-1" ] && [ "$OLD_VERSION" != "4.1.1-1" ]; then + if [ "$OLD_VERSION" != "3.0.1-1" ] && [ "$OLD_VERSION" != "3.1.0-1" ] && [ "$OLD_VERSION" != "3.2.0-1" ] && [ "$OLD_VERSION" != "4.0.0-1" ] && [ "$OLD_VERSION" != "4.1.0-1" ] && [ "$OLD_VERSION" != "4.1.1-1" ] && [ "$OLD_VERSION" != "4.1.2-1" ] && [ "$OLD_VERSION" != "4.1.2-2" ] && [ "$OLD_VERSION" != "4.1.2-3" ]; then prompt_input openemr/upgrade_not_supported critical ret_result unable_exit "Unable to upgrade from $OLD_VERSION version package with $UPGRADETYPE method, so can not upgrade the OpenEMR Package." fi diff --git a/setup.php b/setup.php index 81af791dd..14f774410 100644 --- a/setup.php +++ b/setup.php @@ -73,10 +73,12 @@ $gaclWritableDirectory = dirname(__FILE__)."/gacl/admin/templates_c"; $requiredDirectory1 = dirname(__FILE__)."/interface/main/calendar/modules/PostCalendar/pntemplates/compiled"; $requiredDirectory2 = dirname(__FILE__)."/interface/main/calendar/modules/PostCalendar/pntemplates/cache"; +$zendModuleConfigFile = dirname(__FILE__)."/interface/modules/zend_modules/config/application.config.php"; + //These are files and dir checked before install for // correct permissions. if (is_dir($OE_SITE_DIR)) { - $writableFileList = array($installer->conffile); + $writableFileList = array($installer->conffile,$zendModuleConfigFile); $writableDirList = array($docsDirectory, $billingDirectory, $billingDirectory2, $lettersDirectory, $gaclWritableDirectory, $requiredDirectory1, $requiredDirectory2); } else { -- 2.11.4.GIT