diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2017-10-25 12:40:08 +0200 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2017-10-25 12:40:08 +0200 |
| commit | ca31f34dba9a9ec72769c9513f449c975a065fa3 (patch) | |
| tree | 7b7bf72dcfe54b1e41e390c84318289c7329aede | |
| parent | 05378c44b6a49be9ef4432b7e9dd3ccc7aa5dca2 (diff) | |
| download | turris-myrepo-ca31f34dba9a9ec72769c9513f449c975a065fa3.tar.gz turris-myrepo-ca31f34dba9a9ec72769c9513f449c975a065fa3.tar.bz2 turris-myrepo-ca31f34dba9a9ec72769c9513f449c975a065fa3.zip | |
More fixes for new server and updater version
| -rwxr-xr-x | build_repo.sh | 4 | ||||
| -rwxr-xr-x | clean_repo.sh | 6 | ||||
| -rw-r--r-- | myrepo-cert/Makefile | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/build_repo.sh b/build_repo.sh index def77cf..9ee814e 100755 --- a/build_repo.sh +++ b/build_repo.sh @@ -64,13 +64,13 @@ if [ "$BOARD" = "turris" ] || [ "$BOARD" = "all" ]; then fi deploy() { - local TARGET="cynerd.cz:/var/www/myrepo/$1" + local TARGET="cynerd.cz:/var/www/myrepo" ssh cynerd.cz -- mkdir -p "/var/www/myrepo/$1" # Make sure that directory exists echo -e "\e[1;34mSign and deploy $1\e[0m" SEC=myrepo-cert/files/key.sec pushd .$1-sdk staging_dir/host/bin/usign -S -s ../$SEC -m bin/$2/packages/base/Packages - scp bin/$2/packages/base/* "$TARGET/" + scp bin/$2/packages/base/* "$TARGET/$1/" popd .$1-sdk/staging_dir/host/bin/usign -S -s $SEC -m $1.lua scp $1.lua "$TARGET/$1.lua" diff --git a/clean_repo.sh b/clean_repo.sh index 4b29d92..dc3f7c7 100755 --- a/clean_repo.sh +++ b/clean_repo.sh @@ -1,6 +1,2 @@ #!/bin/sh -ssh freebsd@cynerd.cz " -rm -rf /usr/local/www/data/myrepo -mkdir -p /usr/local/www/data/myrepo/turris -mkdir -p /usr/local/www/data/myrepo/omnia -" +ssh cynerd.cz -- /bin/sh -c 'rm -rf /var/www/myrepo/*' diff --git a/myrepo-cert/Makefile b/myrepo-cert/Makefile index 99f47fe..9c0cba2 100644 --- a/myrepo-cert/Makefile +++ b/myrepo-cert/Makefile @@ -1,5 +1,5 @@ # -## Copyright (C) 2016 CZ.NIC z.s.p.o. (http://www.nic.cz/) +## Copyright (C) 2016-2017 CZ.NIC z.s.p.o. (http://www.nic.cz/) # ## This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=myrepo-cert -PKG_VERSION:=1 +PKG_VERSION:=2 PKG_MAINTAINER:=Karel Koci PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -25,9 +25,11 @@ endef define Package/myrepo-cert/install $(INSTALL_DIR) $(1)/etc/opkg/keys $(INSTALL_DIR) $(1)/etc/updater/keys + $(INSTALL_DATA) ./files/key.pub $(1)/etc/opkg/keys/cfb977a0d53c5424 + $(INSTALL_DATA) ./files/key.pub $(1)/etc/updater/keys/myrepo.pub - cp ./files/key.pub $(1)/etc/opkg/keys/cfb977a0d53c5424 - cp ./files/key.pub $(1)/etc/updater/keys/myrepo.pub + $(INSTALL_DIR) $(1)/etc/updater/conf.d + $(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/myrepo.lua endef $(eval $(call BuildPackage,myrepo-cert)) |