X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=006f92eb3125d4481d6a65165057f2b9cbc3b3b1;hb=refs%2Ftags%2Fdebian%2F2.4.38%2Bcn10u1;hp=136ac803e50696b5b038313017222f293acb93aa;hpb=ae7c1b33ddcc1bfb1f83f29b6164db5fe03dd0c7;p=apache2-cn.git

diff --git a/debian/postinst b/debian/postinst
index 136ac80..006f92e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,7 +8,7 @@ set -e
 # Load Debconf
 . /usr/share/debconf/confmodule
 
-# Load CARNet Tools
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 PKG="apache2-cn"
@@ -52,7 +52,7 @@ cleanup () {
 
 # tag_conf()
 #
-#   Add CARNet package info lines to config's header.
+#   Add CARNET package info lines to config's header.
 #
 tag_conf () {
   local conf_file
@@ -60,19 +60,19 @@ tag_conf () {
 
   if [ -e "$conf_file" ]; then
    cat >> $conf_file <<EOF
-## Begin - Generated by CARNet package apache2-cn
+## Begin - Generated by CARNET package apache2-cn
 #
 #  REMOVE this whole block if you DON'T WANT apache2-cn
 #  to edit or undo your changes to this configuration file.
 #
-## End - Generated by CARNet package apache2-cn
+## End - Generated by CARNET package apache2-cn
 EOF
   fi
 }
 
 # chk_conf_tag ()
 #
-#   Check if configuration file has CARNet package info lines.
+#   Check if configuration file has CARNET package info lines.
 #   return:  $RET => 0 - tagged
 #                    1 - not tagged or file does not exists
 #                    2 - file exists, but it is not tagged
@@ -83,7 +83,7 @@ chk_conf_tag () {
   RET=1
 
   if [ -f "$conf_file" ]; then
-    if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" "$conf_file"; then
+    if egrep -q "^## Begin - Generated by CARNET package apache2-cn$" "$conf_file"; then
       RET=0
     else
       RET=2
@@ -133,13 +133,13 @@ install_conf() {
   conf="$CONFDIR/conf-available/$2.conf"
 
   if [ ! -e "$conf" ]; then
-    cp_echo "CN: Generating CARNet specific configuration."
+    cp_echo "CN: Generating CARNET specific configuration."
     cp "$conftmpl" "$conf"
   else
     cp_echo "CN: $conf already exists, left untouched." 1>&2
   fi
 
-  cp_echo "CN: Enabling CARNet specific configuration."
+  cp_echo "CN: Enabling CARNET specific configuration."
   a2enconf -m -q "$2"
   need_restart=1
 }
@@ -231,7 +231,7 @@ install_vhost() {
     out=$(mktemp $vhostdir/$venabled.XXXXXX)
     temp_files="${temp_files} ${out}"
 
-    # CARNet header.
+    # CARNET header.
     tag_conf "$out"
 
     if [ "$add_namevirthost" ]; then
@@ -418,7 +418,7 @@ backup_conf $CONFDIR/sites-available
 cp_echo "CN: Backup is located in directory: $BACKUPDIR/"
 
 
-# Enable Apache2 web server modules (mpm_prefork, cgi, rewrite, userdir, suexec, php7.0, ssl).
+# Enable Apache2 web server modules (mpm_prefork, cgi, rewrite, userdir, suexec, php7.3, ssl).
 #
 if [ -e "$CONF" ]; then
   cp_echo "CN: Enabling the prefork Apache2 MPM."
@@ -433,7 +433,7 @@ if [ -e "$CONF" ]; then
   a2enmod -m -q rewrite
   a2enmod -m -q userdir
   a2enmod -m -q suexec
-  a2enmod -m -q php7.0
+  a2enmod -m -q php7.3
   a2enmod -m -q ssl
 fi
 
@@ -517,7 +517,7 @@ if [ -e "$CONF" ]; then
 fi
 
 
-# Install CARNet specific configuration file.
+# Install CARNET specific configuration file.
 #
 install_conf carnet 000-carnet