From 4d19d877208c8e749e7d2e87d9a34e9fc2db0cb7 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Fri, 2 Oct 2020 18:16:49 +0200 Subject: [PATCH] pkgs: use glob notation to include static folder --- go.mod | 2 +- go.sum | 4 ++-- pkgs/build.sh | 14 +------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 6e9ad3f6..57eccc91 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/otiai10/copy v1.2.0 github.com/pelletier/go-toml v1.8.1 // indirect github.com/pires/go-proxyproto v0.1.3 - github.com/pkg/sftp v1.12.1-0.20200911071146-ec5b80d98efe + github.com/pkg/sftp v1.12.1-0.20201002132022-fcaa492add82 github.com/prometheus/client_golang v1.7.1 github.com/prometheus/common v0.14.0 // indirect github.com/prometheus/procfs v0.2.0 // indirect diff --git a/go.sum b/go.sum index 35f37acf..477b6e2c 100644 --- a/go.sum +++ b/go.sum @@ -369,8 +369,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/sftp v1.12.1-0.20200911071146-ec5b80d98efe h1:M7xv7vm3IPZhGrX+PONBvy42V2Xu1mK8v3w/6VtIiiA= -github.com/pkg/sftp v1.12.1-0.20200911071146-ec5b80d98efe/go.mod h1:fUqqXB5vEgVCZ131L+9say31RAri6aF6KDViawhxKK8= +github.com/pkg/sftp v1.12.1-0.20201002132022-fcaa492add82 h1:yMTXRvXH7eXTNR9M/SjVwiKKNLtzZ+ek97xOo4PFqVs= +github.com/pkg/sftp v1.12.1-0.20201002132022-fcaa492add82/go.mod h1:fUqqXB5vEgVCZ131L+9say31RAri6aF6KDViawhxKK8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= diff --git a/pkgs/build.sh b/pkgs/build.sh index faccbc2e..06969e54 100755 --- a/pkgs/build.sh +++ b/pkgs/build.sh @@ -53,19 +53,7 @@ files: ${BASE_DIR}/init/sftpgo.service: "/lib/systemd/system/sftpgo.service" ${BASE_DIR}/examples/rest-api-cli/sftpgo_api_cli.py: "/usr/bin/sftpgo_api_cli" ${BASE_DIR}/templates/*: "/usr/share/sftpgo/templates/" - ${BASE_DIR}/static/*: "/usr/share/sftpgo/static/" - ${BASE_DIR}/static/css/*: "/usr/share/sftpgo/static/css/" - ${BASE_DIR}/static/js/*: "/usr/share/sftpgo/static/js/" - ${BASE_DIR}/static/vendor/bootstrap/js/*: "/usr/share/sftpgo/static/vendor/bootstrap/js/" - ${BASE_DIR}/static/vendor/datatables/*: "/usr/share/sftpgo/static/vendor/datatables/" - ${BASE_DIR}/static/vendor/fontawesome-free/css/*: "/usr/share/sftpgo/static/vendor/fontawesome-free/css/" - ${BASE_DIR}/static/vendor/fontawesome-free/svgs/solid/*: "/usr/share/sftpgo/static/vendor/fontawesome-free/svgs/solid/" - ${BASE_DIR}/static/vendor/fontawesome-free/webfonts/*: "/usr/share/sftpgo/static/vendor/fontawesome-free/webfonts/" - ${BASE_DIR}/static/vendor/jquery/*: "/usr/share/sftpgo/static/vendor/jquery/" - ${BASE_DIR}/static/vendor/jquery-easing/*: "/usr/share/sftpgo/static/vendor/jquery-easing/" - ${BASE_DIR}/static/vendor/moment/js/*: "/usr/share/sftpgo/static/vendor/moment/js/" - ${BASE_DIR}/static/vendor/tempusdominus/css/*: "/usr/share/sftpgo/static/vendor/tempusdominus/css/" - ${BASE_DIR}/static/vendor/tempusdominus/js/*: "/usr/share/sftpgo/static/vendor/tempusdominus/js/" + ${BASE_DIR}/static/**/*: "/usr/share/sftpgo/static/" config_files: ./sftpgo.json: "/etc/sftpgo/sftpgo.json"