From 73308584229662a89f33486e7c94a7faac82e8e8 Mon Sep 17 00:00:00 2001 From: 6543 Date: Tue, 20 Feb 2018 22:15:23 +0100 Subject: [PATCH] restructure A --- README.md | 3 +- README_CLIENT.md | 40 +++++++++++++++++++ README_MIRROR.md | 27 +++++++++++++ .../install_ubuntu_xenial_amd64.sh | 0 ipfs => client/ipfs | 0 mirror/sync_mirror_now.sh | 28 +++++++++++++ .../sync_mirror_old.sh | 0 scripts/add_test_mirror.sh | 15 ------- 8 files changed, 97 insertions(+), 16 deletions(-) create mode 100644 README_CLIENT.md create mode 100644 README_MIRROR.md rename install_ubuntu_xenial_amd64.sh => client/install_ubuntu_xenial_amd64.sh (100%) rename ipfs => client/ipfs (100%) create mode 100644 mirror/sync_mirror_now.sh rename scripts/sync_mirror.sh => mirror/sync_mirror_old.sh (100%) delete mode 100755 scripts/add_test_mirror.sh diff --git a/README.md b/README.md index 02607bf..a4f5447 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,9 @@ Copy the ipfs file from this repo to the directory for apt transport methods: cd apt-transport-ipfs sudo cp ipfs /usr/lib/apt/methods/ipfs -Install ipfs as daemon: +#-> server Install ipfs https://github.com/6543/ipfs_daemon + su ipfs -c "ipfs config --json Experimental.FilestoreEnabled true" # Configure diff --git a/README_CLIENT.md b/README_CLIENT.md new file mode 100644 index 0000000..39a9df4 --- /dev/null +++ b/README_CLIENT.md @@ -0,0 +1,40 @@ +IPFS transport for apt + +# Requirements + + sudo apt install python-pip git gzip wget + sudo pip install ipfsapi + +# Install + +Copy the ipfs file from this repo to the directory for apt transport methods: + + git clone https://github.com/6543/apt-transport-ipfs + cd apt-transport-ipfs/client + sudo cp ipfs /usr/lib/apt/methods/ipfs + +Use the instruktions from https://github.com/6543/ipfs_daemon/blob/master/setup-ipfs-daemon to start ipfs on boot + +# Configure + +Add an IPFS mirror to your apt sources.list file. + +Backup your /etc/apt/sources.list, remove all the lines that it has and leave it +just with: + + #archive.ubuntu.com + deb ipfs:/ipns/QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ xenial main restricted universe multiverse + deb ipfs:/ipns/QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ xenial-security main restricted universe multiverse + deb ipfs:/ipns/QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ xenial-updates main restricted universe multiverse + deb-src ipfs:/ipns/QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ xenial main restricted universe multiverse + deb-src ipfs:/ipns/QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ xenial-security main restricted universe multiverse + deb-src ipfs:/ipns/QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ xenial-updates main restricted universe multiverse + + #archive.canonical.com + deb ipfs:/ipns/QmUajtQCL6yHcBaYxsZKyD8QH7n977ZVxjU5yMXwYC183c xenial partner + deb-src ipfs:/ipns/QmUajtQCL6yHcBaYxsZKyD8QH7n977ZVxjU5yMXwYC183c xenial partner + +# New archives: + +if you like to add other archives to IPFS, i have ~ 100GB more ... +just open an issue and we can debate it. diff --git a/README_MIRROR.md b/README_MIRROR.md new file mode 100644 index 0000000..fd79b63 --- /dev/null +++ b/README_MIRROR.md @@ -0,0 +1,27 @@ +IPFS apt-transport-ifs Mirror + +# Requirements + + sudo apt apt-mirror git gzip wget + +to start ipfs on boot: + https://github.com/6543/ipfs_daemon/blob/master/setup-ipfs-daemon + +# Install + +Copy the ipfs file from this repo to the directory for apt transport methods: + + git clone https://github.com/6543/apt-transport-ipfs + cd apt-transport-ipfs/mirror + ... [WIP] ... + +Use the instruktions from https://github.com/6543/ipfs_daemon/blob/master/setup-ipfs-daemon to start ipfs on boot + + git clone https://github.com/6543/ipfs_daemon + ... [WIP] ... + su ipfs -c "ipfs config --json Experimental.FilestoreEnabled true" + +# Configure + + # /etc/apt/mirror.list + ... [WIP] ... diff --git a/install_ubuntu_xenial_amd64.sh b/client/install_ubuntu_xenial_amd64.sh similarity index 100% rename from install_ubuntu_xenial_amd64.sh rename to client/install_ubuntu_xenial_amd64.sh diff --git a/ipfs b/client/ipfs similarity index 100% rename from ipfs rename to client/ipfs diff --git a/mirror/sync_mirror_now.sh b/mirror/sync_mirror_now.sh new file mode 100644 index 0000000..1f6ea29 --- /dev/null +++ b/mirror/sync_mirror_now.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +## start daemon if not started +ipfs daemon & + +## prepare dirs ... +cd /home/maddl/.ipfs/mirror/ +#sudo umount archive.ubuntu.com +#sudo umount archive.canonical.com +#sudo mount --bind /data/local/CryptoCurency/apt-mirror/mirror/archive.ubuntu.com/ubuntu/ archive.ubuntu.com +#sudo mount --bind /data/local/CryptoCurency/apt-mirror/mirror/archive.canonical.com/ubuntu/ archive.canonical.com + +## mirror +sudo -u apt-mirror -g apt-mirror apt-mirror + +#ipfs key gen --type=rsa --size=2048 archive.canonical.com +# -> QmUajtQCL6yHcBaYxsZKyD8QH7n977ZVxjU5yMXwYC183c +hash_canonical="$(ipfs add --progress --local --nocopy --fscache --recursive /home/maddl/.ipfs/mirror/archive.canonical.com/ | tail -n1)" +name_canonical="$(ipfs name publish --key=archive.canonical.com `echo $hash_canonical | cut -d ' ' -f 2` | cut -d ' ' -f 3 | tr -d :)" +echo "archive.canonical.com/ubuntu -> $name_canonical" +echo 'done' + +#ipfs key gen --type=rsa --size=2048 archive.ubuntu.com +# -> QmXfAyjHThwksUyW9BwuqCDuzu1PM1XQkR1HVTbActvYDJ +hash_ubuntu="$(ipfs add --progress --local --nocopy --fscache --recursive /home/maddl/.ipfs/mirror/archive.ubuntu.com/ | tail -n1)" +name_ubuntu="$(ipfs name publish --key=archive.ubuntu.com `echo $hash_ubuntu | cut -d ' ' -f 2` | cut -d ' ' -f 3 | tr -d :)" +echo "archive.utuntu.com/ubuntu -> $name_ubuntu" +echo 'done' diff --git a/scripts/sync_mirror.sh b/mirror/sync_mirror_old.sh similarity index 100% rename from scripts/sync_mirror.sh rename to mirror/sync_mirror_old.sh diff --git a/scripts/add_test_mirror.sh b/scripts/add_test_mirror.sh deleted file mode 100755 index 8a8f5c3..0000000 --- a/scripts/add_test_mirror.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -mkdir --parents test-archive/dists/xenial/main/binary-amd64/by-hash/SHA256/ -mkdir --parents test-archive/dists/xenial/main/i18n/ -mkdir --parents test-archive/pool/main/h/hello/ - -wget --directory-prefix=test-archive/dists/xenial/ http://archive.ubuntu.com/ubuntu/dists/xenial/InRelease -wget --directory-prefix=test-archive/dists/xenial/ http://archive.ubuntu.com/ubuntu/dists/xenial/Release -wget --directory-prefix=test-archive/dists/xenial/main/binary-amd64/by-hash/SHA256/ http://archive.ubuntu.com/ubuntu/dists/xenial/main/binary-amd64/by-hash/SHA256/76858a337b1665561a256cea6f7ef32515517754e3c5e54c1895cf29e1b41884 -wget --directory-prefix=test-archive/dists/xenial/main/binary-amd64/ http://archive.ubuntu.com/ubuntu/dists/xenial/main/binary-amd64/Packages.xz -wget --directory-prefix=test-archive/dists/xenial/main/i18n/ http://archive.ubuntu.com/ubuntu/dists/xenial/main/i18n/Translation-en.xz -wget --directory-prefix=test-archive/pool/main/h/hello/ http://archive.ubuntu.com/ubuntu/pool/main/h/hello/hello_2.10-1_amd64.deb - -hash="$(ipfs add --quiet --recursive test-archive | tail -n1)" -ipfs name publish "$hash"