[med-svn] [openemr] 01/01: Lintian still complains about lots of the items in the package but started to remove/symlink things that can't be stored in /usr/share/openemr. Added config files for apache2. Override for dh_link to correct for the templates_c dir that belongs in /var/lib/openemr/gacl area.
Ian Wallace
iankarlwallace-guest at moszumanska.debian.org
Wed Jun 11 05:54:22 UTC 2014
This is an automated email from the git hooks/post-receive script.
iankarlwallace-guest pushed a commit to branch master
in repository openemr.
commit 55e76d889fbc7f8c11cbe8db5e7dcb1934da4773
Author: Ian Wallace <iankarlwallace at gmail.com>
Date: Tue Jun 10 22:54:08 2014 -0700
Lintian still complains about lots of the items in the package but started to remove/symlink things that can't be stored in /usr/share/openemr. Added config files for apache2. Override for dh_link to correct for the templates_c dir that belongs in /var/lib/openemr/gacl area.
---
debian/control | 6 +-
debian/dirs | 2 +
debian/install | 3 +
debian/openemr-apache-ssl.conf | 64 +++++++++
debian/openemr-apache.conf | 40 ++++++
debian/openemr.links | 2 +
debian/postinst | 306 +++++++++++++++++++++--------------------
debian/postrm | 2 +
debian/preinst | 2 +
debian/prerm | 2 +
debian/rules | 8 +-
11 files changed, 282 insertions(+), 155 deletions(-)
diff --git a/debian/control b/debian/control
index 7105d65..b4d2371 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openemr
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>,
Brady Miller <brady at sparmy.com>,
- Ian Wallace <iankarlwallace at gmail.com>
+ Ian Karl Wallace <iankarlwallace at gmail.com>
Section: science
Priority: optional
Build-Depends: debhelper (>= 9)
@@ -12,7 +12,7 @@ Vcs-Git: https://alioth.debian.org/anonscm/git/debian-med/openemr.git
Homepage: http://www.open-emr.org/
Package: openemr
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
mysql-server,
@@ -33,7 +33,9 @@ Depends: ${shlibs:Depends},
php5-xsl,
php5-curl,
php5-mcrypt,
+ php5-json,
php-soap,
+ phpgacl,
imagemagick
Description: Comprehensive medical practice management
OpenEMR is a free medical practice management, electronic medical
diff --git a/debian/dirs b/debian/dirs
index 35c38d8..5c3a63a 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,3 @@
etc/openemr/conf.d
+var/log/openemr
+var/lib/openemr/gacl/admin/templates_c
diff --git a/debian/install b/debian/install
index d7aea3b..d2a5b8a 100644
--- a/debian/install
+++ b/debian/install
@@ -29,3 +29,6 @@ sql_upgrade.php usr/share/openemr
templates usr/share/openemr
version.php usr/share/openemr
+gacl usr/share/openemr
+
+sites var/lib/openemr
diff --git a/debian/openemr-apache-ssl.conf b/debian/openemr-apache-ssl.conf
new file mode 100644
index 0000000..5c3ff8c
--- /dev/null
+++ b/debian/openemr-apache-ssl.conf
@@ -0,0 +1,64 @@
+<IfModule mod_ssl.c>
+<VirtualHost _default_:443>
+ ServerName localhost
+ ServerAdmin webmaster at localhost
+
+ DocumentRoot /usr/share/openemr
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ Require all granted
+ </Directory>
+ <Directory /usr/share/openemr>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ Order allow,deny
+ allow from all
+ </Directory>
+
+ # Pt Info Dirs that must be secured:
+ <Directory /var/www/openemr/sites/*/documents>
+ order deny,allow
+ Deny from all
+ </Directory>
+ <Directory /var/www/openemr/sites/*/edi>
+ order deny,allow
+ Deny from all
+ </Directory>
+ <Directory /var/www/openemr/sites/*/era>
+ order deny,allow
+ Deny from all
+ </Directory>
+
+
+ # This is to log all the POST data and the response so that we can see
+ # what's happening with AJAX
+ # DumpIOInput on
+ # DumpIOLogLevel notice
+ # DumpIOOutput off
+
+ ErrorLog /var/log/apache2/openemr-error-ssl.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel notice
+
+ CustomLog /var/log/apache2/openemr-access-ssl.log combined
+
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/localhost.crt
+ SSLCertificateKeyFile /etc/ssl/private/localhost.key
+
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ # MSIE 7 and newer should be able to use keepalive
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+
+</VirtualHost>
+</IfModule>
diff --git a/debian/openemr-apache.conf b/debian/openemr-apache.conf
new file mode 100644
index 0000000..ba78e13
--- /dev/null
+++ b/debian/openemr-apache.conf
@@ -0,0 +1,40 @@
+<VirtualHost *:80>
+ ServerName localhost
+ ServerAdmin webmaster at localhost
+
+ DocumentRoot /usr/share/openemr
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ Require all granted
+ </Directory>
+ <Directory /usr/share/openmer>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ Order allow,deny
+ allow from all
+ </Directory>
+
+ # Pt Info Dirs that must be secured:
+ <Directory /var/www/openemr/sites/*/documents>
+ order deny,allow
+ Deny from all
+ </Directory>
+ <Directory /var/www/openemr/sites/*/edi>
+ order deny,allow
+ Deny from all
+ </Directory>
+ <Directory /var/www/openemr/sites/*/era>
+ order deny,allow
+ Deny from all
+ </Directory>
+
+ ErrorLog /var/log/apache2/openemr-error.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel warn
+
+ CustomLog /var/log/apache2/openemr-access.log combined
+</VirtualHost>
diff --git a/debian/openemr.links b/debian/openemr.links
new file mode 100644
index 0000000..082b577
--- /dev/null
+++ b/debian/openemr.links
@@ -0,0 +1,2 @@
+/var/lib/openemr/sites /usr/share/openemr/sites
+/var/lib/openemr/gacl/admin/templates_c /usr/share/openemr/gacl/admin/templates_c
diff --git a/debian/postinst b/debian/postinst
index 6d34753..8ba0102 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -53,7 +53,7 @@ case "$1" in
CONFIGDIR=/etc/openemr
CONFIG=$CONFIGDIR/openemr.conf
TMPDIR=/tmp/openemr-tmp
- WEB=/var/www
+ WEB=/usr/share/
OPENEMR=$WEB/openemr
SITEDIR=$OPENEMR/sites
#hardcoded mysql user and database for install (not pertinent for upgrading)
@@ -338,7 +338,8 @@ case "$1" in
cd $OPENEMR
#secure openemr
- chown -Rf root:root $OPENEMR
+ # this is already done in the package for Debian
+ # chown -Rf root:root $OPENEMR
#INSTALL/CONFIGURE OPENEMR
# Install openemr
@@ -349,7 +350,8 @@ case "$1" in
fi
# Set file and directory permissions (note use default site directory for new install)
- chmod 666 $SITEDIR/default/sqlconf.php
+ chown $WEB_GROUP.$WEB_USER $SITEDIR/default/sqlconf.php
+ chmod 640 $SITEDIR/default/sqlconf.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
@@ -393,175 +395,175 @@ case "$1" in
fi
#This section configures Apache for OpenEMR
- log_only "Configuring Apache for OpenEMR"
+ #log_only "Configuring Apache for OpenEMR"
#Check to ensure the apache configuration files exists
- if [ -f $APACHE ]; then
+ #if [ -f $APACHE ]; then
# First, backup the httpd.conf file before modifying
- cp -f $APACHE $APACHE.BAK
+ # cp -f $APACHE $APACHE.BAK
# Second, append information to secure selected directories in OpenEMR
- echo "#This is the start of the Apache configuration for OpenEMR." >> $APACHE
- echo "#Below will secure directories with patient information." >> $APACHE
- echo "<Directory \"$SITEDIR/*/documents\">" >> $APACHE
- echo " order deny,allow" >> $APACHE
- echo " Deny from all" >> $APACHE
- echo "</Directory>" >> $APACHE
- echo "<Directory \"$SITEDIR/*/edi\">" >> $APACHE
- echo " order deny,allow" >> $APACHE
- echo " Deny from all" >> $APACHE
- echo "</Directory>" >> $APACHE
- echo "<Directory \"$SITEDIR/*/era\">" >> $APACHE
- echo " order deny,allow" >> $APACHE
- echo " Deny from all" >> $APACHE
- echo "</Directory>" >> $APACHE
- echo "#This is the end of the Apache configuration for OpenEMR." >> $APACHE
+ # echo "#This is the start of the Apache configuration for OpenEMR." >> $APACHE
+ # echo "#Below will secure directories with patient information." >> $APACHE
+ # echo "<Directory \"$SITEDIR/*/documents\">" >> $APACHE
+ # echo " order deny,allow" >> $APACHE
+ # echo " Deny from all" >> $APACHE
+ # echo "</Directory>" >> $APACHE
+ # echo "<Directory \"$SITEDIR/*/edi\">" >> $APACHE
+ # echo " order deny,allow" >> $APACHE
+ # echo " Deny from all" >> $APACHE
+ # echo "</Directory>" >> $APACHE
+ # echo "<Directory \"$SITEDIR/*/era\">" >> $APACHE
+ # echo " order deny,allow" >> $APACHE
+ # echo " Deny from all" >> $APACHE
+ # echo "</Directory>" >> $APACHE
+ # echo "#This is the end of the Apache configuration for OpenEMR." >> $APACHE
#let user know the plan
- prompt_input openemr/apache_configure high ret_result
- log_only "Added entries to apache configuration to secure directories with patient information."
- log_only "Placed backup of your original apache configuration file to $APACHE.BAK"
+ # prompt_input openemr/apache_configure high ret_result
+ # log_only "Added entries to apache configuration to secure directories with patient information."
+ # log_only "Placed backup of your original apache configuration file to $APACHE.BAK"
- else
+ #else
#can't find apache config file, so just echo instructions
- log_only "We recommend placing below lines into your apache configuration file:"
- log_only "#This is the start of the Apache configuration for OpenEMR."
- log_only "#Below will secure directories with patient information."
- log_only "<Directory \"$SITEDIR/*/documents\">"
- log_only " order deny,allow"
- log_only " Deny from all"
- log_only "</Directory>"
- log_only "<Directory \"$SITEDIR/*/edi\">"
- log_only " order deny,allow"
- log_only " Deny from all"
- log_only "</Directory>"
- log_only "<Directory \"$SITEDIR/*/era\">"
- log_only " order deny,allow"
- log_only " Deny from all"
- log_only "</Directory>"
- log_only "#This is the end of the Apache configuration for OpenEMR."
- fi
-
- log_only "Done configuring Apache"
+ # log_only "We recommend placing below lines into your apache configuration file:"
+ # log_only "#This is the start of the Apache configuration for OpenEMR."
+ # log_only "#Below will secure directories with patient information."
+ # log_only "<Directory \"$SITEDIR/*/documents\">"
+ # log_only " order deny,allow"
+ # log_only " Deny from all"
+ # log_only "</Directory>"
+ # log_only "<Directory \"$SITEDIR/*/edi\">"
+ # log_only " order deny,allow"
+ # log_only " Deny from all"
+ # log_only "</Directory>"
+ # log_only "<Directory \"$SITEDIR/*/era\">"
+ # log_only " order deny,allow"
+ # log_only " Deny from all"
+ # log_only "</Directory>"
+ # log_only "#This is the end of the Apache configuration for OpenEMR."
+ #fi
+
+ #log_only "Done configuring Apache"
#This Section edits the php.ini file to accomodate the proper functioning of OpenEMR using php
- log_only "Configuring PHP for OpenEMR"
+ #log_only "Configuring PHP for OpenEMR"
#check to ensure the php configuration file exists
- if [ -f $PHP ]; then
- # First, collect php variables
- collect_php () {
- echo `grep -i "^[[:space:]]*$1[[:space:]=]" $PHP | cut -d \= -f 2 | cut -d \; -f 1 | sed 's/[ M]//gi'`
- }
- TAG_TEXT="short_open_tag"
- TAG=$(collect_php "$TAG_TEXT")
- EXEC_TEXT="max_execution_time"
- EXEC=$(collect_php "$EXEC_TEXT")
- INPUT_TEXT="max_input_time"
- INPUT=$(collect_php "$INPUT_TEXT")
- MEM_TEXT="memory_limit"
- MEM=$(collect_php "$MEM_TEXT")
- DISP_TEXT="display_errors"
- DISP=$(collect_php "$DISP_TEXT")
- LOGG_TEXT="log_errors"
- LOGG=$(collect_php "$LOGG_TEXT")
- GLOB_TEXT="register_globals"
- GLOB=$(collect_php "$GLOB_TEXT")
- POST_TEXT="post_max_size"
- POST=$(collect_php "$POST_TEXT")
- UPLOAD_TEXT="file_uploads"
- UPLOAD=$(collect_php "$UPLOAD_TEXT")
- FILESIZE_TEXT="upload_max_filesize"
- FILESIZE=$(collect_php "$FILESIZE_TEXT")
- MAXINPUTVARS_TEXT="max_input_vars"
- MAXINPUTVARS=$(collect_php "$MAXINPUTVARS_TEXT")
-
+ #if [ -f $PHP ]; then
+ # # First, collect php variables
+ # collect_php () {
+ # echo `grep -i "^[[:space:]]*$1[[:space:]=]" $PHP | cut -d \= -f 2 | cut -d \; -f 1 | sed 's/[ M]//gi'`
+ # }
+ # TAG_TEXT="short_open_tag"
+ # TAG=$(collect_php "$TAG_TEXT")
+ # EXEC_TEXT="max_execution_time"
+ # EXEC=$(collect_php "$EXEC_TEXT")
+ # INPUT_TEXT="max_input_time"
+ # INPUT=$(collect_php "$INPUT_TEXT")
+ # MEM_TEXT="memory_limit"
+ # MEM=$(collect_php "$MEM_TEXT")
+ # DISP_TEXT="display_errors"
+ # DISP=$(collect_php "$DISP_TEXT")
+ # LOGG_TEXT="log_errors"
+ # LOGG=$(collect_php "$LOGG_TEXT")
+ # GLOB_TEXT="register_globals"
+ # GLOB=$(collect_php "$GLOB_TEXT")
+ # POST_TEXT="post_max_size"
+ # POST=$(collect_php "$POST_TEXT")
+ # UPLOAD_TEXT="file_uploads"
+ # UPLOAD=$(collect_php "$UPLOAD_TEXT")
+ # FILESIZE_TEXT="upload_max_filesize"
+ # FILESIZE=$(collect_php "$FILESIZE_TEXT")
+ # MAXINPUTVARS_TEXT="max_input_vars"
+ # MAXINPUTVARS=$(collect_php "$MAXINPUTVARS_TEXT")
+#
# Second, backup the php.ini file before modifying
- cp $PHP $PHP.BAK
+# cp $PHP $PHP.BAK
# Third, edit the required entries
# Do this in a for loop.
# First iteration will discover the recommended changes
# Second iteration will make the changes (if user request this)
- FLAG_ON=0
- process_php () {
- if [ "$3" -eq "1" ]; then
- # make rec to php.ini
- if [ "$FLAG_ON" -eq "0" ]; then
- log_only "We changed the following setting(s) in your php configuration file at $PHP :"
- fi
- FLAG_ON=1
- else
- # modify php.ini
- sed -i "s/^[ ]*$1[ =].*$/$1 = $2/" $PHP
- log_only "Successfully set $1 = $2"
- fi
- }
- for i in `seq 1 2`; do
- if [ "$TAG" != "On" ]; then
- process_php "$TAG_TEXT" "On" $i
- fi
- if [ "$EXEC" -lt "60" ]; then
- process_php "$EXEC_TEXT" "60" $i
- fi
- if [ "$INPUT" -lt "90" ]; then
- process_php "$INPUT_TEXT" "90" $i
- fi
- if [ "$MEM" -lt "128" ]; then
- process_php "$MEM_TEXT" "128M" $i
- fi
- if [ "$DISP" != "Off" ]; then
- process_php "$DISP_TEXT" "Off" $i
- fi
- if [ "$LOGG" != "On" ]; then
- process_php "$LOGG_TEXT" "On" $i
- fi
- if [ "$GLOB" != "Off" ]; then
- process_php "$GLOB_TEXT" "Off" $i
- fi
- if [ "$POST" -lt "30" ]; then
- process_php "$POST_TEXT" "30M" $i
- fi
- if [ "$UPLOAD" != "On" ]; then
- process_php "$UPLOAD_TEXT" "On" $i
- fi
- if [ "$FILESIZE" -lt "30" ]; then
- process_php "$FILESIZE_TEXT" "30M" $i
- fi
- if [ "$MAXINPUTVARS" -lt "3000" ]; then
- process_php "$MAXINPUTVARS_TEXT" "3000" $i
- fi
- if [ "$FLAG_ON" -eq "0" ]; then
- log_only "Your PHP configuration is perfect for OpenEMR."
- break
- else
- if [ "$i" -eq "1" ]; then
- prompt_input openemr/php_configure high ret_result
- fi
- fi
- if [ "$i" -eq "1" ]; then
- log_only "(We have placed a backup of your php configuration at $PHP.BAK)"
- fi
- done
- else
- #can't find php config file, so just echo instructions
- log_only "We recommend ensuring you have below settings in your php configuration file:"
- log_only "short_open_tag = On"
- log_only "max_execution_time = 60"
- log_only "max_input_time = 90"
- log_only "memory_limit = 128M"
- log_only "display_errors = Off"
- log_only "log_errors = On"
- log_only "register_globals = Off"
- log_only "post_max_size = 30M"
- log_only "file_uploads = On"
- log_only "upload_max_filesize = 30M"
- log_only "max_input_vars = 3000"
- log_only "(note max_input_vars setting only exists since php 5.3.9)"
- fi
-
- log_only "Done configuring PHP"
+# FLAG_ON=0
+# process_php () {
+# if [ "$3" -eq "1" ]; then
+# # make rec to php.ini
+# if [ "$FLAG_ON" -eq "0" ]; then
+# log_only "We changed the following setting(s) in your php configuration file at $PHP :"
+# fi
+# FLAG_ON=1
+# else
+# # modify php.ini
+# sed -i "s/^[ ]*$1[ =].*$/$1 = $2/" $PHP
+# log_only "Successfully set $1 = $2"
+# fi
+# }
+# for i in `seq 1 2`; do
+# if [ "$TAG" != "On" ]; then
+# process_php "$TAG_TEXT" "On" $i
+# fi
+# if [ "$EXEC" -lt "60" ]; then
+# process_php "$EXEC_TEXT" "60" $i
+# fi
+# if [ "$INPUT" -lt "90" ]; then
+# process_php "$INPUT_TEXT" "90" $i
+# fi
+# if [ "$MEM" -lt "128" ]; then
+# process_php "$MEM_TEXT" "128M" $i
+# fi
+# if [ "$DISP" != "Off" ]; then
+# process_php "$DISP_TEXT" "Off" $i
+# fi
+# if [ "$LOGG" != "On" ]; then
+# process_php "$LOGG_TEXT" "On" $i
+# fi
+# if [ "$GLOB" != "Off" ]; then
+# process_php "$GLOB_TEXT" "Off" $i
+# fi
+# if [ "$POST" -lt "30" ]; then
+# process_php "$POST_TEXT" "30M" $i
+# fi
+# if [ "$UPLOAD" != "On" ]; then
+# process_php "$UPLOAD_TEXT" "On" $i
+# fi
+# if [ "$FILESIZE" -lt "30" ]; then
+# process_php "$FILESIZE_TEXT" "30M" $i
+# fi
+# if [ "$MAXINPUTVARS" -lt "3000" ]; then
+# process_php "$MAXINPUTVARS_TEXT" "3000" $i
+# fi
+# if [ "$FLAG_ON" -eq "0" ]; then
+# log_only "Your PHP configuration is perfect for OpenEMR."
+# break
+# else
+# if [ "$i" -eq "1" ]; then
+# prompt_input openemr/php_configure high ret_result
+# fi
+# fi
+# if [ "$i" -eq "1" ]; then
+# log_only "(We have placed a backup of your php configuration at $PHP.BAK)"
+# fi
+# done
+# else
+# #can't find php config file, so just echo instructions
+# log_only "We recommend ensuring you have below settings in your php configuration file:"
+# log_only "short_open_tag = On"
+# log_only "max_execution_time = 60"
+# log_only "max_input_time = 90"
+# log_only "memory_limit = 128M"
+# log_only "display_errors = Off"
+# log_only "log_errors = On"
+# log_only "register_globals = Off"
+# log_only "post_max_size = 30M"
+# log_only "file_uploads = On"
+# log_only "upload_max_filesize = 30M"
+# log_only "max_input_vars = 3000"
+# log_only "(note max_input_vars setting only exists since php 5.3.9)"
+# fi
+
+# log_only "Done configuring PHP"
log_only "Restarting Apache service"
invoke-rc.d apache2 restart >> $LOG 2>&1
diff --git a/debian/postrm b/debian/postrm
index 48961d7..f92788e 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -29,6 +29,8 @@
# Source debconf library.
. /usr/share/debconf/confmodule
+exit 0
+
#constants
LOGDIR=/var/log/openemr
diff --git a/debian/preinst b/debian/preinst
index 9d8bf92..82f940c 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -39,6 +39,8 @@
# Source debconf library.
. /usr/share/debconf/confmodule
+exit 0
+
#constants and paths
LOGDIR=/var/log/openemr
LOG=$LOGDIR/install
diff --git a/debian/prerm b/debian/prerm
index dba3ddd..1ec4f5a 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -34,6 +34,8 @@
# Source debconf library.
. /usr/share/debconf/confmodule
+exit 0
+
case "$1" in
remove)
diff --git a/debian/rules b/debian/rules
index c112b43..f542449 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,12 @@ DH_OPTIONS := -v
# include /usr/share/cdbs/1/rules/buildvars.mk
# and use what is set there. Any hint whether dh might set variables in
# a similar manner are welcome.
-
+
%:
dh $@
+
+override_dh_link:
+ # Originally these were placed so the empty templates_c dir wouldn't be pruned but we create a link for it to /var/lib/openemr/gacl ...
+ rm debian/openemr/usr/share/openemr/gacl/admin/templates_c/README
+ rmdir debian/openemr/usr/share/openemr/gacl/admin/templates_c
+ dh_link
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openemr.git
More information about the debian-med-commit
mailing list