From 8cb1af316eb38069fcc36d9556371a1f29615d10 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Tue, 26 May 2020 00:16:44 +0200 Subject: [PATCH] Update All The Blueprints (and remove unneeded pkgs) - add some missing nextcloud dependencies - Move the ports installs to pkg - Remove/Disable ports - update organizr php - update mariadb and phpmyadmin - update Lidarr - Update Jackett - Remove possibly useless dependancies --- blueprints/bitwarden/config.yml | 2 +- blueprints/jackett/install.sh | 2 +- blueprints/lidarr/install.sh | 6 +++--- blueprints/mariadb/config.yml | 2 +- blueprints/nextcloud/config.yml | 3 +-- blueprints/nextcloud/install.sh | 2 -- blueprints/organizr/config.yml | 2 +- blueprints/transmission/update.sh | 1 + 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/blueprints/bitwarden/config.yml b/blueprints/bitwarden/config.yml index c79bd93c..b0a293d7 100644 --- a/blueprints/bitwarden/config.yml +++ b/blueprints/bitwarden/config.yml @@ -1,3 +1,3 @@ blueprint: bitwarden: - pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client \ No newline at end of file + pkgs: git sudo bash node npm mariadb104-client \ No newline at end of file diff --git a/blueprints/jackett/install.sh b/blueprints/jackett/install.sh index d5e4ede7..51f22fc5 100755 --- a/blueprints/jackett/install.sh +++ b/blueprints/jackett/install.sh @@ -1,7 +1,7 @@ #!/usr/local/bin/bash # This file contains the install script for jackett -iocage exec "$1" "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share" +iocage exec "$1" "fetch https://github.com/Jackett/Jackett/releases/download/v0.16.546/Jackett.Binaries.Mono.tar.gz -o /usr/local/share" iocage exec "$1" "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share" iocage exec "$1" rm /usr/local/share/Jackett.Binaries.Mono.tar.gz iocage exec "$1" "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin" diff --git a/blueprints/lidarr/install.sh b/blueprints/lidarr/install.sh index 119f9ebc..ef8b0d54 100755 --- a/blueprints/lidarr/install.sh +++ b/blueprints/lidarr/install.sh @@ -12,9 +12,9 @@ createmount "$1" "${global_dataset_media}" createmount "$1" "${global_dataset_media}"/music /mnt/music -iocage exec "$1" "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share" -iocage exec "$1" "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share" -iocage exec "$1" "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz" +iocage exec "$1" "fetch https://github.com/lidarr/Lidarr/releases/download/v0.7.1.1381/Lidarr.master.0.7.1.1381.linux.tar.gz -o /usr/local/share" +iocage exec "$1" "tar -xzvf Lidarr.master.0.7.1.1381.linux.tar.gz -C /usr/local/share" +iocage exec "$1" "rm /usr/local/share/Lidarr.master.0.7.1.1381.linux.tar.gz" iocage exec "$1" "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin" iocage exec "$1" chown -R lidarr:lidarr /usr/local/share/Lidarr /config iocage exec "$1" mkdir /usr/local/etc/rc.d diff --git a/blueprints/mariadb/config.yml b/blueprints/mariadb/config.yml index 05feae35..403cb8a9 100644 --- a/blueprints/mariadb/config.yml +++ b/blueprints/mariadb/config.yml @@ -1,3 +1,3 @@ blueprint: mariadb: - pkgs: mariadb104-server git php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1 + pkgs: mariadb104-server git php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74 diff --git a/blueprints/nextcloud/config.yml b/blueprints/nextcloud/config.yml index 0f8e0193..edbf9d25 100644 --- a/blueprints/nextcloud/config.yml +++ b/blueprints/nextcloud/config.yml @@ -1,4 +1,3 @@ blueprint: nextcloud: - pkgs: nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf - ports: true \ No newline at end of file + pkgs: nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf php73-opcache php73-pcntl php73-bcmath php73-pecl-APCu \ No newline at end of file diff --git a/blueprints/nextcloud/install.sh b/blueprints/nextcloud/install.sh index 79f56f3f..d704d839 100755 --- a/blueprints/nextcloud/install.sh +++ b/blueprints/nextcloud/install.sh @@ -142,8 +142,6 @@ fi iocage exec "${1}" sysrc redis_enable="YES" iocage exec "${1}" sysrc php_fpm_enable="YES" -iocage exec "${1}" sh -c "make -C /usr/ports/www/php73-opcache clean install BATCH=yes" -iocage exec "${1}" sh -c "make -C /usr/ports/devel/php73-pcntl clean install BATCH=yes" ##### diff --git a/blueprints/organizr/config.yml b/blueprints/organizr/config.yml index a06f8e48..a952ad5c 100644 --- a/blueprints/organizr/config.yml +++ b/blueprints/organizr/config.yml @@ -1,3 +1,3 @@ blueprint: organizr: - pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git \ No newline at end of file + pkgs: nginx php74 php74-filter php74-curl php74-hash php74-json php74-openssl php74-pdo php74-pdo_sqlite php74-session php74-simplexml php74-sqlite3 php74-zip git \ No newline at end of file diff --git a/blueprints/transmission/update.sh b/blueprints/transmission/update.sh index 6c3d216e..8b0ec710 100755 --- a/blueprints/transmission/update.sh +++ b/blueprints/transmission/update.sh @@ -2,6 +2,7 @@ # This file contains the update script for transmission iocage exec "$1" service transmission stop + # Transmision is updated during PKG update, this file is mostly just a placeholder iocage exec "$1" chown -R transmission:transmission /config iocage exec "$1" service transmission restart \ No newline at end of file