diff options
| -rw-r--r-- | package/tvheadend/Config.in | 4 | ||||
| -rw-r--r-- | package/tvheadend/S99tvheadend | 5 | ||||
| -rw-r--r-- | package/tvheadend/accesscontrol.1 | 13 | ||||
| -rw-r--r-- | package/tvheadend/tvheadend.mk | 13 |
4 files changed, 12 insertions, 23 deletions
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 095ec65575..67a4b1419f 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_TVHEADEND https://www.lonelycoder.com/redmine/projects/tvheadend/ Note: - - a default user has been created to log in the web configuration - GUI: admin/admin; you can change it at your discretion at runtime. + - on first run, tvheadend will start in wizard mode; the webUI + is available on port 9981. - if you want Avahi support, you'll need to enable: Avahi, D-Bus, libdaemon diff --git a/package/tvheadend/S99tvheadend b/package/tvheadend/S99tvheadend index 75b66f37f2..65669ce404 100644 --- a/package/tvheadend/S99tvheadend +++ b/package/tvheadend/S99tvheadend @@ -21,6 +21,11 @@ ARGS="-f" [ -z "${TVH_HTSP_PORT}" ] || ARGS="${ARGS} -e ${TVH_HTSP_PORT}" [ "${TVH_DEBUG}" = "1" ] && ARGS="${ARGS} -s" +# If first run, start in wizard mode +if [ -z "$(ls -1 /home/tvheadend/.hts/tvheadend/accesscontrol/ 2>/dev/null)" ]; then + ARGS="${ARGS} -C" +fi + case "$1" in start) printf "Starting TVHeadend daemon: " diff --git a/package/tvheadend/accesscontrol.1 b/package/tvheadend/accesscontrol.1 deleted file mode 100644 index b920943b51..0000000000 --- a/package/tvheadend/accesscontrol.1 +++ /dev/null @@ -1,13 +0,0 @@ -{ - "enabled": 1, - "username": "admin", - "password": "admin", - "comment": "TVHeadend admin user", - "prefix": "0.0.0.0/0", - "streaming": 1, - "dvr": 1, - "dvrallcfg": 1, - "webui": 1, - "admin": 1, - "id": "1" -} diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index a7a82184b4..07577d0d05 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -107,14 +107,8 @@ TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_CLEAN_SHARE #---------------------------------------------------------------------------- # To run tvheadend, we need: # - a startup script, and its config file -# - a default DB with a tvheadend admin -# - a non-root user to run as -define TVHEADEND_INSTALL_DB - $(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \ - $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1 - chmod -R go-rwx $(TARGET_DIR)/home/tvheadend -endef -TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_INSTALL_DB +# - a non-root user to run as, and a home for it that is not accessible +# to the other users (because there will be crendentials in there) define TVHEADEND_INSTALL_INIT_SYSV $(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend @@ -124,5 +118,8 @@ endef define TVHEADEND_USERS tvheadend -1 tvheadend -1 * /home/tvheadend - video TVHeadend daemon endef +define TVHEADEND_PERMISSIONS + /home/tvheadend r 0700 tvheadend tvheadend - - - - - +endef $(eval $(generic-package)) |
