This is an automated email from the git hooks/post-receive script. iankarlwallace-guest pushed a commit to branch master in repository openemr.
commit 1b7ff4969390f9bcb6699353f75af61f5ad1a764 Author: Ian Wallace <[email protected]> Date: Thu Aug 21 22:25:42 2014 -0700 Fixes for user:group on files that need to be written by webserver. Allows Calendar to be created at login or OpenEMR. --- debian/postinst | 28 +++++++++------------------- debian/prerm | 9 --------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/debian/postinst b/debian/postinst index 8a35606..3babdc2 100644 --- a/debian/postinst +++ b/debian/postinst @@ -243,9 +243,9 @@ case "$1" in #set writable directories (that are not within sites directory) 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 - chown -R $WEB_GROUP.$WEB_USER $OPENEMR/gacl/admin/templates_c + chown -R $WEB_GROUP.$WEB_USER /var/lib/openemr/interface/main/calendar/modules/PostCalendar/pntemplates/cache + chown -R $WEB_GROUP.$WEB_USER /var/lib/openemr/interface/main/calendar/modules/PostCalendar/pntemplates/compiled + chown -R $WEB_GROUP.$WEB_USER /var/lib/openemr/gacl/admin/templates_c #set writable directories (that are within sites directory) # (go through each site) @@ -353,11 +353,11 @@ case "$1" in 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 - chown -R $WEB_GROUP.$WEB_USER $OPENEMR/library/freeb chown -R $WEB_GROUP.$WEB_USER $SITEDIR/default/letter_templates - 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 - chown -R $WEB_GROUP.$WEB_USER $OPENEMR/gacl/admin/templates_c + chown -R $WEB_GROUP.$WEB_USER $OPENEMR/library/freeb + chown -R $WEB_GROUP.$WEB_USER /var/lib/openemr/interface/main/calendar/modules/PostCalendar/pntemplates/cache + chown -R $WEB_GROUP.$WEB_USER /var/lib/openemr/interface/main/calendar/modules/PostCalendar/pntemplates/compiled + chown -R $WEB_GROUP.$WEB_USER /var/lib/openemr/gacl/admin/templates_c if $configure_flag; then # Create a random password for the openemr mysql user @@ -393,18 +393,8 @@ case "$1" in fi # Apache configuration is stored in separate file and installed in package installation - # Only will need to enable configuration and then restart apache - CONF="openemr" - COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) - - if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then - . /usr/share/apache2/apache2-maintscript-helper - apache2_invoke enconf $CONF || exit $? - elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then - if [ -d /etc/apache2/conf.d/ -a ! -L /etc/apache2/conf.d/$CONF.conf ]; then - ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf - fi - fi + # Only will need to enable configuration and then restart apache + # which is taken care of by the DEBHELPER dh-apache2 scripts # PHP Modifications are included in the apache configuration. If you run lots of CLI scripts that need # configuration you should update the php.ini or CLI interface settings. diff --git a/debian/prerm b/debian/prerm index 5394e1a..36daf83 100644 --- a/debian/prerm +++ b/debian/prerm @@ -183,15 +183,6 @@ case "$1" in deconfigure) echo "prerm asked to do deconfigure" - CONF="openemr" - COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) - - if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then - . /usr/share/apache2/apache2-maintscript-helper - apache2_invoke disconf $CONF || exit $? - elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then - [ ! -L /etc/apache2/conf.d/$CONF.conf ] || rm /etc/apache2/conf.d/$CONF.conf - fi ;; failed-upgrade) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openemr.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
