diff --git a/install/pixelfed-install.sh b/install/pixelfed-install.sh index bd39d0e6c..765c5cb53 100644 --- a/install/pixelfed-install.sh +++ b/install/pixelfed-install.sh @@ -30,14 +30,13 @@ useradd -rU -s /bin/bash pixelfed usermod -aG redis pixelfed msg_ok "Created Pixelfed User" - PG_VERSION="17" setup_postgresql PG_DB_NAME="pixelfed" PG_DB_USER="pixelfed" setup_postgresql_db PHP_VERSION="8.4" PHP_FPM="YES" PHP_MODULE="bcmath,ctype,curl,exif,gd,imagick,intl,mbstring,pgsql,redis,xml,zip" PHP_UPLOAD_MAX_FILESIZE="500M" PHP_POST_MAX_SIZE="500M" PHP_MAX_EXECUTION_TIME="600" setup_php setup_composer msg_info "Configuring Redis" -REDIS_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13) +REDIS_PASS=$(random_password) sed -i "s/^# requirepass foobared/requirepass $REDIS_PASS/" /etc/redis/redis.conf sed -i "s/^requirepass .*/requirepass $REDIS_PASS/" /etc/redis/redis.conf systemctl restart redis-server @@ -51,6 +50,7 @@ sed -i 's/^group = www-data/group = pixelfed/' /etc/php/8.4/fpm/pool.d/pixelfed. sed -i 's|^listen = .*|listen = /run/php/php8.4-fpm-pixelfed.sock|' /etc/php/8.4/fpm/pool.d/pixelfed.conf sed -i 's/^listen.owner = .*/listen.owner = www-data/' /etc/php/8.4/fpm/pool.d/pixelfed.conf sed -i 's/^listen.group = .*/listen.group = www-data/' /etc/php/8.4/fpm/pool.d/pixelfed.conf +sed -i -E 's/^\s*;?\s*ffi\.enable\s*=.*/ffi.enable=true/' /etc/php/8.4/fpm/php.ini systemctl restart php8.4-fpm msg_ok "Configured PHP-FPM Pool" @@ -66,7 +66,7 @@ APP_DEBUG="false" APP_URL=http://${LOCAL_IP} APP_DOMAIN=${LOCAL_IP} ADMIN_DOMAIN=${LOCAL_IP} -SESSION_DOMAIN=${LOCAL_IP} +SESSION_DOMAIN=null TRUST_PROXIES="*" FORCE_HTTPS_URLS="false" @@ -97,7 +97,7 @@ REDIS_PASSWORD="${REDIS_PASS}" REDIS_PORT="6379" SESSION_DRIVER="database" -CACHE_DRIVER="redis" +CACHE_STORE="redis" QUEUE_DRIVER="redis" BROADCAST_DRIVER="log" LOG_CHANNEL="stack" @@ -179,10 +179,7 @@ server { } } EOF -ln -sf /etc/nginx/sites-available/pixelfed /etc/nginx/sites-enabled/pixelfed -rm -f /etc/nginx/sites-enabled/default -$STD nginx -t -systemctl reload nginx +nginx_enable_site pixelfed msg_ok "Configured Nginx" msg_info "Creating Services" @@ -230,7 +227,6 @@ EOF systemctl enable -q --now pixelfed-horizon pixelfed-scheduler.timer msg_ok "Created Services" - motd_ssh customize cleanup_lxc