bookworm support

Author: cyberb

.drone.jsonnet

@@ -9,11 +9,11 @@ fi
 
 case $1 in
 start)
-    ${DIR}/nginx/sbin/nginx -t -c /var/snap/platform/current/nginx.conf -e stderr
-    exec $DIR/nginx/sbin/nginx -c /var/snap/platform/current/nginx.conf -e stderr
+    ${DIR}/nginx/bin/nginx.sh -t -c /var/snap/platform/current/nginx.conf -e stderr
+    exec $DIR/nginx/bin/nginx.sh -c /var/snap/platform/current/nginx.conf -e stderr
     ;;
 reload)
-    $DIR/nginx/sbin/nginx -c /var/snap/platform/current/nginx.conf -s reload -e stderr
+    $DIR/nginx/bin/nginx.sh -c /var/snap/platform/current/nginx.conf -s reload -e stderr
     ;;
 *)
     echo "not valid command"

bin/service.nginx-public.sh

@@ -1,3 +1,4 @@
 #!/bin/bash -e
 
-cp /snap/platform/current/certs/* /usr/share/ca-certificates/mozilla/
+cp /snap/platform/current/certs/* /usr/share/ca-certificates/mozilla/
+/usr/sbin/update-ca-certificates

bin/update_certs.sh

@@ -22,8 +22,8 @@ http {
     fastcgi_temp_path /var/snap/platform/current/nginx/public_fastcgi_temp;
     uwsgi_temp_path /var/snap/platform/current/nginx/public_uwsgi_temp;
     scgi_temp_path /var/snap/platform/current/nginx/public_scgi_temp;
-    include /snap/platform/current/nginx/conf/mime.types;
-    
+    include /snap/platform/current/nginx/etc/nginx/mime.types;
+
     client_max_body_size 10G;
     proxy_send_timeout 600s;
     proxy_read_timeout 600s;

config/nginx/public.conf

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
+LIBS=$(echo ${DIR}/lib/*-linux-gnu*)
+LIBS=$LIBS:$(echo ${DIR}/usr/lib/*-linux-gnu*)
+${DIR}/lib/*-linux*/ld-*.so --library-path $LIBS ${DIR}/usr/sbin/nginx "$@"

nginx/bin/nginx.sh

@@ -0,0 +1,13 @@
+#!/bin/sh -ex
+
+DIR=$( cd "$( dirname "$0" )" && pwd )
+cd ${DIR}
+
+BUILD_DIR=${DIR}/../build/snap/nginx
+mkdir -p ${BUILD_DIR}
+cp -r /etc ${BUILD_DIR}
+cp -r /opt ${BUILD_DIR}
+cp -r /usr ${BUILD_DIR}
+cp -r /bin ${BUILD_DIR}
+cp -r /lib ${BUILD_DIR}
+cp -r ${DIR}/bin/* ${BUILD_DIR}/bin

nginx/build.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -ex
+
+DIR=$( cd "$( dirname "$0" )" && pwd )
+cd ${DIR}
+
+BUILD_DIR=${DIR}/../build/snap/nginx
+${BUILD_DIR}/bin/nginx.sh -version

nginx/test.sh

@@ -25,9 +25,6 @@ wget http://ftp.us.debian.org/debian/pool/main/c/ca-certificates/ca-certificates
 dpkg -x ca-certificates_${CA_CERTIFICATES_VERSION}_all.deb .
 mv usr/share/ca-certificates/mozilla ${BUILD_DIR}/certs
 
-wget --retry-on-http-error=503 --progress=dot:giga https://github.com/syncloud/3rdparty/releases/download/nginx/nginx-${ARCH}.tar.gz
-tar xf nginx-${ARCH}.tar.gz
-mv nginx ${BUILD_DIR}
 wget --retry-on-http-error=503 --progress=dot:giga https://github.com/syncloud/3rdparty/releases/download/gptfdisk/gptfdisk-${ARCH}.tar.gz
 tar xf gptfdisk-${ARCH}.tar.gz
 mv gptfdisk ${BUILD_DIR}

package.sh

@@ -572,11 +572,18 @@ def test_remove(device):
     device.run_ssh('snap remove platform')
 
 
-def test_install_stable_from_store(device, device_host):
-    device.run_ssh('snap install platform', retries=10)
+#remove after bookworm is working
+def test_bookworm(device, app_archive_path, device_host):
+    local_install(device_host, LOGS_SSH_PASSWORD, app_archive_path)
     device.run_ssh('/snap/platform/current/openldap/bin/ldapsearch.sh -x -w syncloud -D "dc=syncloud,dc=org" -b "ou=users,dc=syncloud,dc=org" > {0}/ldapsearch.old.log'.format(TMP_DIR), throw=False)
 
 
+#restore after bookworm is working
+#def test_install_stable_from_store(device, device_host):
+#    device.run_ssh('snap install platform', retries=10)
+#    device.run_ssh('/snap/platform/current/openldap/bin/ldapsearch.sh -x -w syncloud -D "dc=syncloud,dc=org" -b "ou=users,dc=syncloud,dc=org" > {0}/ldapsearch.old.log'.format(TMP_DIR), throw=False)
+
+
 def test_activate_stable(device, device_host, main_domain, device_user, device_password, arch):
     def activate():
         response = requests.post('https://{0}/rest/activate/custom'.format(device_host),