Fix configuration retention bug

luci-app-ssr-plus/Makefile

@@ -1,11 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
-PKG_VERSION:=180
-PKG_RELEASE:=10
+PKG_VERSION:=181
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/$(PKG_NAME)/conffiles
+/etc/config/shadowsocksr
+/etc/ssr/
+endef
+
 define Package/$(PKG_NAME)/config
 config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
 	bool "Include Shadowsocks V2ray Plugin"

luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus

@@ -11,21 +11,58 @@ set firewall.shadowsocksr.path=/var/etc/shadowsocksr.include
 set firewall.shadowsocksr.reload=1
 commit firewall
 EOF
+rm -rf /etc/config/shadowsocksr-opkg /etc/ssr/*opkg
 touch /etc/ssr/china_ssr.txt
+touch /etc/ssr/deny.list
 touch /etc/ssr/white.list
 touch /etc/ssr/black.list
 touch /etc/ssr/netflix.list
 touch /etc/ssr/netflixip.list
-touch /etc/ssr/ad.conf
+touch /etc/ssr/gfw_base.conf
 touch /etc/ssr/gfw_list.conf
-touch /etc/ssr/deny.list
-#chmod 0755 /etc/init.d/shadowsocksr /usr/bin/ssr-* /usr/share/shadowsocksr/*.sh
-#chmod 0644 /etc/ssr/* \
-#/usr/share/shadowsocksr/*.lua \
-#/usr/share/rpcd/acl.d/luci-app-ssr-plus.json \
-#/usr/lib/lua/luci/controller/shadowsocksr.lua \
-#/usr/lib/lua/luci/model/cbi/shadowsocksr/*.lua \
-#/usr/lib/lua/luci/view/shadowsocksr/*.htm
-#chmod 0600 /etc/config/shadowsocksr
+touch /etc/ssr/oversea_list.conf
+touch /etc/ssr/ad.conf
+touch /etc/config/shadowsocksr
+if [ ! -s "/etc/config/shadowsocksr" ] ; then
+uci -q batch <<-EOF >/dev/null
+add shadowsocksr global
+set shadowsocksr.@global[0].global_server='nil'
+set shadowsocksr.@global[0].netflix_server='nil'
+set shadowsocksr.@global[0].netflix_proxy='0'
+set shadowsocksr.@global[0].threads='0'
+set shadowsocksr.@global[0].run_mode='router'
+set shadowsocksr.@global[0].dports='2'
+set shadowsocksr.@global[0].pdnsd_enable='1'
+set shadowsocksr.@global[0].tunnel_forward='8.8.4.4:53'
+set shadowsocksr.@global[0].monitor_enable='1'
+set shadowsocksr.@global[0].enable_switch='1'
+set shadowsocksr.@global[0].switch_time='667'
+set shadowsocksr.@global[0].switch_timeout='5'
+set shadowsocksr.@global[0].switch_try_count='3'
+set shadowsocksr.@global[0].gfwlist_url='https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt'
+set shadowsocksr.@global[0].chnroute_url='https://ispip.clang.cn/all_cn.txt'
+set shadowsocksr.@global[0].nfip_url='https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt'
+set shadowsocksr.@global[0].adblock_url='https://anti-ad.net/anti-ad-for-dnsmasq.conf'
+add shadowsocksr server_subscribe
+set shadowsocksr.@server_subscribe[0].proxy='0'
+set shadowsocksr.@server_subscribe[0].auto_update_time='2'
+set shadowsocksr.@server_subscribe[0].auto_update='1'
+set shadowsocksr.@server_subscribe[0].filter_words='过期时间/剩余流量/QQ群/官网/防失联地址/回国'
+add shadowsocksr access_control
+set shadowsocksr.@access_control[0].lan_ac_mode='0'
+set shadowsocksr.@access_control[0].router_proxy='1'
+add_list shadowsocksr.@access_control[0].wan_fw_ips=149.154.160.0/20
+add_list shadowsocksr.@access_control[0].wan_fw_ips=67.198.55.0/24
+add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.4.0/22
+add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.56.0/22
+add_list shadowsocksr.@access_control[0].wan_fw_ips=109.239.140.0/24
+add shadowsocksr socks5_proxy
+set shadowsocksr.@socks5_proxy[0].server='nil'
+set shadowsocksr.@socks5_proxy[0].local_port='1080'
+add shadowsocksr server_global
+set shadowsocksr.@server_global[0].enable_server='0'
+commit shadowsocksr
+EOF
+fi
 rm -rf /tmp/luci-modulecache /tmp/luci-indexcache
 exit 0

luci-app-ssr-plus/root/lib/upgrade/keep.d/luci-app-ssr-plus

@@ -1,9 +0,0 @@
-/etc/config/shadowsocksr
-/etc/ssr/china_ssr.txt
-/etc/ssr/white.list
-/etc/ssr/black.list
-/etc/ssr/netflix.list
-/etc/ssr/netflixip.list
-/etc/ssr/gfw_list.conf
-/etc/ssr/ad.conf
-/etc/ssr/deny.list