mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sulu: 1.3.23

Browse source
This commit is contained in:
vdutta 2022-12-16 20:26:52 +05:30
parent 5ed51849bb
commit 08a31cccad
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sulu-builder/Config.in
View file

@ -13,7 +13,7 @@ menu "SULU_CORE"
config SULU_CORE_VERSION
string "SULU repo version"
default "1c98f370f4acb188aa1e013c75a8e1c16299a51a"
default "c35a171b22b97ccba76cbf80e0d66f35fe52ffad"
endmenu
menu "SULU_PLUGIN_LCM"
@ -57,7 +57,7 @@ menu "SULU_PLUGIN_MULTIAP"
config SULU_PLUGIN_MULTIAP_VERSION
depends on SULU_PLUGIN_MULTIAP_ENABLE
string "Version"
default "a4c91a74a1336f6f0fe62765e11e2ef808bd2842"
default "602ba5fdf5ca1a73bfacb299d791c5dfd84e4d90"
endmenu
menu "SULU_THEME_IOPSYS"

6
sulu-builder/Makefile
View file

@ -5,11 +5,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sulu-builder
PKG_VERSION:=1.3.22
PKG_VERSION:=1.3.23
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
PKG_SOURCE_VERSION:=9eff3bc4ef4ebecee01a068975d17f79fd47a42a
PKG_SOURCE_VERSION:=afd1edb12c156724bea31abd008870ccbe5caa41
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=skip
@ -174,7 +174,7 @@ endif
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-sulu-config $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/99-add-sulu-nginx-config $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-nginx-config $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/01-update-nginx-uci-template $(1)/etc/uci-defaults/
endef

2
sulu-builder/files/etc/mosquitto/conf.d/sulu.conf
View file

@ -1,4 +1,4 @@
listener 9009 127.0.0.1
listener 9001
protocol websockets
require_certificate false
allow_anonymous false

2
sulu-builder/files/etc/uci-defaults/01-update-nginx-uci-template
View file

@ -4,7 +4,7 @@ UCI_TEMPLATE="/etc/nginx/uci.conf.template"
update_nginx_uci_template()
{
sed -i '/#UCI_HTTP_CONFIG$/i\ map $http_upgrade $connection_upgrade { default upgrade; "" close; }' ${UCI_TEMPLATE}
sed -i '/#UCI_HTTP_CONFIG$/i\ upstream websocket { server 127.0.0.1:9009; }' ${UCI_TEMPLATE}
sed -i '/#UCI_HTTP_CONFIG$/i\ upstream websocket { server 127.0.0.1:9001; }' ${UCI_TEMPLATE}
}
update_nginx_uci_template

0
sulu-builder/files/etc/uci-defaults/99-add-sulu-nginx-config → sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config
View file

6
sulu/Makefile
View file

@ -5,11 +5,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sulu
PKG_VERSION:=1.3.22
PKG_VERSION:=1.3.23
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
PKG_SOURCE_VERSION:=9eff3bc4ef4ebecee01a068975d17f79fd47a42a
PKG_SOURCE_VERSION:=afd1edb12c156724bea31abd008870ccbe5caa41
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@ -61,7 +61,7 @@ endif
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-sulu-config $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/99-add-sulu-nginx-config $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-nginx-config $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/01-update-nginx-uci-template $(1)/etc/uci-defaults/
endef

2
sulu/files/etc/mosquitto/conf.d/sulu.conf
View file

@ -1,4 +1,4 @@
listener 9009 127.0.0.1
listener 9001
protocol websockets
require_certificate false
allow_anonymous false

2
sulu/files/etc/uci-defaults/01-update-nginx-uci-template
View file

@ -4,7 +4,7 @@ UCI_TEMPLATE="/etc/nginx/uci.conf.template"
update_nginx_uci_template()
{
sed -i '/#UCI_HTTP_CONFIG$/i\ map $http_upgrade $connection_upgrade { default upgrade; "" close; }' ${UCI_TEMPLATE}
sed -i '/#UCI_HTTP_CONFIG$/i\ upstream websocket { server 127.0.0.1:9009; }' ${UCI_TEMPLATE}
sed -i '/#UCI_HTTP_CONFIG$/i\ upstream websocket { server 127.0.0.1:9001; }' ${UCI_TEMPLATE}
}
update_nginx_uci_template

0
sulu/files/etc/uci-defaults/99-add-sulu-nginx-config → sulu/files/etc/uci-defaults/40-add-sulu-nginx-config
View file