From 1645c082c80924aa424b558a6ba307c1cd59eb27 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 21 Apr 2024 14:03:59 +0200 Subject: [PATCH] install in $HOME/.local/bin/jaklis/ (with .env for duniter load balancing) --- DOCKER/docker-compose.duniter.yml | 53 ------------------- DOCKER/docker-compose.ipfs.yml | 15 ------ DOCKER/docker-compose.minetest.yml | 16 ------ DOCKER/docker-compose.nextcloud.yml | 39 -------------- DOCKER/docker-compose.nginx-proxy-manager.yml | 12 ----- install.sh | 1 + tools/jaklis/setup.sh | 6 ++- 7 files changed, 5 insertions(+), 137 deletions(-) delete mode 100644 DOCKER/docker-compose.duniter.yml delete mode 100644 DOCKER/docker-compose.ipfs.yml delete mode 100644 DOCKER/docker-compose.minetest.yml delete mode 100644 DOCKER/docker-compose.nextcloud.yml delete mode 100644 DOCKER/docker-compose.nginx-proxy-manager.yml diff --git a/DOCKER/docker-compose.duniter.yml b/DOCKER/docker-compose.duniter.yml deleted file mode 100644 index ac8900df..00000000 --- a/DOCKER/docker-compose.duniter.yml +++ /dev/null @@ -1,53 +0,0 @@ -version: '3.6' - -services: - duniter: - environment: - #- DEBUG_ENTRYPOINT=${DUNITER_DEBUG_ENTRYPOINT:-${DEBUG_ENTRYPOINT:-${DEBUG:-}}} - - DUNITER_AUTO_SYNC=true - - DUNITER_SYNC_HOST=${DUNITER_SYNC_HOST:-duniter.pini.fr:443} - - DUNITER_BMA_ENABLED=true - - DUNITER_BMA_IP4=${DUNITER_BMA_IP4:-0.0.0.0} - - DUNITER_BMA_REMOTE_HOST=${DUNITER_BMA_REMOTE_HOST:-duniter.localhost} - - DUNITER_BMA_REMOTE_PORT=${DUNITER_BMA_REMOTE:-443} - - DUNITER_GVA_ENABLED=true - - DUNITER_GVA_PATH=gva - - DUNITER_GVA_PORT=30901 - - DUNITER_GVA_REMOTE_PATH=gva - - DUNITER_GVA_REMOTE_PORT=443 - - DUNITER_GVA_REMOTE_HOST=${DUNITER_GVA_REMOTE_HOST:-duniter.localhost} - - DUNITER_GVA_SUBSCRIPTIONS_PATH=gva-sub - - DUNITER_GVA_WHITELIST=${DUNITER_GVA_WHITELIST:-127.0.0.1,::1} - - DUNITER_START_OPTS=${DUNITER_START_OPTS:-direct_webstart} - - DUNITER_SYNC_OPTS=${DUNITER_SYNC_OPTS:-} - - DUNITER_WS2P_HOST=${DUNITER_WS2P_HOST:-0.0.0.0} - - DUNITER_WS2P_PORT=${DUNITER_W2SP_PORT:-20901} - - DUNITER_WS2P_PUBLIC=${DUNITER_W2SP_PUBLIC:-true} - - DUNITER_WS2P_REMOTE_HOST=${DUNITER_WS2P_REMOTE_HOST:-duniter.localhost} - - DUNITER_WS2P_REMOTE_PATH=${DUNITER_WS2P_REMOTE_PATH:-ws2p} - - DUNITER_WS2P_REMOTE_PORT=${DUNITER_WS2P_REMOTE_PORT:-443} - - DUNITER_POW_CPU=0.5 - - DUNITER_POW_NBCORES=1 - - DUNITER_MAX_OLD_SPACE_SIZE=${DUNITER_MAX_OLD_SPACE_SIZE:-8192} - image: pinidh/duniter:dev - networks: - - private - ports: - - 0.0.0.0:10901:10901 - - 0.0.0.0:20901:20901 - - 0.0.0.0:30901:30901 - - 0.0.0.0:9220:9220 - restart: unless-stopped - volumes: - - data:/var/lib/duniter - - etc:/etc/duniter - -networks: - private: - name: ${DOCKER_NETWORK_PRIVATE:-duniter} - public: - name: ${DOCKER_NETWORK_PUBLIC:-host} - -volumes: - data: - etc: diff --git a/DOCKER/docker-compose.ipfs.yml b/DOCKER/docker-compose.ipfs.yml deleted file mode 100644 index 8e1a460a..00000000 --- a/DOCKER/docker-compose.ipfs.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3' -services: - ipfs_node_1: - image: ipfs/go-ipfs:latest - container_name: ipfs_node_1 - environment: - IPFS_SWARM_KEY_FILE: _SWARM_KEY_FILE_ - volumes: - - _IPFSDATA_:/export - - _IPFSDATA_:/data/ipfs - ports: - - "64001:4001" - - "64001:4001/udp" - - "127.0.0.1:68080:8080" - - "127.0.0.1:65001:5001" diff --git a/DOCKER/docker-compose.minetest.yml b/DOCKER/docker-compose.minetest.yml deleted file mode 100644 index c8824bd5..00000000 --- a/DOCKER/docker-compose.minetest.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: '3.6' - -services: - minetest: - image: lscr.io/linuxserver/minetest:latest - container_name: minetest - environment: - - PUID=1000 - - PGID=1000 - - TZ=Etc/UTC - - "CLI_ARGS=--gameid minetest --port 30000" #optional - volumes: - - /path/to/data:/config/.minetest - ports: - - 30000:30000/udp - restart: unless-stopped diff --git a/DOCKER/docker-compose.nextcloud.yml b/DOCKER/docker-compose.nextcloud.yml deleted file mode 100644 index 2bbd71be..00000000 --- a/DOCKER/docker-compose.nextcloud.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: "3" -volumes: - nextcloud-data: - nextcloud-db: - -networks: - frontend: - # add this if the network is already existing! - # external: true - backend: - -services: - nextcloud-app: - image: nextcloud - restart: always - volumes: - - nextcloud-data:/var/www/html - environment: - - MYSQL_PASSWORD=replace-with-secure-password - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_HOST=nextcloud-db - networks: - - frontend - - backend - - nextcloud-db: - image: mariadb - restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW - volumes: - - nextcloud-db:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD=replace-with-secure-password - - MYSQL_PASSWORD=replace-with-secure-password - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - networks: - - backend diff --git a/DOCKER/docker-compose.nginx-proxy-manager.yml b/DOCKER/docker-compose.nginx-proxy-manager.yml deleted file mode 100644 index 109283f8..00000000 --- a/DOCKER/docker-compose.nginx-proxy-manager.yml +++ /dev/null @@ -1,12 +0,0 @@ -version : '3.8' -services : - app : - image : 'jc21/nginx-proxy-manager:latest' - restart : unless-stopped - ports : - - '80:80' - - '81:81' - - '443:443' - volumes : - - ./data:/data - - ./letsencrypt:/etc/letsencrypt diff --git a/install.sh b/install.sh index 3477fe31..32b70ec1 100755 --- a/install.sh +++ b/install.sh @@ -27,6 +27,7 @@ start=`date +%s` [[ ! $(which ipfs) ]] && echo "INSTALL IPFS PLEASE" && exit 1 #################################################################### TEST +# tldr + mosquitto + promoetheus # MAIN # SI AUCUNE CLEF DE STATION... if [[ ! -d ~/.zen/game/players/ ]]; diff --git a/tools/jaklis/setup.sh b/tools/jaklis/setup.sh index 9d6665d1..6e4e8808 100755 --- a/tools/jaklis/setup.sh +++ b/tools/jaklis/setup.sh @@ -13,8 +13,10 @@ done pip3 install --break-system-packages -r requirements.txt || hasError=1 chmod u+x jaklis.py -sudo ln -sf $(realpath jaklis.py) /usr/local/bin/jaklis || hasError=1 -sudo cp ${MY_PATH}/.env /usr/local/bin/ || hasError=1 + +mkdir -p $HOME/.local/bin/ +ln -sf $(realpath jaklis.py) $HOME/.local/bin/jaklis || hasError=1 +cp ${MY_PATH}/.env.template $HOME/.local/bin/.env || hasError=1 if [[ hasError -eq 0 ]]; then echo "Setup done. You can use 'jaklis' command, try it."