diff --git a/sulu/sulu-base/Makefile b/sulu/sulu-base/Makefile index ab863852d..59cf2dae9 100644 --- a/sulu/sulu-base/Makefile +++ b/sulu/sulu-base/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-base -PKG_VERSION:=2.0.8 +PKG_VERSION:=2.0.9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git -PKG_SOURCE_VERSION:=c867e8ba1f2a61e88b8c7eb4331465d2dc90c412 +PKG_SOURCE_VERSION:=6ee36a4b714de90e2e5c6f788474e35fa7fdf1b3 PKG_MIRROR_HASH:=skip SULU_MOD:=core diff --git a/sulu/sulu-builder/Makefile b/sulu/sulu-builder/Makefile index 0063e07d4..bfcb17e02 100644 --- a/sulu/sulu-builder/Makefile +++ b/sulu/sulu-builder/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-builder -PKG_VERSION:=2.0.8 +PKG_VERSION:=2.0.9 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git -PKG_SOURCE_VERSION:=cc34ec44b9d6803bc80752e2a87fbd9c476fc0dc +PKG_SOURCE_VERSION:=94b6209edf9f031f3c00338d1a38788e6ef69324 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION) diff --git a/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config b/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config index b2d0cda81..0d9cba9ec 100755 --- a/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config +++ b/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config @@ -12,7 +12,6 @@ add_sulu_nginx_uci() uci_add_list nginx _sulu_s listen "8443 http2 ssl" uci_add_list nginx _sulu_s listen "[::]:8443 http2 ssl" uci_set nginx _sulu_s server_name '_sulu_s' - uci_add_list nginx _sulu_s include 'restrict_locally' uci_add_list nginx _sulu_s include '/etc/sulu/nginx.locations' uci_set nginx _sulu_s uci_manage_ssl 'self-signed' uci_set nginx _sulu_s ssl_certificate '/etc/nginx/conf.d/_lan.crt' diff --git a/sulu/sulu-lcm/Makefile b/sulu/sulu-lcm/Makefile index 87dcef9cf..2ff58ce8f 100644 --- a/sulu/sulu-lcm/Makefile +++ b/sulu/sulu-lcm/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-lcm -PKG_VERSION:=2.0.4 +PKG_VERSION:=2.0.9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git -PKG_SOURCE_VERSION:=b3f6028fd168e58b93ae56f616e96712849c656a +PKG_SOURCE_VERSION:=e2f216d07ee2a79152d9eb1a6d2ba6f8e146ce5b PKG_MIRROR_HASH:=skip SULU_PLUGIN_INSTALL:=1 diff --git a/sulu/sulu-multi-ap/Makefile b/sulu/sulu-multi-ap/Makefile index 5311960ee..f026e20de 100644 --- a/sulu/sulu-multi-ap/Makefile +++ b/sulu/sulu-multi-ap/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-multi-ap -PKG_VERSION:=2.0.7 +PKG_VERSION:=2.0.9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git -PKG_SOURCE_VERSION:=ce924795ad6cabe054a1051fb430f515d0961bbc +PKG_SOURCE_VERSION:=9064f2d2171dd32591f724dabed348dc321a7a80 PKG_MIRROR_HASH:=skip include ../sulu-builder/sulu.mk diff --git a/sulu/sulu-parental-control/Makefile b/sulu/sulu-parental-control/Makefile index f1e8e272d..d7584f0ec 100644 --- a/sulu/sulu-parental-control/Makefile +++ b/sulu/sulu-parental-control/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sulu-parental-control -PKG_VERSION:=2.0.7 +PKG_VERSION:=2.0.9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git -PKG_SOURCE_VERSION:=83d89da5172a5921cd2fa456ca35c181fb9dd7a5 +PKG_SOURCE_VERSION:=218fa8edcd47299d692e62f7b1f90fd323dfdf7d PKG_MIRROR_HASH:=skip include ../sulu-builder/sulu.mk