mirror of
https://github.com/ntop/n2n.git
synced 2024-10-18 15:42:49 +05:30
Merge pull request #406 from nanpuyue/2.8-openwrt
fix(openwrt): move config to `/etc/n2n` (2.8-stable)
This commit is contained in:
commit
d93a61ef05
@ -56,7 +56,7 @@ define Build/Configure
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/n2n-edge/conffiles
|
define Package/n2n-edge/conffiles
|
||||||
/etc/config/n2n-edge.conf
|
/etc/n2n/edge.conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/n2n-edge/install
|
define Package/n2n-edge/install
|
||||||
@ -64,12 +64,12 @@ define Package/n2n-edge/install
|
|||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/edge $(1)/usr/bin/
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/edge $(1)/usr/bin/
|
||||||
$(INSTALL_DIR) $(1)/etc/init.d
|
$(INSTALL_DIR) $(1)/etc/init.d
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/packages/openwrt/etc/init.d/edge $(1)/etc/init.d/edge
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/packages/openwrt/etc/init.d/edge $(1)/etc/init.d/edge
|
||||||
$(INSTALL_DIR) $(1)/etc/config
|
$(INSTALL_DIR) $(1)/etc/n2n
|
||||||
$(INSTALL_CONF) $(PKG_BUILD_DIR)/packages/etc/n2n/edge.conf.sample $(1)/etc/config/n2n-edge.conf
|
$(INSTALL_CONF) $(PKG_BUILD_DIR)/packages/etc/n2n/edge.conf.sample $(1)/etc/n2n/edge.conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/n2n-supernode/conffiles
|
define Package/n2n-supernode/conffiles
|
||||||
/etc/config/n2n-supernode.conf
|
/etc/n2n/supernode.conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/n2n-supernode/install
|
define Package/n2n-supernode/install
|
||||||
@ -77,8 +77,8 @@ define Package/n2n-supernode/install
|
|||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/supernode $(1)/usr/bin/
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/supernode $(1)/usr/bin/
|
||||||
$(INSTALL_DIR) $(1)/etc/init.d
|
$(INSTALL_DIR) $(1)/etc/init.d
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/packages/openwrt/etc/init.d/supernode $(1)/etc/init.d/supernode
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/packages/openwrt/etc/init.d/supernode $(1)/etc/init.d/supernode
|
||||||
$(INSTALL_DIR) $(1)/etc/config
|
$(INSTALL_DIR) $(1)/etc/n2n
|
||||||
$(INSTALL_CONF) $(PKG_BUILD_DIR)/packages/etc/n2n/supernode.conf.sample $(1)/etc/config/n2n-supernode.conf
|
$(INSTALL_CONF) $(PKG_BUILD_DIR)/packages/etc/n2n/supernode.conf.sample $(1)/etc/n2n/supernode.conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,n2n-edge))
|
$(eval $(call BuildPackage,n2n-edge))
|
||||||
|
@ -33,7 +33,7 @@ copied to the target device, and installed with `opkg install`.
|
|||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
The edge node can be started with `/etc/init.d/edge start`.
|
The edge node can be started with `/etc/init.d/edge start`.
|
||||||
Its configuration file is `/etc/config/n2n-edge.conf`.
|
Its configuration file is `/etc/n2n/edge.conf`.
|
||||||
|
|
||||||
The supernode can be started with `/etc/init.d/supernode start`.
|
The supernode can be started with `/etc/init.d/supernode start`.
|
||||||
Its configuration file is `/etc/config/n2n-supernode.conf`.
|
Its configuration file is `/etc/n2n/supernode.conf`.
|
||||||
|
@ -4,7 +4,7 @@ STOP=10
|
|||||||
|
|
||||||
USE_PROCD=1
|
USE_PROCD=1
|
||||||
PROG=/usr/bin/edge
|
PROG=/usr/bin/edge
|
||||||
CONFIGFILE=/etc/config/n2n-edge.conf
|
CONFIGFILE=/etc/n2n/edge.conf
|
||||||
|
|
||||||
start_service() {
|
start_service() {
|
||||||
procd_open_instance
|
procd_open_instance
|
||||||
|
@ -4,7 +4,7 @@ STOP=10
|
|||||||
|
|
||||||
USE_PROCD=1
|
USE_PROCD=1
|
||||||
PROG=/usr/bin/supernode
|
PROG=/usr/bin/supernode
|
||||||
CONFIGFILE=/etc/config/n2n-supernode.conf
|
CONFIGFILE=/etc/n2n/supernode.conf
|
||||||
|
|
||||||
start_service() {
|
start_service() {
|
||||||
procd_open_instance
|
procd_open_instance
|
||||||
|
Loading…
Reference in New Issue
Block a user