From 07263fd42149d09b446f99dab5554380a5282d93 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Wed, 8 Jan 2025 00:13:58 +1000 Subject: [PATCH] Revert "port all A named cts" This reverts commit 9afdcc793bc9eae3e77b1d21f9077aaf7d8907fd. --- install/actualbudget-install.sh | 2 + install/adguard-install.sh | 2 +- install/adventurelog-install.sh | 4 ++ install/agentdvr-install.sh | 6 +-- install/alpine-docker-install.sh | 1 - install/alpine-grafana-install.sh | 1 - install/alpine-install.sh | 1 - install/alpine-nextcloud-install.sh | 1 - install/alpine-vaultwarden-install.sh | 1 - install/alpine-zigbee2mqtt-install.sh | 1 - install/apache-cassandra-install.sh | 1 - install/apache-couchdb-install.sh | 2 + install/archivebox-install.sh | 4 +- install/aria2-install.sh | 2 + install/audiobookshelf-install.sh | 59 +++------------------------ install/authentik-install.sh | 12 ++++-- install/autobrr-install.sh | 2 +- 17 files changed, 32 insertions(+), 70 deletions(-) diff --git a/install/actualbudget-install.sh b/install/actualbudget-install.sh index d8f0010de..61b82d00e 100644 --- a/install/actualbudget-install.sh +++ b/install/actualbudget-install.sh @@ -34,6 +34,8 @@ msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" $STD apt-get update $STD apt-get install -y nodejs +$STD apt-get install -y openssh-server +$STD apt-get install -y wget $STD npm install --global yarn msg_ok "Installed Node.js" diff --git a/install/adguard-install.sh b/install/adguard-install.sh index c8b0d18ff..40fa24845 100644 --- a/install/adguard-install.sh +++ b/install/adguard-install.sh @@ -22,7 +22,7 @@ $STD apt-get install -y wget msg_ok "Installed Dependencies" msg_info "Installing AdGuard Home" -$STD tar zxvf <(curl -fsSL https://static.adtidy.org/adguardhome/release/AdGuardHome_linux_arm64.tar.gz) -C /opt +$STD tar zxvf <(curl -fsSL https://static.adtidy.org/adguardhome/release/AdGuardHome_linux_amd64.tar.gz) -C /opt msg_ok "Installed AdGuard Home" msg_info "Creating Service" diff --git a/install/adventurelog-install.sh b/install/adventurelog-install.sh index 6b70f0bce..43b5d7a96 100644 --- a/install/adventurelog-install.sh +++ b/install/adventurelog-install.sh @@ -44,11 +44,15 @@ msg_ok "Set up PostgreSQL Repository" msg_info "Installing Node.js" $STD apt-get update $STD apt-get install -y nodejs +$STD apt-get install -y openssh-server +$STD apt-get install -y wget $STD npm install -g pnpm msg_ok "Installed Node.js" msg_info "Install/Set up PostgreSQL Database" $STD apt-get install -y postgresql-16 postgresql-16-postgis +$STD apt-get install -y openssh-server +$STD apt-get install -y wget DB_NAME="adventurelog_db" DB_USER="adventurelog_user" DB_PASS="$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)" diff --git a/install/agentdvr-install.sh b/install/agentdvr-install.sh index 7b82cdbfd..7e255e804 100644 --- a/install/agentdvr-install.sh +++ b/install/agentdvr-install.sh @@ -29,11 +29,11 @@ msg_ok "Installed Dependencies" msg_info "Installing AgentDVR" mkdir -p /opt/agentdvr/agent -RELEASE=$(curl -s "https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=LinuxARM64&fromVersion=0" | grep -o 'https://.*\.zip') +RELEASE=$(curl -s "https://www.ispyconnect.com/api/Agent/DownloadLocation4?platform=Linux64&fromVersion=0" | grep -o 'https://.*\.zip') cd /opt/agentdvr/agent wget -q $RELEASE -$STD unzip Agent_LinuxARM64*.zip -rm -rf Agent_LinuxARM64*.zip +$STD unzip Agent_Linux64*.zip +rm -rf Agent_Linux64*.zip chmod +x ./Agent msg_ok "Installed AgentDVR" diff --git a/install/alpine-docker-install.sh b/install/alpine-docker-install.sh index c0cb76548..c594f6bf5 100644 --- a/install/alpine-docker-install.sh +++ b/install/alpine-docker-install.sh @@ -20,7 +20,6 @@ $STD apk add openssh $STD apk add tzdata $STD apk add nano $STD apk add mc -$STD apk add openssh msg_ok "Installed Dependencies" msg_info "Installing Docker" diff --git a/install/alpine-grafana-install.sh b/install/alpine-grafana-install.sh index 6a5643e72..93171e1e5 100644 --- a/install/alpine-grafana-install.sh +++ b/install/alpine-grafana-install.sh @@ -19,7 +19,6 @@ $STD apk add curl $STD apk add openssh $STD apk add nano $STD apk add mc -$STD apk add openssh msg_ok "Installed Dependencies" msg_info "Installing Grafana" diff --git a/install/alpine-install.sh b/install/alpine-install.sh index 8587a4882..a6623386b 100644 --- a/install/alpine-install.sh +++ b/install/alpine-install.sh @@ -19,7 +19,6 @@ $STD apk add curl $STD apk add openssh $STD apk add nano $STD apk add mc -$STD apk add openssh msg_ok "Installed Dependencies" motd_ssh diff --git a/install/alpine-nextcloud-install.sh b/install/alpine-nextcloud-install.sh index 1037d5882..3fe273b28 100644 --- a/install/alpine-nextcloud-install.sh +++ b/install/alpine-nextcloud-install.sh @@ -21,7 +21,6 @@ $STD apk add openssh $STD apk add nano $STD apk add mc $STD apk add nginx -$STD apk add openssh msg_ok "Installed Dependencies" msg_info "Installing PHP/Redis" diff --git a/install/alpine-vaultwarden-install.sh b/install/alpine-vaultwarden-install.sh index 0bed6151d..dffd20b0d 100644 --- a/install/alpine-vaultwarden-install.sh +++ b/install/alpine-vaultwarden-install.sh @@ -21,7 +21,6 @@ $STD apk add openssh $STD apk add nano $STD apk add mc $STD apk add argon2 -$STD apk add openssh msg_ok "Installed Dependencies" msg_info "Installing Alpine-Vaultwarden" diff --git a/install/alpine-zigbee2mqtt-install.sh b/install/alpine-zigbee2mqtt-install.sh index c96c13b38..0effd6c17 100644 --- a/install/alpine-zigbee2mqtt-install.sh +++ b/install/alpine-zigbee2mqtt-install.sh @@ -19,7 +19,6 @@ $STD apk add curl $STD apk add openssh $STD apk add nano $STD apk add mc -$STD apk add openssh msg_ok "Installed Dependencies" msg_info "Installing Alpine-Zigbee2MQTT" diff --git a/install/apache-cassandra-install.sh b/install/apache-cassandra-install.sh index dbfe055e1..6c76d8b17 100644 --- a/install/apache-cassandra-install.sh +++ b/install/apache-cassandra-install.sh @@ -21,7 +21,6 @@ $STD apt-get install -y apt-transport-https $STD apt-get install -y gpg $STD apt-get install -y openssh-server $STD apt-get install -y wget -$STD apk add openssh msg_ok "Installed Dependencies" msg_info "Installing Eclipse Temurin (Patience)" diff --git a/install/apache-couchdb-install.sh b/install/apache-couchdb-install.sh index 7a963f6ab..16c03f49e 100644 --- a/install/apache-couchdb-install.sh +++ b/install/apache-couchdb-install.sh @@ -36,6 +36,8 @@ VERSION_CODENAME="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-releas echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" >/etc/apt/sources.list.d/couchdb.sources.list $STD apt-get update $STD apt-get install -y couchdb +$STD apt-get install -y openssh-server +$STD apt-get install -y wget echo -e "CouchDB Erlang Cookie: \e[32m$ERLANG_COOKIE\e[0m" >>~/CouchDB.creds echo -e "CouchDB Admin Password: \e[32m$ADMIN_PASS\e[0m" >>~/CouchDB.creds msg_ok "Installed Apache CouchDB." diff --git a/install/archivebox-install.sh b/install/archivebox-install.sh index 4c34e0b5e..681ba9427 100644 --- a/install/archivebox-install.sh +++ b/install/archivebox-install.sh @@ -35,7 +35,9 @@ $STD apt-get install -y \ python3-pip \ python3-ldap \ python3-msgpack \ - python3-regex + python3-regex \ + openssh-server \ + wget msg_ok "Installed Python Dependencies" msg_info "Setting up Node.js Repository" diff --git a/install/aria2-install.sh b/install/aria2-install.sh index f7c43cf59..2612bc622 100644 --- a/install/aria2-install.sh +++ b/install/aria2-install.sh @@ -23,6 +23,8 @@ msg_ok "Installed Dependencies" msg_info "Installing Aria2" $STD apt-get install -y aria2 +$STD apt-get install -y openssh-server +$STD apt-get install -y wget msg_ok "Installed Aria2" read -r -p "Would you like to add AriaNG? " prompt diff --git a/install/audiobookshelf-install.sh b/install/audiobookshelf-install.sh index 7e7ca0d3b..796e48835 100644 --- a/install/audiobookshelf-install.sh +++ b/install/audiobookshelf-install.sh @@ -18,66 +18,17 @@ $STD apt-get install -y curl $STD apt-get install -y sudo $STD apt-get install -y gnupg $STD apt-get install -y mc -$STD apt-get install -y wget -$STD apt-get install -y ffmpeg -$STD apt-get install -y git $STD apt-get install -y openssh-server +$STD apt-get install -y wget msg_ok "Installed Dependencies" -msg_info "Installing Node.js" +msg_info "Installing audiobookshelf" +curl -fsSL https://advplyr.github.io/audiobookshelf-ppa/KEY.gpg >/etc/apt/trusted.gpg.d/audiobookshelf-ppa.asc +echo "deb [signed-by=/etc/apt/trusted.gpg.d/audiobookshelf-ppa.asc] https://advplyr.github.io/audiobookshelf-ppa ./" >/etc/apt/sources.list.d/audiobookshelf.list $STD apt-get update -$STD apt-get install -y nodejs -$STD apt-get install -y npm -msg_ok "Installed Node.js" - -msg_info "Installing audiobookshelf (Patience)" -$STD git clone https://github.com/advplyr/audiobookshelf /opt/audiobookshelf -cd /opt/audiobookshelf -mv ./.devcontainer/dev.js ./dev.js -sed -i 's/Port: 3333/Port: 13378/' ./dev.js -sed -i "s|ConfigPath: Path.resolve('config'),|ConfigPath: '/usr/share/audiobookshelf/config',|" ./dev.js -sed -i "s|MetadataPath: Path.resolve('metadata'),|MetadataPath: '/usr/share/audiobookshelf/metadata',|" ./dev.js -$STD npm ci -cd client -$STD npm ci -$STD npm run generate -mkdir -p /usr/share/audiobookshelf/config -mkdir -p /usr/share/audiobookshelf/metadata +$STD apt install audiobookshelf msg_ok "Installed audiobookshelf" -msg_info "Creating Service" -cat </etc/systemd/system/audiobookshelf_client.service -[Unit] -Description=Audiobookshelf Client Service -After=network.target - -[Service] -Type=simple -WorkingDirectory=/opt/audiobookshelf/client -ExecStart=/usr/bin/npm run dev -Restart=on-failure - -[Install] -WantedBy=multi-user.target -EOF -cat </etc/systemd/system/audiobookshelf_server.service -[Unit] -Description=Audiobookshelf Server Service -After=network.target - -[Service] -Type=simple -WorkingDirectory=/opt/audiobookshelf/ -ExecStart=/usr/bin/npm run dev -Restart=on-failure - -[Install] -WantedBy=multi-user.target -EOF -systemctl enable -q --now audiobookshelf_server.service -systemctl enable -q --now audiobookshelf_client.service -msg_ok "Created Service" - motd_ssh customize diff --git a/install/authentik-install.sh b/install/authentik-install.sh index 26fcde33b..5b8f15156 100644 --- a/install/authentik-install.sh +++ b/install/authentik-install.sh @@ -43,14 +43,14 @@ msg_ok "Installed Dependencies" msg_info "Installing yq" cd /tmp YQ_LATEST="$(wget -qO- "https://api.github.com/repos/mikefarah/yq/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")')" -wget -q "https://github.com/mikefarah/yq/releases/download/${YQ_LATEST}/yq_linux_arm64" -qO /usr/bin/yq +wget -q "https://github.com/mikefarah/yq/releases/download/${YQ_LATEST}/yq_linux_amd64" -qO /usr/bin/yq chmod +x /usr/bin/yq msg_ok "Installed yq" msg_info "Installing GeoIP" cd /tmp GEOIP_RELEASE=$(curl -s https://api.github.com/repos/maxmind/geoipupdate/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -wget -qO geoipupdate.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_RELEASE}/geoipupdate_${GEOIP_RELEASE}_linux_arm64.deb +wget -qO geoipupdate.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_RELEASE}/geoipupdate_${GEOIP_RELEASE}_linux_amd64.deb $STD dpkg -i geoipupdate.deb cat </etc/GeoIP.conf #GEOIPUPDATE_EDITION_IDS="GeoLite2-City GeoLite2-ASN" @@ -80,12 +80,14 @@ msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" $STD apt-get update $STD apt-get install -y nodejs +$STD apt-get install -y openssh-server +$STD apt-get install -y wget msg_ok "Installed Node.js" msg_info "Installing Golang" cd /tmp set +o pipefail -GO_RELEASE=$(curl -s https://go.dev/dl/ | grep -o -m 1 "go.*\linux-arm64.tar.gz") +GO_RELEASE=$(curl -s https://go.dev/dl/ | grep -o -m 1 "go.*\linux-amd64.tar.gz") wget -q https://golang.org/dl/${GO_RELEASE} tar -xzf ${GO_RELEASE} -C /usr/local ln -s /usr/local/go/bin/go /usr/bin/go @@ -94,11 +96,15 @@ msg_ok "Installed Golang" msg_info "Installing Redis" $STD apt-get install -y redis-server +$STD apt-get install -y openssh-server +$STD apt-get install -y wget systemctl enable -q --now redis-server msg_ok "Installed Redis" msg_info "Installing PostgreSQL" $STD apt-get install -y postgresql postgresql-contrib +$STD apt-get install -y openssh-server +$STD apt-get install -y wget DB_NAME="authentik" DB_USER="authentik" DB_PASS="$(openssl rand -base64 18 | cut -c1-13)" diff --git a/install/autobrr-install.sh b/install/autobrr-install.sh index 25fdd81cd..114daff03 100644 --- a/install/autobrr-install.sh +++ b/install/autobrr-install.sh @@ -22,7 +22,7 @@ $STD apt-get install -y wget msg_ok "Installed Dependencies" msg_info "Installing Autobrr" -wget -q $(curl -s https://api.github.com/repos/autobrr/autobrr/releases/latest | grep download | grep linux_arm64 | cut -d\" -f4) +wget -q $(curl -s https://api.github.com/repos/autobrr/autobrr/releases/latest | grep download | grep linux_x86_64 | cut -d\" -f4) tar -C /usr/local/bin -xzf autobrr*.tar.gz rm -rf autobrr*.tar.gz mkdir -p /root/.config/autobrr