From c9de2abb904d6b5ace3f7f107872594fade59efc Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Sat, 14 Sep 2024 10:10:47 -0400
Subject: [PATCH] Remove DSM 6 code
---
spk/bicbucstriim/Makefile | 10 --
spk/bicbucstriim/src/service-setup.sh | 144 ------------------
spk/bicbucstriim/src/web/bicbucstriim.conf | 16 --
spk/bicbucstriim/src/web/bicbucstriim.json | 25 ---
spk/bicbucstriim/src/wizard/install_uifile.sh | 52 -------
5 files changed, 247 deletions(-)
delete mode 100644 spk/bicbucstriim/src/web/bicbucstriim.conf
delete mode 100644 spk/bicbucstriim/src/web/bicbucstriim.json
delete mode 100644 spk/bicbucstriim/src/wizard/install_uifile.sh
diff --git a/spk/bicbucstriim/Makefile b/spk/bicbucstriim/Makefile
index 9e1f0e0dd1e..85bf78a0c01 100644
--- a/spk/bicbucstriim/Makefile
+++ b/spk/bicbucstriim/Makefile
@@ -19,8 +19,6 @@ HOMEPAGE = https://github.com/mikespub-org/rvolz-BicBucStriim/
LICENSE = MIT
LICENSE_FILE = $(WORK_DIR)/$(SPK_NAME)/LICENSE
-WIZARDS_DIR = src/wizard/
-
SYSTEM_GROUP = http
# Admin link for in DSM UI
@@ -35,12 +33,4 @@ SERVICE_USER = auto
SERVICE_SETUP = src/service-setup.sh
STARTABLE = no
-POST_STRIP_TARGET = bicbucstriim_extra_install
-
include ../../mk/spksrc.spk.mk
-
-.PHONY: bicbucstriim_extra_install
-bicbucstriim_extra_install:
- install -m 755 -d $(STAGING_DIR)/web
- install -m 644 src/web/bicbucstriim.conf $(STAGING_DIR)/web/bicbucstriim.conf
- install -m 644 src/web/bicbucstriim.json $(STAGING_DIR)/web/bicbucstriim.json
diff --git a/spk/bicbucstriim/src/service-setup.sh b/spk/bicbucstriim/src/service-setup.sh
index e5165364894..cc0e4880669 100755
--- a/spk/bicbucstriim/src/service-setup.sh
+++ b/spk/bicbucstriim/src/service-setup.sh
@@ -1,156 +1,12 @@
# Package
PACKAGE="bicbucstriim"
-DNAME="BicBucStriim"
SHORTNAME="bbs"
-SC_PKG_PREFIX="com-synocommunity-packages-"
-PACKAGE_NAME="${SC_PKG_PREFIX}${SHORTNAME}"
# Others
-SYNOSVC="/usr/syno/sbin/synoservice"
WEB_DIR="/var/services/web_packages"
-# for backwards compatability
-if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ];then
- WEB_DIR="/var/services/web"
-fi
WEB_ROOT="${WEB_DIR}/${SHORTNAME}"
-if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
- WEB_USER="http"
- WEB_GROUP="http"
-fi
-
-validate_preinst ()
-{
- # Check for modification to PHP template defaults on DSM 6
- if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
- WS_TMPL_PATH="/var/packages/WebStation/target/misc"
- WS_TMPL_FILE="php74_fpm.mustache"
- FULL_WS_TMPL_FILE="${WS_TMPL_PATH}/${WS_TMPL_FILE}"
- # Check for PHP template defaults
- if ! grep -q -E '^user = http$' "${FULL_WS_TMPL_FILE}" || ! grep -q -E '^listen\.owner = http$' "${FULL_WS_TMPL_FILE}"; then
- echo "PHP template defaults have been modified. Installation is not supported."
- exit 1
- fi
- fi
-}
-
-service_postinst ()
-{
- # Web interface setup for DSM 6 -- used by INSTALL and UPGRADE
- if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
- # Install the web interface
- echo "Installing web interface"
- ${MKDIR} ${WEB_ROOT}
- rsync -aX ${SYNOPKG_PKGDEST}/share/${SHORTNAME}/ ${WEB_ROOT} 2>&1
-
- # Install web configurations
- TEMPDIR="${SYNOPKG_PKGTMP}/web"
- ${MKDIR} ${TEMPDIR}
- WS_CFG_DIR="/usr/syno/etc/packages/WebStation"
- WS_CFG_FILE="WebStation.json"
- WS_CFG_PATH="${WS_CFG_DIR}/${WS_CFG_FILE}"
- TMP_WS_CFG_PATH="${TEMPDIR}/${WS_CFG_FILE}"
- PHP_CFG_FILE="PHPSettings.json"
- PHP_CFG_PATH="${WS_CFG_DIR}/${PHP_CFG_FILE}"
- TMP_PHP_CFG_PATH="${TEMPDIR}/${PHP_CFG_FILE}"
- PHP_PROF_NAME="Default PHP 7.4 Profile"
- WS_BACKEND="$(jq -r '.default.backend' ${WS_CFG_PATH})"
- WS_PHP="$(jq -r '.default.php' ${WS_CFG_PATH})"
- RESTART_APACHE="no"
- RSYNC_ARCH_ARGS="--backup --suffix=.bak --remove-source-files"
- # Check if Apache is the selected back-end
- if [ ! "$WS_BACKEND" = "2" ]; then
- echo "Set Apache as the back-end server"
- jq '.default.backend = 2' ${WS_CFG_PATH} > ${TMP_WS_CFG_PATH}
- rsync -aX ${RSYNC_ARCH_ARGS} ${TMP_WS_CFG_PATH} ${WS_CFG_DIR}/ 2>&1
- RESTART_APACHE="yes"
- fi
- # Check if default PHP profile is selected
- if [ -z "$WS_PHP" ] || [ "$WS_PHP" = "null" ]; then
- echo "Enable default PHP profile"
- # Locate default PHP profile
- PHP_PROF_ID="$(jq -r '. | to_entries[] | select(.value | type == "object" and .profile_desc == "'"$PHP_PROF_NAME"'") | .key' "${PHP_CFG_PATH}")"
- jq ".default.php = \"$PHP_PROF_ID\"" "${WS_CFG_PATH}" > ${TMP_WS_CFG_PATH}
- rsync -aX ${RSYNC_ARCH_ARGS} ${TMP_WS_CFG_PATH} ${WS_CFG_DIR}/ 2>&1
- RESTART_APACHE="yes"
- fi
- # Check for PHP profile
- if ! jq -e ".[\"${PACKAGE_NAME}\"]" "${PHP_CFG_PATH}" >/dev/null; then
- echo "Add PHP profile for ${DNAME}"
- jq --slurpfile ocNode ${SYNOPKG_PKGDEST}/web/${PACKAGE}.json '.["'"${PACKAGE_NAME}"'"] = $ocNode[0]' ${PHP_CFG_PATH} > ${TMP_PHP_CFG_PATH}
- rsync -aX ${RSYNC_ARCH_ARGS} ${TMP_PHP_CFG_PATH} ${WS_CFG_DIR}/ 2>&1
- RESTART_APACHE="yes"
- fi
- # Check for Apache config
- if [ ! -f "/usr/local/etc/apache24/sites-enabled/${PACKAGE}.conf" ]; then
- echo "Add Apache config for ${DNAME}"
- rsync -aX ${SYNOPKG_PKGDEST}/web/${PACKAGE}.conf /usr/local/etc/apache24/sites-enabled/ 2>&1
- RESTART_APACHE="yes"
- fi
- # Restart Apache if configs have changed
- if [ "$RESTART_APACHE" = "yes" ]; then
- if jq -e 'to_entries | map(select((.key | startswith("'"${SC_PKG_PREFIX}"'")) and .key != "'"${PACKAGE_NAME}"'")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then
- echo " [WARNING] Multiple PHP profiles detected, will require restart of DSM to load new configs"
- else
- echo "Restart Apache to load new configs"
- ${SYNOSVC} --restart pkgctl-Apache2.4
- fi
- fi
- # Clean-up temporary files
- ${RM} ${TEMPDIR}
-
- # Fix permissions
- chown -R ${WEB_USER}:${WEB_GROUP} ${WEB_ROOT}
- chmod -R u+rw ${WEB_ROOT}/data
- fi
-}
-
-service_postuninst ()
-{
- # Web interface removal for DSM 6 -- used by UNINSTALL and UPGRADE
- if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
- # Remove the web interface
- echo "Removing web interface"
- ${RM} ${WEB_ROOT}
-
- # Remove web configurations
- TEMPDIR="${SYNOPKG_PKGTMP}/web"
- ${MKDIR} ${TEMPDIR}
- WS_CFG_DIR="/usr/syno/etc/packages/WebStation"
- PHP_CFG_FILE="PHPSettings.json"
- PHP_CFG_PATH="${WS_CFG_DIR}/${PHP_CFG_FILE}"
- TMP_PHP_CFG_PATH="${TEMPDIR}/${PHP_CFG_FILE}"
- RESTART_APACHE="no"
- RSYNC_ARCH_ARGS="--backup --suffix=.bak --remove-source-files"
- # Check for PHP profile
- if jq -e ".[\"${PACKAGE_NAME}\"]" "${PHP_CFG_PATH}" >/dev/null; then
- echo "Removing PHP profile for ${DNAME}"
- jq 'del(.["'"${PACKAGE_NAME}"'"])' ${PHP_CFG_PATH} > ${TMP_PHP_CFG_PATH}
- rsync -aX ${RSYNC_ARCH_ARGS} ${TMP_PHP_CFG_PATH} ${WS_CFG_DIR}/ 2>&1
- ${RM} "${WS_CFG_DIR}/php_profile/${PACKAGE_NAME}"
- RESTART_APACHE="yes"
- fi
- # Check for Apache config
- if [ -f "/usr/local/etc/apache24/sites-enabled/${PACKAGE}.conf" ]; then
- echo "Removing Apache config for ${DNAME}"
- ${RM} /usr/local/etc/apache24/sites-enabled/${PACKAGE}.conf
- RESTART_APACHE="yes"
- fi
- # Restart Apache if configs have changed
- if [ "$RESTART_APACHE" = "yes" ]; then
- if jq -e 'to_entries | map(select((.key | startswith("'"${SC_PKG_PREFIX}"'")) and .key != "'"${PACKAGE_NAME}"'")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then
- echo " [WARNING] Multiple PHP profiles detected, will require restart of DSM to load new configs"
- else
- echo "Restart Apache to load new configs"
- ${SYNOSVC} --restart pkgctl-Apache2.4
- fi
- fi
- # Clean-up temporary files
- ${RM} ${TEMPDIR}
- fi
-}
-
service_save ()
{
# Save data
diff --git a/spk/bicbucstriim/src/web/bicbucstriim.conf b/spk/bicbucstriim/src/web/bicbucstriim.conf
deleted file mode 100644
index 3c50619236c..00000000000
--- a/spk/bicbucstriim/src/web/bicbucstriim.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-Alias "/bbs" "/var/services/web/bbs"
-
-
- ProxySet timeout=3600
-
-
-
-
-
- SetHandler "proxy:fcgi://bicbucstriim"
-
-
-
- DirectoryIndex index.php index.htm index.html
-
-
diff --git a/spk/bicbucstriim/src/web/bicbucstriim.json b/spk/bicbucstriim/src/web/bicbucstriim.json
deleted file mode 100644
index f41cbb6ac19..00000000000
--- a/spk/bicbucstriim/src/web/bicbucstriim.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "backend": 8,
- "custom_open_basedir": false,
- "display_errors": false,
- "enable_cache": true,
- "enable_xdebug": false,
- "extensions": [
- "gd",
- "intl",
- "pdo_sqlite",
- "sodium",
- "sqlite3"
- ],
- "fpm_settings": {
- "max_children": 20,
- "max_spare_servers": 3,
- "min_spare_servers": 1,
- "mode": "dynamic",
- "start_servers": 2
- },
- "open_basedir": "",
- "php_settings": {},
- "profile_desc": "PHP Profile for bicbucstriim",
- "profile_name": "bicbucstriim Profile"
-}
\ No newline at end of file
diff --git a/spk/bicbucstriim/src/wizard/install_uifile.sh b/spk/bicbucstriim/src/wizard/install_uifile.sh
deleted file mode 100644
index 3b1b7a7c1e4..00000000000
--- a/spk/bicbucstriim/src/wizard/install_uifile.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-quote_json ()
-{
- sed -e 's|\\|\\\\|g' -e 's|\"|\\\"|g'
-}
-
-page_append ()
-{
- if [ -z "$1" ]; then
- echo "$2"
- elif [ -z "$2" ]; then
- echo "$1"
- else
- echo "$1,$2"
- fi
-}
-
-# Check for multiple PHP profiles
-check_php_profiles ()
-{
- SHORTNAME="bbs"
- SC_PKG_PREFIX="com-synocommunity-packages-"
- PACKAGE_NAME="${SC_PKG_PREFIX}${SHORTNAME}"
- PHP_CFG_PATH="/usr/syno/etc/packages/WebStation/PHPSettings.json"
- if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ] && \
- jq -e 'to_entries | map(select((.key | startswith("'"${SC_PKG_PREFIX}"'")) and .key != "'"${PACKAGE_NAME}"'")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then
- return 0 # true
- else
- return 1 # false
- fi
-}
-
-PAGE_PHP_PROFILES=$(/bin/cat< "${SYNOPKG_TEMP_LOGFILE}"
-}
-
-main "$@"