From e776594985e5c44ecc6eef8ca840c2360efae32c Mon Sep 17 00:00:00 2001
From: Paul J Stevens
Date: Sun, 3 Sep 2023 14:18:36 +0200
Subject: [PATCH] upgrade all extensions
---
Dockerfile | 12 ++++++++----
nginx/default.conf | 2 +-
scripts/download.sh | 46 ++++++++++++++++++++++-----------------------
scripts/install.sh | 4 ++--
scripts/upgrade.sh | 13 +++++++++++--
5 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a5ef1c9..3f17355 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,12 +6,16 @@ WORKDIR /usr/src/wordpress
ENV CIVI_VERSION=5.64.0
RUN apt-get update \
- && apt-get install -yy sudo default-mysql-client \
+ && apt-get install -yy sudo less vim-tiny default-mysql-client \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
RUN usermod -s /bin/bash www-data
-RUN install -d -o www-data /var/www/.cv
-RUN install -d -o www-data wp-content/uploads/civicrm/ConfigAndLog/
COPY --chmod=750 --chown=root:www-data --link scripts/* /usr/local/bin/
-COPY wordpress/wp-content/* ./wp-content/plugins/
+COPY wordpress/wp-content/plugins ./wp-content/plugins/
+COPY wordpress/wp-content/uploads ./wp-content/uploads/
+
+RUN install -d -o www-data /var/www/.cv
+RUN install -d -o www-data wp-content/uploads/civicrm/ConfigAndLog/
+RUN install -d -o www-data wp-content/uploads/civicrm/persist/
+
diff --git a/nginx/default.conf b/nginx/default.conf
index e1a105a..3d4ea73 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -5,7 +5,7 @@ upstream wordpress {
server {
listen 80;
server_name localhost;
- root /var/www/html;
+ root /usr/src/wordpress;
client_max_body_size 32m;
index index.php;
diff --git a/scripts/download.sh b/scripts/download.sh
index bde46b8..199d8b7 100755
--- a/scripts/download.sh
+++ b/scripts/download.sh
@@ -10,17 +10,23 @@ function download_ext {
# work-around for timeout issues on lab.civicrm.org during download
name="$1"
url="$2"
+ echo -n "check ${name}..."
if [ -d "$name" ]; then
echo "skip $name"
return
fi
- filename=${TMP_DIR}$(basename $url)
+ mkdir -p ${TMP_DIR}/${name}
+
+ filename=${TMP_DIR}/${name}/$(basename $url)
if [ ! -e $filename ]; then
echo "download_ext $filename $@"
+ echo curl -L --output $filename $url
curl -L --output $filename $url
+ else
+ echo "skip download: $filename $url"
fi
filetype=$(file --brief --mime $filename|cut -f1 -d';'|cut -f2 -d/)
@@ -51,15 +57,6 @@ cd $WP_BASE/wp-content/plugins
download_ext wp-2fa https://downloads.wordpress.org/plugin/wp-2fa.2.4.1.zip
download_ext civicrm https://download.civicrm.org/civicrm-$version-wordpress.zip
-#
-#scan-classes@1.0.0
-#menu-xml@1.0.0
-#smarty-v2@1.0.0
-#setting-php@1.0.0
-#mgd-php@1.0.0
-#ang-php@1.0.0
-
-#
# install l10n
cd $WP_BASE/wp-content/plugins/civicrm
download_ext l10n https://download.civicrm.org/civicrm-$version-l10n.tar.gz
@@ -71,23 +68,26 @@ cd ${WP_BASE}/wp-content/uploads/civicrm/ext
# algemeen: velden en algemen instellingen
# rules: workflows
for repo in bij1migratie bij1rules bij1algemeen; do
- [ -e crm-${repo} ] || git clone --depth 1 https://lab.civicrm.org/partners/civicoop/bij1/crm-${repo}.git
+ [ -e ${repo} ] || git clone --depth 1 https://lab.civicrm.org/partners/civicoop/bij1/${repo}.git
done
+
download_ext de.systopia.identitytracker https://github.com/systopia/de.systopia.identitytracker/releases/download/1.3/de.systopia.identitytracker-1.3.zip
-download_ext org.project60.banking https://github.com/Project60/org.project60.banking/releases/download/0.7/org.project60.banking-0.7.zip
-download_ext assignee https://lab.civicrm.org/extensions/assignee/-/archive/1.3/assignee-1.3.zip
+download_ext org.project60.banking https://github.com/Project60/org.project60.banking/releases/download/0.8.3/org.project60.banking-0.8.3.zip
+download_ext assignee https://lab.civicrm.org/extensions/assignee/-/archive/1.4/assignee-1.4.zip
download_ext apikey https://lab.civicrm.org/extensions/apikey/-/archive/v1.3.5/apikey-v1.3.5.zip
-download_ext dataprocessor https://lab.civicrm.org/extensions/dataprocessor/-/archive/1.57/dataprocessor-1.57.zip
+download_ext dataprocessor https://lab.civicrm.org/extensions/dataprocessor/-/archive/1.78/dataprocessor-1.78.zip
download_ext emailapi https://lab.civicrm.org/extensions/emailapi/-/archive/2.9/emailapi-2.9.zip
-download_ext action-provider https://lab.civicrm.org/extensions/action-provider/-/archive/1.125/action-1.125.zip
-download_ext form-processor https://lab.civicrm.org/extensions/form-processor/-/archive/1.58/form-1.58.zip
+download_ext action-provider https://lab.civicrm.org/extensions/action-provider/-/archive/1.127/action-1.127.zip
+download_ext form-processor https://lab.civicrm.org/extensions/form-processor/-/archive/1.60/form-1.60.zip
download_ext de.systopia.xcm https://github.com/systopia/de.systopia.xcm/releases/download/1.8/de.systopia.xcm-1.8.zip
-download_ext group2summary https://github.com/TechToThePeople/group2summary/archive/v1.5.zip
-download_ext org.project60.bic https://github.com/Project60/org.project60.bic/releases/download/1.2/org.project60.bic-1.2.zip
-download_ext org.project60.sepa https://github.com/Project60/org.project60.sepa/archive/1.6.0.zip
-download_ext org.civicrm.contactlayout https://github.com/civicrm/org.civicrm.contactlayout/archive/2.1.2.zip
-download_ext org.civicrm.recentmenu https://github.com/civicrm/org.civicrm.recentmenu/archive/1.3.zip
-download_ext civirules https://lab.civicrm.org/extensions/civirules/-/archive/2.43/civirules-2.43.zip
+download_ext group2summary https://lab.civicrm.org/extensions/group2summary/-/archive/1.6/group2summary-1.6.zip
+download_ext org.project60.bic https://github.com/Project60/org.project60.bic/releases/download/1.8.0/org.project60.bic-1.8.0.zip
+download_ext org.project60.sepa https://github.com/Project60/org.project60.sepa/archive/refs/tags/1.9.1.zip
+download_ext org.civicrm.contactlayout https://github.com/civicrm/org.civicrm.contactlayout/archive/2.2.1.zip
+download_ext org.civicrm.recentmenu https://github.com/civicrm/org.civicrm.recentmenu/archive/1.5.zip
+download_ext civirules https://lab.civicrm.org/extensions/civirules/-/archive/2.49/civirules-2.49.zip
download_ext org.wikimedia.relationshipblock https://github.com/eileenmcnaughton/org.wikimedia.relationshipblock/archive/1.6.zip
-download_ext uk.co.vedaconsulting.mosaico https://download.civicrm.org/extension/uk.co.vedaconsulting.mosaico/2.9.1645644008/uk.co.vedaconsulting.mosaico-2.9.1645644008.zip
+download_ext uk.co.vedaconsulting.mosaico https://download.civicrm.org/extension/uk.co.vedaconsulting.mosaico/3.2.1691060437/uk.co.vedaconsulting.mosaico-3.2.1691060437.zip
+
+#
diff --git a/scripts/install.sh b/scripts/install.sh
index 072a97f..2a68a02 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -20,7 +20,7 @@ wp config set DB_NAME "$WORDPRESS_DB_NAME"
wp config set DB_USER "$WORDPRESS_DB_USER"
wp config set DB_PASSWORD "$WORDPRESS_DB_PASSWORD"
wp config set CIVICRM_PLUGIN_DIR "${BASE_DIR}/wp-content/plugins/civicrm/"
-wp config set CIVICRM_PLUGIN_URL "https://${WORDPRESS_HOST}/wp-content/plugins/civicrm/"
+wp config set CIVICRM_PLUGIN_URL "http://${WORDPRESS_HOST}/wp-content/plugins/civicrm/"
# Install
wp db check
@@ -34,7 +34,7 @@ rm -f -- wp-content/uploads/civicrm/civicrm.settings.php
cv --no-interaction core:install -vv --setup-path=$PLUGIN_DIR/civicrm \
--src-path=$PLUGIN_DIR/civicrm/civicrm \
--user=www-data \
- --cms-base-url="https://${WORDPRESS_HOST}" \
+ --cms-base-url="http://${WORDPRESS_HOST}" \
--lang=$LANG \
--db "mysql://$WORDPRESS_DB_USER:$WORDPRESS_DB_PASSWORD@$WORDPRESS_DB_HOST/$CIVI_DB_NAME"
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index f0fd6f5..bb6d40d 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -1,8 +1,17 @@
+#
+# werk de genoemde extensies Action Provider en Form Processor bij
+# verwerk de DB upgrades (je wordt geprompt met een alert rechtsbovenin het venster als je naar Beheer>Systeeminstellingen>Extensies navigeert)
+# clean caches in de CiviCRM User Interface (of maak map ...../civicrm/templates_c leeg)
+# download de BIJ1 specifieke extensies BIJ1 Algemeen en Bij1 Migratie
+# verwerk de DB upgrades (je wordt geprompt met een alert rechtsbovenin het venster als je naar Beheer>Systeeminstellingen>Extensies navigeert)
+# clean caches in de CiviCRM User Interface (of maak map ...../civicrm/templates_c leeg)
+#
+BASE_DIR=/usr/src/wordpress
cv upgrade:db
# Install extensions
-cd wp-content/uploads/civicrm/ext
+cd ${BASE_DIR}/wp-content/uploads/civicrm/ext
# extensions
cv ext:enable --user="$WORDPRESS_ADMIN_USER" org.civicrm.search_kit
@@ -35,7 +44,7 @@ cv ext:enable --user="$WORDPRESS_ADMIN_USER" uk.co.vedaconsulting.mosaico
cv ext:upgrade-db --user="$WORDPRESS_ADMIN_USER"
# wordpress plugins
-cd /var/www/html
+cd ${BASE_DIR}
wp plugin install --activate civicrm-admin-utilities wpforms-lite wp-2fa
# remove unused