summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rwxr-xr-xapplications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp10
-rw-r--r--applications/luci-app-ahcp/root/usr/share/ucitrack/luci-app-ahcp.json4
-rwxr-xr-xapplications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns9
-rw-r--r--applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint11
-rw-r--r--applications/luci-app-dynapoint/root/usr/share/ucitrack/luci-app-dynapoint.json4
-rw-r--r--applications/luci-app-firewall/root/usr/share/ucitrack/luci-app-firewall.json9
-rw-r--r--applications/luci-app-irqbalance/root/etc/uci-defaults/90_luci-irqbalance10
-rw-r--r--applications/luci-app-irqbalance/root/usr/share/ucitrack/luci-app-irqbalance.json4
-rw-r--r--applications/luci-app-libreswan/root/etc/uci-defaults/802-luci-app-libreswan8
-rw-r--r--applications/luci-app-libreswan/root/usr/share/ucitrack/luci-app-libreswan.json4
-rwxr-xr-xapplications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna9
-rwxr-xr-xapplications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan36
-rwxr-xr-xapplications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr13
-rw-r--r--applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr.json4
-rw-r--r--applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr6.json4
-rwxr-xr-xapplications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd10
-rw-r--r--applications/luci-app-p910nd/root/usr/share/ucitrack/luci-app-p910nd.json4
-rwxr-xr-xapplications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo10
-rw-r--r--applications/luci-app-polipo/root/usr/share/ucitrack/luci-app-polipo.json4
-rwxr-xr-xapplications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy10
-rw-r--r--applications/luci-app-qos/root/usr/share/ucitrack/luci-app-qos.json4
-rwxr-xr-xapplications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale10
-rw-r--r--applications/luci-app-samba4/root/usr/share/ucitrack/luci-app-samba4.json4
-rw-r--r--applications/luci-app-splash/root/usr/share/ucitrack/luci-app-splash.json4
-rwxr-xr-xapplications/luci-app-sqm/root/etc/uci-defaults/50-luci-sqm12
-rw-r--r--applications/luci-app-sqm/root/usr/share/ucitrack/luci-app-sqm.json7
-rw-r--r--applications/luci-app-tinyproxy/root/usr/share/ucitrack/luci-app-tinyproxy.json4
-rwxr-xr-xapplications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp10
-rw-r--r--applications/luci-app-upnp/root/usr/share/ucitrack/luci-app-upnp.json4
-rw-r--r--applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat10
-rw-r--r--applications/luci-app-watchcat/root/usr/share/ucitrack/luci-app-watchcat.json4
31 files changed, 72 insertions, 148 deletions
diff --git a/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp b/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
deleted file mode 100755
index c0270a33c6..0000000000
--- a/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@ahcpd[-1]
- add ucitrack ahcpd
- set ucitrack.@ahcpd[-1].init=ahcpd
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-ahcp/root/usr/share/ucitrack/luci-app-ahcp.json b/applications/luci-app-ahcp/root/usr/share/ucitrack/luci-app-ahcp.json
new file mode 100644
index 0000000000..38a99c5f4b
--- /dev/null
+++ b/applications/luci-app-ahcp/root/usr/share/ucitrack/luci-app-ahcp.json
@@ -0,0 +1,4 @@
+{
+ "config": "ahcpd",
+ "init": "ahcpd"
+}
diff --git a/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns b/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
deleted file mode 100755
index 9923e8677e..0000000000
--- a/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# no longer needed for "Save and Apply" to restart ddns
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@ddns[-1]
- commit ucitrack
-EOF
-
-return 0
diff --git a/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint b/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint
deleted file mode 100644
index 0ffa34d762..0000000000
--- a/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# needed for "Save and Apply" to restart dynapoint
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@dynapoint[-1]
- add ucitrack dynapoint
- set ucitrack.@dynapoint[-1].init="dynapoint"
- commit dynapoint
-EOF
-
-exit 0
diff --git a/applications/luci-app-dynapoint/root/usr/share/ucitrack/luci-app-dynapoint.json b/applications/luci-app-dynapoint/root/usr/share/ucitrack/luci-app-dynapoint.json
new file mode 100644
index 0000000000..a81e9b09dd
--- /dev/null
+++ b/applications/luci-app-dynapoint/root/usr/share/ucitrack/luci-app-dynapoint.json
@@ -0,0 +1,4 @@
+{
+ "config": "dynapoint",
+ "init": "dynapoint"
+}
diff --git a/applications/luci-app-firewall/root/usr/share/ucitrack/luci-app-firewall.json b/applications/luci-app-firewall/root/usr/share/ucitrack/luci-app-firewall.json
new file mode 100644
index 0000000000..4d1d9f919f
--- /dev/null
+++ b/applications/luci-app-firewall/root/usr/share/ucitrack/luci-app-firewall.json
@@ -0,0 +1,9 @@
+{
+ "config": "firewall",
+ "init": "firewall",
+ "affects": [
+ "luci-splash",
+ "qos",
+ "miniupnpd"
+ ]
+}
diff --git a/applications/luci-app-irqbalance/root/etc/uci-defaults/90_luci-irqbalance b/applications/luci-app-irqbalance/root/etc/uci-defaults/90_luci-irqbalance
deleted file mode 100644
index e6ec84c4db..0000000000
--- a/applications/luci-app-irqbalance/root/etc/uci-defaults/90_luci-irqbalance
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@irqbalance[-1]
- add ucitrack irqbalance
- set ucitrack.@irqbalance[-1].init=irqbalance
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-irqbalance/root/usr/share/ucitrack/luci-app-irqbalance.json b/applications/luci-app-irqbalance/root/usr/share/ucitrack/luci-app-irqbalance.json
new file mode 100644
index 0000000000..2c6b93f6e8
--- /dev/null
+++ b/applications/luci-app-irqbalance/root/usr/share/ucitrack/luci-app-irqbalance.json
@@ -0,0 +1,4 @@
+{
+ "config": "irqbalance",
+ "init": "irqbalance"
+}
diff --git a/applications/luci-app-libreswan/root/etc/uci-defaults/802-luci-app-libreswan b/applications/luci-app-libreswan/root/etc/uci-defaults/802-luci-app-libreswan
deleted file mode 100644
index 6383335666..0000000000
--- a/applications/luci-app-libreswan/root/etc/uci-defaults/802-luci-app-libreswan
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@libreswan[-1]
- add ucitrack libreswan
- set ucitrack.@libreswan[-1].init=ipsec
- commit ucitrack
-EOF
diff --git a/applications/luci-app-libreswan/root/usr/share/ucitrack/luci-app-libreswan.json b/applications/luci-app-libreswan/root/usr/share/ucitrack/luci-app-libreswan.json
new file mode 100644
index 0000000000..5bfe1e9d4b
--- /dev/null
+++ b/applications/luci-app-libreswan/root/usr/share/ucitrack/luci-app-libreswan.json
@@ -0,0 +1,4 @@
+{
+ "config": "libreswan",
+ "init": "ipsec"
+}
diff --git a/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna b/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
deleted file mode 100755
index 8a73b955a5..0000000000
--- a/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.minidlna
- set ucitrack.minidlna=minidlna
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 b/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
index d79f648672..414146b5e6 100755
--- a/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
+++ b/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
@@ -1,11 +1,5 @@
#!/bin/sh
-# remove existing mwan ucitrack entry is now done with procd
-uci -q batch <<-EOF >/dev/null
- del ucitrack.@mwan3[-1]
- commit ucitrack
-EOF
-
uci -q get mwan3.globals >/dev/null || {
uci -q add mwan3 globals >/dev/null
uci -q rename mwan3.@globals[-1]="globals" >/dev/null
diff --git a/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr b/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
deleted file mode 100755
index a941abd54c..0000000000
--- a/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@olsrd[-1]
- add ucitrack olsrd
- set ucitrack.@olsrd[-1].init=olsrd
- delete ucitrack.@olsrd6[-1]
- add ucitrack olsrd6
- set ucitrack.@olsrd6[-1].init=olsrd6
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr.json b/applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr.json
new file mode 100644
index 0000000000..e98139f68d
--- /dev/null
+++ b/applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr.json
@@ -0,0 +1,4 @@
+{
+ "config": "olsrd",
+ "init": "olsrd"
+}
diff --git a/applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr6.json b/applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr6.json
new file mode 100644
index 0000000000..5b4960110f
--- /dev/null
+++ b/applications/luci-app-olsr/root/usr/share/ucitrack/luci-app-olsr6.json
@@ -0,0 +1,4 @@
+{
+ "config": "olsrd6",
+ "init": "olsrd6"
+}
diff --git a/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd b/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
deleted file mode 100755
index d1b629fdee..0000000000
--- a/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@p910nd[-1]
- add ucitrack p910nd
- set ucitrack.@p910nd[-1].init=p910nd
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-p910nd/root/usr/share/ucitrack/luci-app-p910nd.json b/applications/luci-app-p910nd/root/usr/share/ucitrack/luci-app-p910nd.json
new file mode 100644
index 0000000000..4cf7c53f7b
--- /dev/null
+++ b/applications/luci-app-p910nd/root/usr/share/ucitrack/luci-app-p910nd.json
@@ -0,0 +1,4 @@
+{
+ "config": "p910nd",
+ "init": "p910nd"
+}
diff --git a/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo b/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
deleted file mode 100755
index 60af421389..0000000000
--- a/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@polipo[-1]
- add ucitrack polipo
- set ucitrack.@polipo[-1].init=polipo
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-polipo/root/usr/share/ucitrack/luci-app-polipo.json b/applications/luci-app-polipo/root/usr/share/ucitrack/luci-app-polipo.json
new file mode 100644
index 0000000000..a68a368034
--- /dev/null
+++ b/applications/luci-app-polipo/root/usr/share/ucitrack/luci-app-polipo.json
@@ -0,0 +1,4 @@
+{
+ "config": "polipo",
+ "init": "polipo"
+}
diff --git a/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy b/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
deleted file mode 100755
index 884f7e5572..0000000000
--- a/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# no longer needed for "Save and Apply" to restart privoxy
-# luci-app-privoxy calls /etc/init.d/privoxy reload
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@privoxy[-1]
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-qos/root/usr/share/ucitrack/luci-app-qos.json b/applications/luci-app-qos/root/usr/share/ucitrack/luci-app-qos.json
new file mode 100644
index 0000000000..27b50d59d8
--- /dev/null
+++ b/applications/luci-app-qos/root/usr/share/ucitrack/luci-app-qos.json
@@ -0,0 +1,4 @@
+{
+ "config": "qos",
+ "init": "qos"
+}
diff --git a/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale b/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
deleted file mode 100755
index a5064b520f..0000000000
--- a/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# no longer needed for "Save and Apply" to restart radicale
-# luci-app-radicale calls /etc/init.d/radicale reload
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@radicale[-1]
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-samba4/root/usr/share/ucitrack/luci-app-samba4.json b/applications/luci-app-samba4/root/usr/share/ucitrack/luci-app-samba4.json
new file mode 100644
index 0000000000..b50a8ddc54
--- /dev/null
+++ b/applications/luci-app-samba4/root/usr/share/ucitrack/luci-app-samba4.json
@@ -0,0 +1,4 @@
+{
+ "config": "samba",
+ "init": "samba"
+}
diff --git a/applications/luci-app-splash/root/usr/share/ucitrack/luci-app-splash.json b/applications/luci-app-splash/root/usr/share/ucitrack/luci-app-splash.json
new file mode 100644
index 0000000000..0d1ffe16bb
--- /dev/null
+++ b/applications/luci-app-splash/root/usr/share/ucitrack/luci-app-splash.json
@@ -0,0 +1,4 @@
+{
+ "config": "luci_splash",
+ "init": "luci_splash"
+}
diff --git a/applications/luci-app-sqm/root/etc/uci-defaults/50-luci-sqm b/applications/luci-app-sqm/root/etc/uci-defaults/50-luci-sqm
deleted file mode 100755
index b3aa47c6da..0000000000
--- a/applications/luci-app-sqm/root/etc/uci-defaults/50-luci-sqm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@sqm[-1]
- add ucitrack sqm
- set ucitrack.@sqm[-1].init=sqm
- del_list ucitrack.@firewall[0].affects=sqm
- add_list ucitrack.@firewall[0].affects=sqm
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-sqm/root/usr/share/ucitrack/luci-app-sqm.json b/applications/luci-app-sqm/root/usr/share/ucitrack/luci-app-sqm.json
new file mode 100644
index 0000000000..ea72acf226
--- /dev/null
+++ b/applications/luci-app-sqm/root/usr/share/ucitrack/luci-app-sqm.json
@@ -0,0 +1,7 @@
+{
+ "config": "sqm",
+ "init": "sqm",
+ "affects": [
+ "sqm"
+ ]
+}
diff --git a/applications/luci-app-tinyproxy/root/usr/share/ucitrack/luci-app-tinyproxy.json b/applications/luci-app-tinyproxy/root/usr/share/ucitrack/luci-app-tinyproxy.json
new file mode 100644
index 0000000000..252144ffee
--- /dev/null
+++ b/applications/luci-app-tinyproxy/root/usr/share/ucitrack/luci-app-tinyproxy.json
@@ -0,0 +1,4 @@
+{
+ "config": "tinyproxy",
+ "init": "tinyproxy"
+}
diff --git a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
deleted file mode 100755
index f63d648c06..0000000000
--- a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@upnpd[-1]
- add ucitrack upnpd
- set ucitrack.@upnpd[-1].init=miniupnpd
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-upnp/root/usr/share/ucitrack/luci-app-upnp.json b/applications/luci-app-upnp/root/usr/share/ucitrack/luci-app-upnp.json
new file mode 100644
index 0000000000..a9e190261c
--- /dev/null
+++ b/applications/luci-app-upnp/root/usr/share/ucitrack/luci-app-upnp.json
@@ -0,0 +1,4 @@
+{
+ "config": "upnpd",
+ "init": "miniupnpd"
+}
diff --git a/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat b/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
deleted file mode 100644
index 02a7f09783..0000000000
--- a/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@watchcat[-1]
- add ucitrack watchcat
- set ucitrack.@watchcat[-1].init=watchcat
- commit ucitrack
-EOF
-
-exit 0
diff --git a/applications/luci-app-watchcat/root/usr/share/ucitrack/luci-app-watchcat.json b/applications/luci-app-watchcat/root/usr/share/ucitrack/luci-app-watchcat.json
new file mode 100644
index 0000000000..616dd1fb79
--- /dev/null
+++ b/applications/luci-app-watchcat/root/usr/share/ucitrack/luci-app-watchcat.json
@@ -0,0 +1,4 @@
+{
+ "config": "watchcat",
+ "init": "watchcat"
+}