Merge pull request #5850 from stricaud/debian_2_4_125

Updates on debian package for 2.4.125

build-deb.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
+if [ ! -d ./app/Lib/cakephp/app ]
+then
+    echo "CakePHP has not been pulled."
+    echo "Make sure all submodules are intialized and updated. Please run:"
+    echo "git submodule init"
+    echo "git submodule update"
+    exit 1
+fi
 
 dpkg-buildpackage -b -rfakeroot -us -uc
 

debian/changelog

@@ -1,3 +1,9 @@
+misp (2.4.125-1) UNRELEASED; urgency=low
+
+  * Bump to release 2.4.125
+
+ -- Sebastien Tricaud <sebastien.tricaud@devo.com>  Fri, 1 May 2020 17:32:05 -0800
+
 misp (2.4.123-1) UNRELEASED; urgency=low
 
   * Bump to release 2.4.123

debian/install

@@ -6,3 +6,4 @@ cti-python-stix2 usr/share/misp
 PyMISP usr/share/misp
 INSTALL/MYSQL.sql usr/share/doc/misp
 INSTALL/misp-workers.service usr/share/doc/misp
+INSTALL/setup/config.php usr/share/misp/app/Plugin/CakeResque/Config

debian/postinst

@@ -36,8 +36,6 @@ if [ "$1" = "configure" ] ; then
 
    a2dissite 000-default || true
    a2ensite misp.apache2 || true
-   a2enmod rewrite
-   a2enmod headers
    
    db_get misp/mariadb_host
    HOST=$RET
@@ -53,8 +51,8 @@ if [ "$1" = "configure" ] ; then
    BASEURL=$RET
    db_stop
 
-   mysql -h$HOST -uroot -p$ROOTPWD -e "CREATE USER IF NOT EXISTS '$MISPDBUSER'@'localhost' IDENTIFIED BY '$MISPDBUSERPWD';"
+   mysql -h$HOST -uroot -p$ROOTPWD -e "CREATE USER IF NOT EXISTS '$MISPDBUSER'@'%' IDENTIFIED BY '$MISPDBUSERPWD';"
-   mysql -h$HOST -uroot -p$ROOTPWD -e "GRANT ALL PRIVILEGES ON misp.* TO '$MISPDBUSER'@'localhost';"
+   mysql -h$HOST -uroot -p$ROOTPWD -e "GRANT ALL PRIVILEGES ON misp.* TO '$MISPDBUSER'@'%';"
    mysql -h$HOST -uroot -p$ROOTPWD -e "FLUSH PRIVILEGES;"
    echo "Creating MISP Database..."
    mysql -h$HOST -uroot -p$ROOTPWD -e "CREATE DATABASE $MISPDB;" && gunzip < /usr/share/doc/misp/MYSQL.sql.gz | mysql -h$HOST -u$MISPDBUSER -p$MISPDBUSERPWD $MISPDB || true
@@ -80,7 +78,7 @@ if [ "$1" = "configure" ] ; then
    chmod +x /usr/share/misp/app/Console/worker/start.sh
    cat /usr/share/doc/misp/misp-workers.service > /etc/systemd/system/misp-workers.service
    sed -i -E "s/\/var\/www\/MISP/\/usr\/share\/misp/" /etc/systemd/system/misp-workers.service
-#   systemctl daemon-reload
+
 #   systemctl enable --now misp-workers
 fi
 

preinst

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+a2enmod rewrite || true
+a2enmod headers || true