brammp/HomeServerCTs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge Dev to Main (Alpine 1.17 update) #1

Merged
brammp merged 12 commits from dev into main 2023-01-29 15:53:17 +01:00
Conversation 0 Commits 12 Files Changed 16 +74 -74
5 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2fcbc2f46 - Show all commits

94
CT-Build/Alpine.yaml
View File

@@ -456,34 +456,34 @@ packages:
#PKGS for nextcloud #PKGS for nextcloud
- packages: - packages:
- php8-pdo_mysql - php81-pdo_mysql
- php8-pecl-imagick - php81-pecl-imagick
- php8-cli - php81-cli
- php8-pecl-apcu - php81-pecl-apcu
- php8-pecl-redis - php81-pecl-redis
- php8-fpm - php81-fpm
- php8-cgi - php81-cgi
- php8-common - php81-common
- php8-mbstring - php81-mbstring
- php8-curl - php81-curl
- php8-gd - php81-gd
- php8-intl - php81-intl
- php8-soap - php81-soap
- php8-xml - php81-xml
- php8-zip - php81-zip
- php8-pear - php81-pear
- php8-session - php81-session
- php8-posix - php81-posix
- php8-pdo - php81-pdo
- php8-dom - php81-dom
- php8-simplexml - php81-simplexml
- php8-xmlreader - php81-xmlreader
- php8-xmlwriter - php81-xmlwriter
- php8-opcache - php81-opcache
- php8-pcntl - php81-pcntl
- php8-fileinfo - php81-fileinfo
- php8-bcmath - php81-bcmath
- php8-gmp - php81-gmp
- libpng - libpng
- zlib - zlib
- imagemagick - imagemagick
@@ -528,12 +528,12 @@ packages:
#PKGS for MailBackup #PKGS for MailBackup
- packages: - packages:
- dovecot - dovecot
- php8-xml - php81-xml
- php8-fpm - php81-fpm
- php8-curl - php81-curl
- php8-dom - php81-dom
- php8-zip - php81-zip
- php8-mbstring - php81-mbstring
- php-openssl - php-openssl
- py3-pip - py3-pip
- sudo - sudo
@@ -571,19 +571,19 @@ packages:
#PKGS for Heimdall #PKGS for Heimdall
- packages: - packages:
- git - git
- php8 - php81
- php8-ctype - php81-ctype
- php8-curl - php81-curl
- php8-pdo_sqlite - php81-pdo_sqlite
- php8-mbstring - php81-mbstring
- php8-json - php81-json
- php8-zip - php81-zip
- php8-xml - php81-xml
- php8-fpm - php81-fpm
- php8-session - php81-session
- php8-openssl - php81-openssl
- php8-tokenizer - php81-tokenizer
- php8-fileinfo - php81-fileinfo
action: install action: install
variants: variants:
- heimdall - heimdall

6
CT-Files/heimdall/Scripts/Init.sh
View File

@@ -5,9 +5,9 @@ rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php-Fpm #Configure Php-Fpm
rm -rf /etc/php8/php-fpm.d/* rm -rf /etc/php81/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php8/php-fpm.d/heimdall.conf mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/heimdall.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php8/conf.d/04_date_timezone.ini mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini
#Install Heimdall #Install Heimdall
git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall

34
CT-Files/nextcloud/Scripts/FirstRun.sh
View File

@@ -18,24 +18,24 @@ if [ $ThisScriptConfigured = no ]; then
echo "Script is not configured" echo "Script is not configured"
exit exit
fi fi
sudo -u nginx php8 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud sudo -u nginx php81 /opt/nextcloud/occ maintenance:install --database mysql --database-name "$MysqlDatabase" --database-host "$MysqlIP" --database-port "$MysqlPort" --database-user "$MysqlUsername" --database-pass "$MysqlPassword" --database-table-space "" --admin-user "$NextcloudUsername" --admin-pass "$NexcloudPassword" --data-dir /var/nextcloud
sed -n -i '/#SetupBlockStart/{:a;N;/#SetupBlockEnd/!ba;N;s/.*//};p' /etc/nginx/nginx.conf sed -n -i '/#SetupBlockStart/{:a;N;/#SetupBlockEnd/!ba;N;s/.*//};p' /etc/nginx/nginx.conf
service nginx reload service nginx reload
sudo -u nginx php8 /opt/nextcloud/occ db:convert-filecache-bigint sudo -u nginx php81 /opt/nextcloud/occ db:convert-filecache-bigint
sudo -u nginx php8 /opt/nextcloud/occ db:add-missing-indices sudo -u nginx php81 /opt/nextcloud/occ db:add-missing-indices
#sudo -u nginx php8 /opt/nextcloud/occ app:disable firstrunwizard #sudo -u nginx php81 /opt/nextcloud/occ app:disable firstrunwizard
sudo -u nginx php8 /opt/nextcloud/occ config:system:set default_language --value=nl sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_language --value=nl
sudo -u nginx php8 /opt/nextcloud/occ config:system:set default_locale --value=nl sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_locale --value=nl
sudo -u nginx php8 /opt/nextcloud/occ config:system:set default_phone_region --value=nl sudo -u nginx php81 /opt/nextcloud/occ config:system:set default_phone_region --value=nl
sudo -u nginx php8 /opt/nextcloud/occ config:system:set skeletondirectory --value= sudo -u nginx php81 /opt/nextcloud/occ config:system:set skeletondirectory --value=
sudo -u nginx php8 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu' sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\APCu'
sudo -u nginx php8 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30 sudo -u nginx php81 /opt/nextcloud/occ config:system:set trashbin_retention_obligation --value=30,30
sudo -u nginx php8 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.distributed --value='\OC\Memcache\Redis'
sudo -u nginx php8 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' sudo -u nginx php81 /opt/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis'
sudo -u nginx php8 /opt/nextcloud/occ config:system:set redis host --value=localhost sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis host --value=localhost
sudo -u nginx php8 /opt/nextcloud/occ config:system:set redis port --value=6379 sudo -u nginx php81 /opt/nextcloud/occ config:system:set redis port --value=6379
sudo -u nginx php8 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" sudo -u nginx php81 /opt/nextcloud/occ config:system:set trusted_domains 1 --value="$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)"
sudo -u nginx php8 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)" sudo -u nginx php81 /opt/nextcloud/occ config:system:set overwrite.cli.url --value="$NextcloudWebProto://$(ifconfig | grep -A 1 'eth0' | tail -1 | cut -d ':' -f 2 | cut -d ' ' -f 1)"
sudo -u nginx php8 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto" sudo -u nginx php81 /opt/nextcloud/occ config:system:set overwriteprotocol --value="$NextcloudWebProto"

12
CT-Files/nextcloud/Scripts/Init.sh
View File

@@ -7,12 +7,12 @@ rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php-Cli #Configure Php-Cli
sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php8/php.ini sed -i '/memory_limit =/c\memory_limit = 512M' /etc/php81/php.ini
#Configure Php-Fpm #Configure Php-Fpm
rm -rf /etc/php8/php-fpm.d/* rm -rf /etc/php81/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php8/php-fpm.d/nextcloud.conf mv /opt/Setup/Configs/php.conf /etc/php81/php-fpm.d/nextcloud.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php8/conf.d/04_date_timezone.ini mv /opt/Setup/Configs/phpTimezone.ini /etc/php81/conf.d/04_date_timezone.ini
#Install Nextcloud #Install Nextcloud
mkdir /opt/nextcloud /var/nextcloud mkdir /opt/nextcloud /var/nextcloud
@@ -20,8 +20,8 @@ tar jxf /opt/Setup/nextcloud.tar.bz2 -C /opt/nextcloud --strip 1
rm -rf /opt/Setup/nextcloud.tar.bz2 rm -rf /opt/Setup/nextcloud.tar.bz2
chown -R nginx:nginx /opt/nextcloud chown -R nginx:nginx /opt/nextcloud
chown -R nginx:nginx /var/nextcloud chown -R nginx:nginx /var/nextcloud
echo "*/5 * * * * php8 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx echo "*/5 * * * * php81 -f /opt/nextcloud/cron.php > /dev/null 2>&1" >> /etc/crontabs/nginx
echo "apc.enable_cli=1" >> /etc/php8/php.ini echo "apc.enable_cli=1" >> /etc/php81/php.ini
#Enable services on boot #Enable services on boot
rc-update add nginx rc-update add nginx
rc-update add php-fpm8 rc-update add php-fpm8

2
CT-Files/nextcloud/Scripts/PTKAppUpdate.sh
View File

@@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
# Update script for updating apps with ProxmoxHelper/ProxMoxToolKit # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
sudo -u nginx php8 /opt/nextcloud/updater/updater.phar --no-interaction sudo -u nginx php81 /opt/nextcloud/updater/updater.phar --no-interaction