Ignore:
Timestamp:
2011-04-19T17:11:02+02:00 (6 years ago)
Author:
jogo
Message:

ZNC: Fix webadmin, allow external config and minor fixes

  • Fix the webadmin module and add the themes
  • Allow providing ZNC an external config (closes #9110)
  • Allow specifying the user and group to run ZNC as (needs su when using external config)
  • Allow providing a certificate for incoming SSL connections
  • Reduce buildtime by not rebuilding everything everytime

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/znc/Makefile

    r26656 r26722  
    1010PKG_NAME:=znc 
    1111PKG_VERSION:=0.098 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    7474        $(INSTALL_DIR) $$(1)/usr/lib/znc/ 
    7575        $(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/$(strip $(3))$(subst -,_,$(strip $(1))).so $$(1)/usr/lib/znc/ 
     76        # include webadmin page templates if existing 
     77        if [ -d $$(PKG_BUILD_DIR)/modules/$(strip $(3))$(subst -,_,$(strip $(1))) ]; then \ 
     78                $(INSTALL_DIR) $$(1)/usr/share/znc/ ;\ 
     79                $(CP) -r $$(PKG_BUILD_DIR)/modules/$(strip $(3))$(subst -,_,$(strip $(1))) $$(1)/usr/share/znc/ ;\ 
     80        fi 
    7681  endef 
    7782 
     
    8085endef 
    8186 
     87define webadmin 
     88  define Package/znc-mod-webadmin 
     89    $(Package/znc/default) 
     90    TITLE+= (webadmin plugin) 
     91    DEPENDS:=znc 
     92  endef 
     93 
     94  define Package/znc-mod-webadmin/description 
     95   Allows you to add/remove/edit users and settings on the fly via a web browser. 
     96  endef 
     97 
     98  define Package/znc-mod-webadmin/install 
     99        $(INSTALL_DIR) $$(1)/usr/lib/znc/ 
     100        $(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/webadmin.so $$(1)/usr/lib/znc/ 
     101        $(INSTALL_DIR) $$(1)/usr/share/znc/ 
     102        $(CP) -r $$(PKG_BUILD_DIR)/modules/webadmin $$(1)/usr/share/znc/ 
     103        $(INSTALL_DIR) $$(1)/usr/share/znc/webskins/ 
     104        $(CP) -r $$(PKG_BUILD_DIR)/webskins/_default_ $$(1)/usr/share/znc/webskins/ 
     105  endef 
     106 
     107  ZNC_MODULES += znc-mod-webadmin 
     108  $(if $(CONFIG_PACKAGE_znc-mod-webadmin),ZNC_MODULE_TARGETS += webadmin.so) 
     109endef 
     110 
     111define webskin 
     112  define Package/znc-webskin-$(strip $(1)) 
     113    $(Package/znc/default) 
     114    TITLE+= ($(strip $(1)) webskin) 
     115    DEPENDS:=znc-mod-webadmin 
     116  endef 
     117 
     118  define Package/znc-webskin-$(strip $(1))/description 
     119    $(strip $(1)) webskin for webadmin 
     120  endef 
     121 
     122  define Package/znc-webskin-$(strip $(1))/install 
     123        $(INSTALL_DIR) $$(1)/usr/share/znc/webskins/ 
     124        $(CP) -r $$(PKG_BUILD_DIR)/webskins/$(strip $(1)) $$(1)/usr/share/znc/webskins/ 
     125  endef 
     126  ZNC_MODULES += znc-webskin-$(strip $(1)) 
     127endef 
    82128 
    83129, := , 
     
    165211        specific users and have the text sent to a special query window.)) 
    166212 
    167 $(eval $(call module,webadmin,Allows you to add/remove/edit users and settings \ 
    168         on the fly via a web browser.)) 
    169  
    170213$(eval $(call module,antiidle,Hides your idle time.,extra/)) 
    171214 
     
    204247        of your IRC client.,extra/)) 
    205248 
     249$(eval $(call webadmin)) 
     250 
     251$(eval $(call webskin,dark-clouds)) 
     252$(eval $(call webskin,forest)) 
     253$(eval $(call webskin,ice)) 
    206254 
    207255PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES)) 
Note: See TracChangeset for help on using the changeset viewer.