From e9d8daaccf19bbaa95ca8c44e63f08351fe6ed24 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 19 May 2023 16:48:59 +0200
Subject: [PATCH] Fix locking

---
 2023.04/apache/entrypoint.sh           | 4 ++--
 2023.04/apache/upgrade.exclude         | 1 +
 2023.04/fpm-alpine/entrypoint.sh       | 4 ++--
 2023.04/fpm-alpine/upgrade.exclude     | 1 +
 2023.04/fpm/entrypoint.sh              | 4 ++--
 2023.04/fpm/upgrade.exclude            | 1 +
 2023.05-rc/apache/entrypoint.sh        | 4 ++--
 2023.05-rc/apache/upgrade.exclude      | 1 +
 2023.05-rc/fpm-alpine/entrypoint.sh    | 4 ++--
 2023.05-rc/fpm-alpine/upgrade.exclude  | 1 +
 2023.05-rc/fpm/entrypoint.sh           | 4 ++--
 2023.05-rc/fpm/upgrade.exclude         | 1 +
 2023.06-dev/apache/entrypoint.sh       | 4 ++--
 2023.06-dev/apache/upgrade.exclude     | 1 +
 2023.06-dev/fpm-alpine/entrypoint.sh   | 4 ++--
 2023.06-dev/fpm-alpine/upgrade.exclude | 1 +
 2023.06-dev/fpm/entrypoint.sh          | 4 ++--
 2023.06-dev/fpm/upgrade.exclude        | 1 +
 docker-entrypoint.sh                   | 4 ++--
 upgrade.exclude                        | 1 +
 20 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/2023.04/apache/entrypoint.sh b/2023.04/apache/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.04/apache/entrypoint.sh
+++ b/2023.04/apache/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.04/apache/upgrade.exclude b/2023.04/apache/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.04/apache/upgrade.exclude
+++ b/2023.04/apache/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.04/fpm-alpine/entrypoint.sh b/2023.04/fpm-alpine/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.04/fpm-alpine/entrypoint.sh
+++ b/2023.04/fpm-alpine/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.04/fpm-alpine/upgrade.exclude b/2023.04/fpm-alpine/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.04/fpm-alpine/upgrade.exclude
+++ b/2023.04/fpm-alpine/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.04/fpm/entrypoint.sh b/2023.04/fpm/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.04/fpm/entrypoint.sh
+++ b/2023.04/fpm/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.04/fpm/upgrade.exclude b/2023.04/fpm/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.04/fpm/upgrade.exclude
+++ b/2023.04/fpm/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.05-rc/apache/entrypoint.sh b/2023.05-rc/apache/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.05-rc/apache/entrypoint.sh
+++ b/2023.05-rc/apache/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.05-rc/apache/upgrade.exclude b/2023.05-rc/apache/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.05-rc/apache/upgrade.exclude
+++ b/2023.05-rc/apache/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.05-rc/fpm-alpine/entrypoint.sh b/2023.05-rc/fpm-alpine/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.05-rc/fpm-alpine/entrypoint.sh
+++ b/2023.05-rc/fpm-alpine/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.05-rc/fpm-alpine/upgrade.exclude b/2023.05-rc/fpm-alpine/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.05-rc/fpm-alpine/upgrade.exclude
+++ b/2023.05-rc/fpm-alpine/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.05-rc/fpm/entrypoint.sh b/2023.05-rc/fpm/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.05-rc/fpm/entrypoint.sh
+++ b/2023.05-rc/fpm/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.05-rc/fpm/upgrade.exclude b/2023.05-rc/fpm/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.05-rc/fpm/upgrade.exclude
+++ b/2023.05-rc/fpm/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.06-dev/apache/entrypoint.sh b/2023.06-dev/apache/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.06-dev/apache/entrypoint.sh
+++ b/2023.06-dev/apache/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.06-dev/apache/upgrade.exclude b/2023.06-dev/apache/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.06-dev/apache/upgrade.exclude
+++ b/2023.06-dev/apache/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.06-dev/fpm-alpine/entrypoint.sh b/2023.06-dev/fpm-alpine/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.06-dev/fpm-alpine/entrypoint.sh
+++ b/2023.06-dev/fpm-alpine/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.06-dev/fpm-alpine/upgrade.exclude b/2023.06-dev/fpm-alpine/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.06-dev/fpm-alpine/upgrade.exclude
+++ b/2023.06-dev/fpm-alpine/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/2023.06-dev/fpm/entrypoint.sh b/2023.06-dev/fpm/entrypoint.sh
index 0cead90..b080cef 100755
--- a/2023.06-dev/fpm/entrypoint.sh
+++ b/2023.06-dev/fpm/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/2023.06-dev/fpm/upgrade.exclude b/2023.06-dev/fpm/upgrade.exclude
index b3420cc..9572f87 100644
--- a/2023.06-dev/fpm/upgrade.exclude
+++ b/2023.06-dev/fpm/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0cead90..b080cef 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
   (
     if ! flock -n 9; then
         # If we couldn't get it immediately, show a message, then wait for real
-        echo "Another process is initializing Nextcloud. Waiting..."
+        echo "Another process is initializing Friendica. Waiting..."
         flock 9
     fi
 
@@ -179,7 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
-  ) 9> /var/www/html/nextcloud-init-sync.lock
+  ) 9> /var/www/html/friendica-init-sync.lock
 fi
 
 exec "$@"
diff --git a/upgrade.exclude b/upgrade.exclude
index b3420cc..4f94596 100644
--- a/upgrade.exclude
+++ b/upgrade.exclude
@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/friendica-init-sync.lock