mdjango improvements

diff --git a/debian/libcob-ocesql.prepare b/debian/libcob-ocesql.prepare
index ae217a4e7da7ddf91bb74a8ca00649359cdc064b..ca2511564cc782db3d5257f94678c4f3ed5a7058 100755 (executable)
--- a/debian/libcob-ocesql.prepare
+++ b/debian/libcob-ocesql.prepare
@@ -3,7 +3,7 @@ set -e
 
 echo 'RSYNC_OPT = -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude="*Aktuell" --exclude=".*" --exclude="Makefile"' >> debian/rules.pre
 
 
 echo 'RSYNC_OPT = -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude="*Aktuell" --exclude=".*" --exclude="Makefile"' >> debian/rules.pre
 

-dpkg -s bison flex pkg-config make build-essential g++ automake libtool >/dev/null
+dpkg -s bison flex pkg-config make build-essential g++ automake libtool libpq-dev >/dev/null

 
 if [ ! -d Downloads ]; then
        mkdir Downloads
 
 if [ ! -d Downloads ]; then
        mkdir Downloads

diff --git a/debian/mdjango.postinst b/debian/mdjango.postinst
index d6b8a6fd7512580d62f7179a1b9340e4e230b303..e6448d1630efcedab239fe0d8ef90ac61e1cc47a 100755 (executable)
--- a/debian/mdjango.postinst
+++ b/debian/mdjango.postinst
@@ -1,8 +1,11 @@
 #!/bin/bash
 set -e
 
 #!/bin/bash
 set -e
 

+# apache2 settings

 a2ensite mysite
 systemctl reload apache2
 a2ensite mysite
 systemctl reload apache2

+# set locale for UTF-8 handling
+sed -i "s!^.*\. /etc/default/locale!\. /etc/default/locale!" /etc/apache2/envvars

 
 # check addition to settings
 if ! grep "### MDJANGO ###" /opt/mysite/mysite/settings.py >/dev/null
 
 # check addition to settings
 if ! grep "### MDJANGO ###" /opt/mysite/mysite/settings.py >/dev/null

diff --git a/mdjango/etc/mysite.conf b/mdjango/etc/mysite.conf
index 027e985074ebd249aed8fe79f3345135b6c3b273..79d0d6f43b84fe0ae2e622474cf7362c745d4af1 100644 (file)
--- a/mdjango/etc/mysite.conf
+++ b/mdjango/etc/mysite.conf
@@ -1,4 +1,4 @@
-Alias /mdjangostat/ /var/mysite/static
+Alias /mdjangostat/ /var/mysite/static/

 
 <Directory /var/mysite/static>
        Require all granted
 
 <Directory /var/mysite/static>
        Require all granted