diff --git a/Makefile b/Makefile index b723851c..20e5122a 100644 --- a/Makefile +++ b/Makefile @@ -214,10 +214,11 @@ $(BINARY)-$(VERSION)_$(ITERATION).armhf.txz: package_build_freebsd_arm check_fpm # Build an environment that can be packaged for linux. package_build_linux: readme man plugins_linux_amd64 linux # Building package environment for linux. - mkdir -p $@/usr/bin $@/etc/$(BINARY) $@/usr/share/man/man1 $@/usr/share/doc/$(BINARY) $@/usr/lib/$(BINARY) + mkdir -p $@/usr/bin $@/etc/$(BINARY) $@/usr/share/man/man1 $@/usr/share/doc/$(BINARY) $@/usr/lib/$(BINARY)/web # Copying the binary, config file, unit file, and man page into the env. cp $(BINARY).amd64.linux $@/usr/bin/$(BINARY) cp *.1.gz $@/usr/share/man/man1 + cp -r init/webserver/* $@/usr/lib/$(BINARY)/web/ rm -f $@/usr/lib/$(BINARY)/*.so [ ! -f *amd64.so ] || cp *amd64.so $@/usr/lib/$(BINARY)/ cp examples/$(CONFIG_FILE).example $@/etc/$(BINARY)/ @@ -248,9 +249,10 @@ package_build_linux_armhf: package_build_linux armhf # Build an environment that can be packaged for freebsd. package_build_freebsd: readme man freebsd - mkdir -p $@/usr/local/bin $@/usr/local/etc/$(BINARY) $@/usr/local/share/man/man1 $@/usr/local/share/doc/$(BINARY) + mkdir -p $@/usr/local/bin $@/usr/local/etc/$(BINARY) $@/usr/local/share/man/man1 $@/usr/local/share/doc/$(BINARY) $@/usr/local/lib/$(BINARY)/web cp $(BINARY).amd64.freebsd $@/usr/local/bin/$(BINARY) cp *.1.gz $@/usr/local/share/man/man1 + cp -r init/webserver/* $@/usr/local/lib/$(BINARY)/web/ cp examples/$(CONFIG_FILE).example $@/usr/local/etc/$(BINARY)/ cp examples/$(CONFIG_FILE).example $@/usr/local/etc/$(BINARY)/$(CONFIG_FILE) cp LICENSE *.html examples/*?.?* $@/usr/local/share/doc/$(BINARY)/ @@ -337,6 +339,8 @@ deps: go get -u github.com/unifi-poller/unifi go get -u github.com/unifi-poller/influxunifi go get -u github.com/unifi-poller/promunifi + go get -u github.com/unifi-poller/lokiunifi + go get -u github.com/unifi-poller/webserver go get -u github.com/unifi-poller/inputunifi go get -u github.com/unifi-poller/poller @@ -354,9 +358,10 @@ install: man readme $(BINARY) plugins_darwin @[ "$(PREFIX)" != "" ] || (echo "Unable to continue, PREFIX not set. Use: make install PREFIX=/usr/local ETC=/usr/local/etc" && false) @[ "$(ETC)" != "" ] || (echo "Unable to continue, ETC not set. Use: make install PREFIX=/usr/local ETC=/usr/local/etc" && false) # Copying the binary, config file, unit file, and man page into the env. - /usr/bin/install -m 0755 -d $(PREFIX)/bin $(PREFIX)/share/man/man1 $(ETC)/$(BINARY) $(PREFIX)/share/doc/$(BINARY) $(PREFIX)/lib/$(BINARY) + /usr/bin/install -m 0755 -d $(PREFIX)/bin $(PREFIX)/share/man/man1 $(ETC)/$(BINARY) $(PREFIX)/share/doc/$(BINARY) $(PREFIX)/lib/$(BINARY)/web /usr/bin/install -m 0755 -cp $(BINARY) $(PREFIX)/bin/$(BINARY) - /usr/bin/install -m 0644 -cp $(BINARY).1.gz $(PREFIX)/share/man/man1 + /usr/bin/install -m 0644 -cp $(BINARY).1.gz $(PREFIX)/share/man/man1/ /usr/bin/install -m 0644 -cp examples/$(CONFIG_FILE).example $(ETC)/$(BINARY)/ + /usr/bin/install -m 0644 -cp init/webserver/* $(PREFIX)/lib/$(BINARY)/web/ [ -f $(ETC)/$(BINARY)/$(CONFIG_FILE) ] || /usr/bin/install -m 0644 -cp examples/$(CONFIG_FILE).example $(ETC)/$(BINARY)/$(CONFIG_FILE) /usr/bin/install -m 0644 -cp LICENSE *.html examples/* $(PREFIX)/share/doc/$(BINARY)/ diff --git a/go.mod b/go.mod index 77834384..d19011f2 100644 --- a/go.mod +++ b/go.mod @@ -15,11 +15,12 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 - github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e + github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e - github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e + github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 + github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golift.io/cnfg v0.0.5 // indirect diff --git a/go.sum b/go.sum index 7574bf3e..fd244e5d 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 h1:k3/6a1Shi7GGCp9QpyYuXsMM6ncTOjCzOE9Fd6CDA+Q= github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -108,19 +110,40 @@ github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415 h1:0rY github.com/unifi-poller/influxunifi v0.0.10-0.20200626040446-8fe783775415/go.mod h1:HO6WuWoUwuz9Hj4m9hJ8Sh7U9O1Sd62FPV+loEdCDqY= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e h1:gJyoFh49X/9Q8DxsFe2H48DjfZ46/Aw/GBxl7izKDEo= github.com/unifi-poller/inputunifi v0.0.8-0.20200626052630-dabd0510075e/go.mod h1:nFr8uB4zJtCLiQvYPypGK3aWfQ9y4cC4iIeS9PyecrU= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49 h1:ce5cXC4eWs5TfrjvlN8ZEemKcnv7KfbUbzXDr2fHnso= +github.com/unifi-poller/inputunifi v0.0.8-0.20200628114724-8b60ff573a49/go.mod h1:Rb9C8xi/qgxOO/IbwyO4Uu77qVkIhGiQv4cA2jnmNMI= github.com/unifi-poller/lokiunifi v0.0.0-20200626040346-12af563d2a99/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e h1:MoyVcBNks+p1tYCu67UyQycyHpeCqzafWpjMir/Mjh8= github.com/unifi-poller/lokiunifi v0.0.0-20200626052645-b0336442237e/go.mod h1:7+uUJT6nnXVPad/Omsj+lPD80Cshg4L8TPUkV72JNM8= github.com/unifi-poller/poller v0.0.8-0.20200621214016-5d1ed3324a46/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e h1:pSkgIalhDdb1N0/9uTAVh7emolfFxjCxo68IXIsZzII= github.com/unifi-poller/poller v0.0.8-0.20200622041812-dd79a3e3073e/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200626082958-a9a7092a5684 h1:r1B8GoI47czgGnQ7WY89qlSKqSE1d1pQmcLfdXVW/+Y= +github.com/unifi-poller/poller v0.0.8-0.20200626082958-a9a7092a5684/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200627080311-6a024f8220dd h1:1o5CdAa7HxUHDXDV6N8SGAtKu3GeSkxFJOMkHHm6MVk= +github.com/unifi-poller/poller v0.0.8-0.20200627080311-6a024f8220dd/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200627082257-8f95941300de h1:GQqHkp9+jdesjCra28BPk10H3pJJ/9uVNzT1JRUP2K4= +github.com/unifi-poller/poller v0.0.8-0.20200627082257-8f95941300de/go.mod h1:pJ/MeYaakLOOpbyc7s4zeZ92UzNK/rir5jkA7t5jIjo= +github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d h1:wS7GngTfpX4Ngmm2+r1uJsECmiAglSOzEInwF/S4dW8= +github.com/unifi-poller/poller v0.0.8-0.20200628114359-a40c51a9891d/go.mod h1:fObadG7weiVnSpFu8pFpGfo2bYYFc7hUMe770FovSc8= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a h1:7CmCHHFUrxzaGVMRINmplAosW8BNXlWIPm05LxCPClU= github.com/unifi-poller/promunifi v0.0.9-0.20200623073250-24621ebb306a/go.mod h1:mlvfj4DRFVx12ewi6BcT4XOG2bxC7sFasl08RlYih8Y= github.com/unifi-poller/unifi v0.0.5-0.20200620103801-b927287ea1cd/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37 h1:T2y8JWkjZd1vz2ZKu4vmmAk9s6PUwupuTldwhfww5xY= github.com/unifi-poller/unifi v0.0.6-0.20200625090439-421046871a37/go.mod h1:L1kMRH2buZhB31vZnRC1im7Tk/4uD3ET4biwl2faYy8= +github.com/unifi-poller/webserver v0.0.0-20200626113232-24ae3f02067d h1:iTp4YWGqBmDRxsMjLnJymmDzhO9b+Jvjly7hqLJnPdY= +github.com/unifi-poller/webserver v0.0.0-20200626113232-24ae3f02067d/go.mod h1:Ydcz7GN8uSpIoAI7h7+v89Q4peWaeq7jIAfsG0vfQKE= +github.com/unifi-poller/webserver v0.0.0-20200627075529-02f6c576d7bc h1:O5qrJOu2E+WB5b5vSDDFrxW/Y7KBm+QdTRHc2Bad30Y= +github.com/unifi-poller/webserver v0.0.0-20200627075529-02f6c576d7bc/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= +github.com/unifi-poller/webserver v0.0.0-20200627075622-78851a262139 h1:JpKj/VMBxErObszX55iJnHRnbMHkEJ2hmzOXY6sDa9g= +github.com/unifi-poller/webserver v0.0.0-20200627075622-78851a262139/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= +github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e h1:whQsHnJJZvH0c6UyQwQcxA6dKXTrkLUAVxAjlVWq6Io= +github.com/unifi-poller/webserver v0.0.0-20200627080325-7ddac80e969e/go.mod h1:0kv/xON8tow9YE0ZmODW0Migxx2Q7vZZ+c5OVTW/kfU= +github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0 h1:hJ+DZonWxH7KybGDIs66U64/HZyY3obuxqyO1LUiWEE= +github.com/unifi-poller/webserver v0.0.0-20200628114213-2b89a50ff1c0/go.mod h1:rlM8tRx7wCxqj4+6ZkuFVt2voFoAlHhS/XTrHd7T57s= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/main.go b/main.go index a3269290..c3543353 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,7 @@ import ( _ "github.com/unifi-poller/influxunifi" _ "github.com/unifi-poller/lokiunifi" _ "github.com/unifi-poller/promunifi" + _ "github.com/unifi-poller/webserver" ) // Keep it simple.