From 42f347602a5577b87aa8c573723ae8cda098c303 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 19 Jan 2024 13:20:30 -0600 Subject: [PATCH] Update apt-key usages in features --- scripts/features/blackfire.sh | 4 +-- scripts/features/cassandra.sh | 5 ++-- scripts/features/couchdb.sh | 6 ++-- scripts/features/crystal.sh | 5 ++-- scripts/features/elasticsearch.sh | 5 ++-- scripts/features/grafana.sh | 4 +-- scripts/features/influxdb.sh | 4 +-- scripts/features/logstash.sh | 5 ++-- scripts/features/mongodb.sh | 7 ++--- scripts/features/neo4j.sh | 5 ++-- scripts/features/openresty.sh | 5 ++-- scripts/features/r-base.sh | 6 ++-- scripts/features/rabbitmq.sh | 50 ++++++++++++------------------- scripts/features/timescaledb.sh | 11 ++++--- scripts/features/webdriver.sh | 13 ++++---- 15 files changed, 62 insertions(+), 73 deletions(-) diff --git a/scripts/features/blackfire.sh b/scripts/features/blackfire.sh index 789605276..f60f9139f 100755 --- a/scripts/features/blackfire.sh +++ b/scripts/features/blackfire.sh @@ -20,8 +20,8 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/blackfire chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - -echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list +curl -fsSL https://packages.blackfire.io/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/blackfire.gpg +echo "deb [signed-by=/etc/apt/keyrings/blackfire.gpg] http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list # Install Blackfire sudo DEBIAN_FRONTEND=noninteractive apt-get update diff --git a/scripts/features/cassandra.sh b/scripts/features/cassandra.sh index f1fa1ec1d..9e5f83de2 100755 --- a/scripts/features/cassandra.sh +++ b/scripts/features/cassandra.sh @@ -20,8 +20,9 @@ touch /home/$WSL_USER_NAME/.homestead-features/cassandra chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features # Install Cassandra and driver dependencies -echo "deb http://www.apache.org/dist/cassandra/debian 311x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list -wget -q -O - https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add - +echo "deb https://debian.cassandra.apache.org 41x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list +curl https://downloads.apache.org/cassandra/KEYS | sudo apt-key add - + sudo DEBIAN_FRONTEND=noninteractive apt update sudo DEBIAN_FRONTEND=noninteractive apt install cassandra openjdk-8-jdk git libgmp-dev php7.1-dev php7.2-dev php7.3-dev php7.4-dev -y diff --git a/scripts/features/couchdb.sh b/scripts/features/couchdb.sh index 56a027a57..f6e92da1b 100755 --- a/scripts/features/couchdb.sh +++ b/scripts/features/couchdb.sh @@ -19,11 +19,9 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/couchdb chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -echo "deb https://apache.bintray.com/couchdb-deb focal main" \ - | sudo tee -a /etc/apt/sources.list.d/couchdb.list +curl -fsSL https://couchdb.apache.org/repo/keys.asc | sudo gpg --dearmor -o /etc/apt/keyrings/couchdb.gpg +echo "deb [signed-by=/etc/apt/keyrings/couchdb.gpg] https://apache.jfrog.io/artifactory/couchdb-deb/ jammy main" | sudo tee /etc/apt/sources.list.d/couchdb.list -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \ - 8756C4F765C9AC3CB6B85D62379CE192D401AB61 sudo apt-get update echo "couchdb couchdb/mode select standalone couchdb couchdb/mode seen true diff --git a/scripts/features/crystal.sh b/scripts/features/crystal.sh index 4ae55298d..ed5521c7a 100755 --- a/scripts/features/crystal.sh +++ b/scripts/features/crystal.sh @@ -20,8 +20,9 @@ touch /home/$WSL_USER_NAME/.homestead-features/crystal chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features # Install Crystal Programming Language Support -curl -sL "https://keybase.io/crystal/pgp_keys.asc" | sudo apt-key add - -echo "deb https://dist.crystal-lang.org/apt crystal main" | sudo tee /etc/apt/sources.list.d/crystal.list +curl -fsSL https://keybase.io/crystal/pgp_keys.asc | sudo gpg --dearmor -o /etc/apt/keyrings/crystal.gpg +echo "deb [signed-by=/etc/apt/keyrings/crystal.gpg] https://dist.crystal-lang.org/apt crystal main" | sudo tee /etc/apt/sources.list.d/crystal.list + apt-get update apt-get install -y crystal diff --git a/scripts/features/elasticsearch.sh b/scripts/features/elasticsearch.sh index 12838978e..973c9ad78 100755 --- a/scripts/features/elasticsearch.sh +++ b/scripts/features/elasticsearch.sh @@ -38,11 +38,10 @@ echo "Elasticsearch majorVersion: $majorVersion" # Install Java & Elasticsearch - -wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - +curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /etc/apt/keyrings/elasticsearch.gpg if [ ! -f /etc/apt/sources.list.d/elastic-$majorVersion.x.list ]; then - echo "deb https://artifacts.elastic.co/packages/$majorVersion.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-$majorVersion.x.list + echo "deb [signed-by=/etc/apt/keyrings/elasticsearch.gpg] https://artifacts.elastic.co/packages/$majorVersion.x/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-$majorVersion.x.list fi sudo apt-get update diff --git a/scripts/features/grafana.sh b/scripts/features/grafana.sh index 11ed9800c..5114bcbe1 100755 --- a/scripts/features/grafana.sh +++ b/scripts/features/grafana.sh @@ -19,8 +19,8 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/grafana chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -echo "deb https://packages.grafana.com/oss/deb stable main" > /etc/apt/sources.list.d/grafana.list -curl -s https://packages.grafana.com/gpg.key | apt-key add - +curl -fsSL https://packages.grafana.com/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/grafana.gpg +echo "deb [signed-by=/etc/apt/keyrings/grafana.gpg] https://packages.grafana.com/oss/deb stable main" | sudo tee /etc/apt/sources.list.d/grafana.list apt-get update -y apt-get install -y grafana diff --git a/scripts/features/influxdb.sh b/scripts/features/influxdb.sh index 055b4f7ff..d323d6e3a 100755 --- a/scripts/features/influxdb.sh +++ b/scripts/features/influxdb.sh @@ -17,13 +17,13 @@ then fi -# InfluxDB v2.7.4 - from https://www.influxdata.com/downloads/ - +# InfluxDB v2.7.5 - from https://www.influxdata.com/downloads/ # influxdata-archive_compat.key GPG fingerprint: # 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E wget -q https://repos.influxdata.com/influxdata-archive_compat.key echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list + apt-get update apt-get install -y influxdb2 diff --git a/scripts/features/logstash.sh b/scripts/features/logstash.sh index 4c6df6b84..3f94e6169 100644 --- a/scripts/features/logstash.sh +++ b/scripts/features/logstash.sh @@ -38,11 +38,10 @@ echo "Logstash majorVersion: $majorVersion" # Install Java & Logstash - -wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - +curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /etc/apt/keyrings/elasticsearch.gpg if [ ! -f /etc/apt/sources.list.d/elastic-$majorVersion.x.list ]; then - echo "deb https://artifacts.elastic.co/packages/$majorVersion.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-$majorVersion.x.list + echo "deb [signed-by=/etc/apt/keyrings/elasticsearch.gpg] https://artifacts.elastic.co/packages/$majorVersion.x/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-$majorVersion.x.list fi sudo apt-get update diff --git a/scripts/features/mongodb.sh b/scripts/features/mongodb.sh index ebcfcfab6..397c9fae2 100755 --- a/scripts/features/mongodb.sh +++ b/scripts/features/mongodb.sh @@ -21,14 +21,13 @@ ARCH=$(arch) touch /home/$WSL_USER_NAME/.homestead-features/mongodb chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features +curl -fsSL https://www.mongodb.org/static/pgp/server-6.0.asc | sudo gpg --dearmor -o /etc/apt/keyrings/mongodb.gpg if [[ "$ARCH" == "aarch64" ]]; then - echo "deb [ arch=arm64 ] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list + echo "deb [signed-by=/etc/apt/keyrings/mongodb.gpg arch=arm64] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list else - echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list + echo "deb [signed-by=/etc/apt/keyrings/mongodb.gpg arch=amd64] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list fi -wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add - - sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confnew" install mongodb-org autoconf g++ make openssl libssl-dev libcurl4-openssl-dev pkg-config libsasl2-dev php-dev diff --git a/scripts/features/neo4j.sh b/scripts/features/neo4j.sh index 7584853a3..156879b46 100755 --- a/scripts/features/neo4j.sh +++ b/scripts/features/neo4j.sh @@ -19,8 +19,9 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/neo4j chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -wget -O - https://debian.neo4j.org/neotechnology.gpg.key | sudo apt-key add - -echo 'deb https://debian.neo4j.org/repo stable/' | sudo tee -a /etc/apt/sources.list.d/neo4j.list +wget -O - https://debian.neo4j.com/neotechnology.gpg.key | sudo apt-key add - +echo 'deb https://debian.neo4j.com stable latest' | sudo tee /etc/apt/sources.list.d/neo4j.list + apt-get update # Install Neo4j Community Edition diff --git a/scripts/features/openresty.sh b/scripts/features/openresty.sh index 4b13e4b8c..b41e748f6 100755 --- a/scripts/features/openresty.sh +++ b/scripts/features/openresty.sh @@ -20,10 +20,9 @@ touch /home/$WSL_USER_NAME/.homestead-features/openresty chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features # Install Openresty +curl -fsSL https://openresty.org/package/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/openresty.gpg +echo "deb [signed-by=/etc/apt/keyrings/openresty.gpg] http://openresty.org/package/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/openresty.list -wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add - -sudo apt-get install -y software-properties-common -sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" sudo apt-get update sudo service nginx stop sudo apt-get install -y openresty diff --git a/scripts/features/r-base.sh b/scripts/features/r-base.sh index 99329aba3..b263aaa03 100644 --- a/scripts/features/r-base.sh +++ b/scripts/features/r-base.sh @@ -19,6 +19,8 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/r-base chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 -add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/' +wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo gpg --dearmor -o /etc/apt/keyrings/r-project.gpg +echo "deb [signed-by=/etc/apt/keyrings/r-project.gpg] https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" | sudo tee /etc/apt/sources.list.d/r-project.list + +apt-get update apt install -y r-base diff --git a/scripts/features/rabbitmq.sh b/scripts/features/rabbitmq.sh index f5708bf2e..5d6100da7 100755 --- a/scripts/features/rabbitmq.sh +++ b/scripts/features/rabbitmq.sh @@ -19,53 +19,41 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/rabbitmq chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features - sudo apt-get install curl gnupg debian-keyring debian-archive-keyring apt-transport-https -y -## Team RabbitMQ's main signing key -sudo apt-key adv --keyserver "hkps://keys.openpgp.org" --recv-keys "0x0A9AF2115F4687BD29803A206B73A36E6026DFCA" -## Launchpad PPA that provides modern Erlang releases -sudo apt-key adv --keyserver "keyserver.ubuntu.com" --recv-keys "F77F1EDA57EBB1CC" -## PackageCloud RabbitMQ repository -sudo apt-key adv --keyserver "keyserver.ubuntu.com" --recv-keys "F6609E60DC62814E" +# Import signing keys +curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA" | sudo gpg --dearmor -o /etc/apt/keyrings/com.rabbitmq.team.gpg +curl -1sLf "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf77f1eda57ebb1cc" | sudo gpg --dearmor -o /etc/apt/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg +curl -1sLf "https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey" | sudo gpg --dearmor -o /etc/apt/keyrings/io.packagecloud.rabbitmq.gpg ## Add apt repositories maintained by Team RabbitMQ -sudo tee /etc/apt/sources.list.d/rabbitmq.list < /etc/apt/sources.list.d/timescaledb.list" -wget --quiet -O - https://packagecloud.io/timescale/timescaledb/gpgkey | sudo apt-key add - -sudo apt-get update +curl -fsSL https://packagecloud.io/timescale/timescaledb/gpgkey | sudo gpg --dearmor -o /etc/apt/keyrings/timescaledb.gpg +echo 'deb [signed-by=/etc/apt/keyrings/timescaledb.gpg] https://packagecloud.io/timescale/timescaledb/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/timescaledb.list -sudo apt-get -y install timescaledb-2-postgresql-13 +sudo apt-get update +sudo apt-get -y install timescaledb-2-postgresql-15 sudo timescaledb-tune --quiet --yes -printf "\ntimescaledb.telemetry_level=off\n" | sudo tee -a /etc/postgresql/13/main/postgresql.conf +printf "\ntimescaledb.telemetry_level=off\n" | sudo tee -a /etc/postgresql/15/main/postgresql.conf sudo service postgresql restart diff --git a/scripts/features/webdriver.sh b/scripts/features/webdriver.sh index b38684841..d2f2c0460 100755 --- a/scripts/features/webdriver.sh +++ b/scripts/features/webdriver.sh @@ -19,11 +19,14 @@ fi touch /home/$WSL_USER_NAME/.homestead-features/webdriverutils chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -# Install The Chrome Web Driver & Dusk Utilities -wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - -echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee -a /etc/apt/sources.list.d/google-chrome.list +ARCH=$(arch) -apt-get update +# Install The Chrome Web Driver & Dusk Utilities +if [[ "$ARCH" != "aarch64" ]]; then + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -O /tmp/chrome.deb + dpkg -i /tmp/chrome.deb + rm -f /tmp/chrome.deb +fi apt-get -y install libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 chromium-browser xvfb gtk2-engines-pixbuf \ -xfonts-cyrillic xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable imagemagick x11-apps google-chrome-stable +xfonts-cyrillic xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable imagemagick x11-apps