From bdead1246e75e5a38e985d50992bf2fe9ad48e14 Mon Sep 17 00:00:00 2001
From: Florian Maurer <f.maurer@outlook.de>
Date: Wed, 3 Jan 2024 19:52:01 +0100
Subject: [PATCH] ff-ap-timer: rename package and infos
* update makefiles
* add license from https://github.com/FreifunkHochstift/ffho-packages/blob/master/LICENSE
---
ff-ap-timer/Makefile | 20 ++++++++++++-------
ff-ap-timer/{ReadMe.md => README.md} | 5 +++--
.../gluon/upgrade/900-remove-aptimer-config | 2 --
ff-web-ap-timer/Makefile | 20 ++++++++++++-------
ff-web-ap-timer/README.md | 7 +++++++
ff-web-ap-timer/ReadMe.md | 4 ----
.../config-mode/controller/admin/ap-timer.lua | 2 +-
.../config-mode/model/admin/ap-timer.lua | 2 +-
8 files changed, 38 insertions(+), 24 deletions(-)
rename ff-ap-timer/{ReadMe.md => README.md} (81%)
delete mode 100755 ff-ap-timer/files/lib/gluon/upgrade/900-remove-aptimer-config
create mode 100644 ff-web-ap-timer/README.md
delete mode 100644 ff-web-ap-timer/ReadMe.md
diff --git a/ff-ap-timer/Makefile b/ff-ap-timer/Makefile
index 1222420..1f1be77 100644
--- a/ff-ap-timer/Makefile
+++ b/ff-ap-timer/Makefile
@@ -1,22 +1,28 @@
+# SPDX-FileCopyrightText: 2023 kb-light, Michael Schwarz, Florian Maurer
+# SPDX-License-Identifier: BSD-2-Clause
include $(TOPDIR)/rules.mk
-PKG_NAME:=ffho-ap-timer
+PKG_NAME:=ff-ap-timer
PKG_VERSION:=1
+PKG_LICENSE:=BSD-2-Clause
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(TOPDIR)/../package/gluon.mk
-define Package/ffho-ap-timer
- SECTION:=ffho
- CATEGORY:=FFHO
+define Package/$(PKG_NAME)
+ SECTION:=gluon
+ CATEGORY:=Gluon
TITLE:=Timer for the client wifi
DEPENDS:=+gluon-core
- MAINTAINER:=Freifunk Hochstift <kontakt@hochstift.freifunk.net>
endef
-define Package/ffho-ap-timer/description
- Timer for the client wifi
+define Package/$(PKG_NAME)/conffiles
+/etc/config/ap-timer
+endef
+
+define Package/$(PKG_NAME)/description
+ Allow to turn client wifi on and off on set schedule
endef
$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ff-ap-timer/ReadMe.md b/ff-ap-timer/README.md
similarity index 81%
rename from ff-ap-timer/ReadMe.md
rename to ff-ap-timer/README.md
index 8820777..2ec2640 100644
--- a/ff-ap-timer/ReadMe.md
+++ b/ff-ap-timer/README.md
@@ -1,7 +1,8 @@
-ffho-ap-timer
+ff-ap-timer
=============
-Timer for the client wifi with three modes (daily, weekly, monthly)
+Timer for the client wifi with three modes (daily, weekly, monthly).
+The ff-ap-timer module can turn the client_radio on and off, but does not touch mesh or private wifi configuration.
/etc/config/ap-timer
-------------------
diff --git a/ff-ap-timer/files/lib/gluon/upgrade/900-remove-aptimer-config b/ff-ap-timer/files/lib/gluon/upgrade/900-remove-aptimer-config
deleted file mode 100755
index fc7a40b..0000000
--- a/ff-ap-timer/files/lib/gluon/upgrade/900-remove-aptimer-config
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rm -f /etc/config/aptimer
diff --git a/ff-web-ap-timer/Makefile b/ff-web-ap-timer/Makefile
index 4ee9c55..139faee 100644
--- a/ff-web-ap-timer/Makefile
+++ b/ff-web-ap-timer/Makefile
@@ -1,18 +1,24 @@
+# SPDX-FileCopyrightText: 2023 kb-light, Michael Schwarz, Florian Maurer
+# SPDX-License-Identifier: BSD-2-Clause
include $(TOPDIR)/rules.mk
-PKG_NAME:=ffho-web-ap-timer
+PKG_NAME:=ff-web-ap-timer
PKG_VERSION:=1
+PKG_LICENSE:=BSD-2-Clause
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include $(TOPDIR)/../package/gluon.mk
-define Package/ffho-web-ap-timer
- SECTION:=ffho
- CATEGORY:=FFHO
- TITLE:=Luci module for ap-timer settings
- DEPENDS:=+gluon-web-admin
- MAINTAINER:=Freifunk Hochstift <kontakt@hochstift.freifunk.net>
+define Package/$(PKG_NAME)
+ SECTION:=gluon
+ CATEGORY:=Gluon
+ TITLE:=Web module for ap-timer settings
+ DEPENDS:=+gluon-web-admin +ff-ap-timer
+endef
+
+define Package/$(PKG_NAME)/description
+ Gluon-web module for ap-timer settings
endef
$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ff-web-ap-timer/README.md b/ff-web-ap-timer/README.md
new file mode 100644
index 0000000..9d31a94
--- /dev/null
+++ b/ff-web-ap-timer/README.md
@@ -0,0 +1,7 @@
+ff-web-ap-timer
+=================
+
+Gluon-web module for ap-timer settings.
+
+This allows to set the configuration of the ff-ap-timer from the web-ui in the config mode.
+The ff-ap-timer module can turn the client_radio on and off, but does not touch mesh or private wifi configuration.
\ No newline at end of file
diff --git a/ff-web-ap-timer/ReadMe.md b/ff-web-ap-timer/ReadMe.md
deleted file mode 100644
index 7eaa0b5..0000000
--- a/ff-web-ap-timer/ReadMe.md
+++ /dev/null
@@ -1,4 +0,0 @@
-ffho-web-ap-timer
-=================
-
-Gluon-web module for ap-timer settings.
diff --git a/ff-web-ap-timer/luasrc/lib/gluon/config-mode/controller/admin/ap-timer.lua b/ff-web-ap-timer/luasrc/lib/gluon/config-mode/controller/admin/ap-timer.lua
index 6944c16..523ddaa 100644
--- a/ff-web-ap-timer/luasrc/lib/gluon/config-mode/controller/admin/ap-timer.lua
+++ b/ff-web-ap-timer/luasrc/lib/gluon/config-mode/controller/admin/ap-timer.lua
@@ -1,2 +1,2 @@
-package 'ffho-web-ap-timer'
+package 'ff-web-ap-timer'
entry({"admin", "ap-timer"}, model("admin/ap-timer"), _("AP Timer"), 30)
diff --git a/ff-web-ap-timer/luasrc/lib/gluon/config-mode/model/admin/ap-timer.lua b/ff-web-ap-timer/luasrc/lib/gluon/config-mode/model/admin/ap-timer.lua
index 9d02bb2..bc46a0d 100644
--- a/ff-web-ap-timer/luasrc/lib/gluon/config-mode/model/admin/ap-timer.lua
+++ b/ff-web-ap-timer/luasrc/lib/gluon/config-mode/model/admin/ap-timer.lua
@@ -1,6 +1,6 @@
local uci = require('simple-uci').cursor()
-pkg_i18n = i18n 'ffho-web-ap-timer'
+pkg_i18n = i18n 'ff-web-ap-timer'
if not uci:get('ap-timer', 'settings') then
uci:section('ap-timer', 'ap-timer', 'settings')
--
GitLab