diff --git a/caddy/Makefile b/caddy/Makefile deleted file mode 100644 index d8dff3e..0000000 --- a/caddy/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2010-2020 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=caddy -PKG_VERSION:=$(shell curl -L -k -s https://github.com/caddyserver/caddy/releases/latest | grep 'tag_name' | cut -d\" -f4 | tr -d ' v') -ifeq ($(PKG_VERSION),) - PKG_VERSION:=2.7.6 -endif -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com//caddyserver/caddy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=skip - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 -PKG_BUILD_FLAGS:=no-mips16 - -GO_PKG:=github.com/caddyserver/caddy/v2 -GO_PKG_BUILD_PKG:=$(GO_PKG)/caddy -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/$(PKG_NAME) - TITLE:=Caddy2 is an open source web server - URL:=https://caddyserver.com - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread -endef - -define Package/$(PKG_NAME)/description -Still the only web server to use TLS automatically and by default. Deploy and scale HTTPS effortlessly with Caddy2. -endef - - -define Build/Prepare - $(call Build/Prepare/Default) -endef - -define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/caddy) - $(call GoPackage/Build/Configure) - $(call GoPackage/Build/Compile) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/caddy -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/tmp - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/caddy $(1)/tmp/caddy -endef - -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/caddy/README.md b/caddy/README.md deleted file mode 100644 index a23799d..0000000 --- a/caddy/README.md +++ /dev/null @@ -1,28 +0,0 @@ -通过这个构建的二进制程序 不能开启webdav 会导致启动失败,而单独构建的添加了webdav模块的可以开启webdav -所以最好是单独编译 -```shell -GOOS=linux GOARCH=mipsle GOMIPS=softfloat ~/go/bin/xcaddy build \ - --with github.com/mholt/caddy-webdav \ - --with github.com/aksdb/caddy-cgi/v2 -``` - -在51行添加了upx压缩用来节省体积 -```shell -$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/caddy - -$(STAGING_DIR_HOST)/bin/upx 对应的是编译器的 openwrt-sdk-版本-架构名_gcc-版本号_musl.Linux-x86_64/staging_dir/host/bin目录里 -如果这个目录没有这个upx 可以改为其他目录 如 /usr/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/caddy -都没有可以安装也可以下载https://github.com/upx/upx/releases二进制 -``` - -在55-56行 -```shell -$(INSTALL_DIR) $(1)/tmp - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/caddy $(1)/tmp/caddy -``` - -设置安装在/tmp/caddy了 , 如果你路由器闪存空间足够,可改为/usr/bin/caddy -```shell -$(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/caddy $(1)/usr/bin/caddy -```