Merge pull request #229 from nupplaphil/bug/fix-locking

Fix locking

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 "$@"

2023.04/apache/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.04/fpm-alpine/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.04/fpm/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.05-rc/apache/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.05-rc/fpm-alpine/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.05-rc/fpm/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.06-dev/apache/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.06-dev/fpm-alpine/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

2023.06-dev/fpm/upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/nextcloud-init-sync.lock

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 "$@"

upgrade.exclude

@@ -7,3 +7,4 @@
 /storage/
 /log/
 *.log
+/friendica-init-sync.lock