Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v159 #1289

Merged
merged 142 commits into from
Dec 10, 2017
Merged

v159 #1289

Changes from 10 commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
818b96a
v159
Fourdee Nov 13, 2017
5f48e21
v159
Fourdee Nov 13, 2017
8ec02d1
v159
Fourdee Nov 13, 2017
86e3cb1
v159
Fourdee Nov 13, 2017
3142d1d
v159
Fourdee Nov 13, 2017
ccc0559
v159
Fourdee Nov 13, 2017
8b2c5f0
v159
Fourdee Nov 15, 2017
bdec6c5
v159
Fourdee Nov 17, 2017
d3bd05d
v159
Fourdee Nov 17, 2017
73894bf
[Nextcloud] Fix terminal installation
MichaIng Nov 17, 2017
20a5906
[Nextcloud] Also drop 'parent' database user
MichaIng Nov 17, 2017
f1f218f
[Nextcloud] Forgotten "
MichaIng Nov 17, 2017
49d72d6
v159
MichaIng Nov 17, 2017
7fb8519
[Nextcloud] Remove dropping of parent database user
MichaIng Nov 18, 2017
7e4ded7
v159
Fourdee Nov 18, 2017
8ece6e7
v159
Fourdee Nov 19, 2017
387d337
DietPi System Preparation | Add sysctl config values to our own .conf…
MichaIng Nov 20, 2017
4b8c537
DietPi-BugReport | Add sysctl.conf inclusions into bug report
MichaIng Nov 20, 2017
64324a3
Update CHANGELOG.txt
MichaIng Nov 20, 2017
e4898f1
DietPi-Software | ownCloud: Changelog update regarding #1243
MichaIng Nov 20, 2017
5fe8404
Merge pull request #1242 from MichaIng/patch-1
Fourdee Nov 20, 2017
397f103
Merge pull request #1243 from MichaIng/patch-2
Fourdee Nov 20, 2017
88a11ed
Fix creation of /etc/sysctl.d/97-dietpi.conf
MichaIng Nov 20, 2017
8f180a9
DietPi-Software | Redis: Minor un/installation and activation fixes o…
MichaIng Nov 21, 2017
293239a
v159
Fourdee Nov 21, 2017
4553ebe
Merge branch 'testing' of https://github.com/Fourdee/DietPi into testing
Fourdee Nov 21, 2017
4ac07e0
Merge pull request #1247 from MichaIng/patch-3
Fourdee Nov 21, 2017
7133bf7
tiny typo
MichaIng Nov 21, 2017
e9bfaba
DietPi-Software | ownCloud: Bring ownCloud installation onto the stag…
MichaIng Nov 22, 2017
6cfd1fb
v159
Fourdee Nov 22, 2017
8db1796
v159
Fourdee Nov 22, 2017
e6aabce
Merge pull request #1249 from MichaIng/patch-1
Fourdee Nov 22, 2017
196c25f
v159
Fourdee Nov 22, 2017
af034bb
v159
Fourdee Nov 22, 2017
3befa86
DietPi-Software | ownCloud: Add occ terminal installation and configu…
MichaIng Nov 23, 2017
59dfe54
v159
Fourdee Nov 23, 2017
4f49ba8
DietPi-Software | ownCloud: Adjust Nginx config according to admin ma…
MichaIng Nov 23, 2017
821a020
DietPi-Software | ownCloud/Nextcloud: Apache config according to admi…
MichaIng Nov 23, 2017
7b77550
DietPi-Software | Nextcloud: Switch script to separate apache config …
MichaIng Nov 23, 2017
3a08161
DietPi-Software | ownCloud: Add missing notes to Nginx config
MichaIng Nov 23, 2017
25e7718
DietPi-Software | Nextcloud: Create separate Nginx config file
MichaIng Nov 23, 2017
6d462ac
DietPi-Software | Nextcloud: Move Nginx config from script into seper…
MichaIng Nov 23, 2017
37cd685
DietPi-Software | ownCloud/Nextcloud: Reorder uninstallation
MichaIng Nov 23, 2017
1f0c082
v159
Fourdee Nov 24, 2017
e574f01
Merge pull request #1251 from MichaIng/patch-2
Fourdee Nov 24, 2017
6b51b81
v159
Fourdee Nov 24, 2017
a61d508
v159
Fourdee Nov 25, 2017
1ba1d64
v159
Fourdee Nov 25, 2017
78ca556
v159
Fourdee Nov 26, 2017
ad4e604
DietPi-Software | PHP: Fix 'upload_tmp_dir' issue
MichaIng Nov 26, 2017
cc2cb5f
DietPi-Software | PHP: Fix 'upload_tmp_dir' on update
MichaIng Nov 26, 2017
af95429
DietPi-Software | PHP: Add removal of 'dietpi.ini' to uninstallation
MichaIng Nov 26, 2017
8456915
v159
Fourdee Nov 27, 2017
8a7c8c1
DietPi-Software | ownCloud/Nextcloud: Use Redis for transactional fil…
MichaIng Nov 27, 2017
f587563
DietPi-Software | PHP: Set file path correctly as string
MichaIng Nov 27, 2017
9ad52c2
DietPi-Software | PHP: Correctly set file path as string variable
MichaIng Nov 27, 2017
e2c2b91
v159
MichaIng Nov 27, 2017
3f76d63
Merge branch 'testing' into patch-1
MichaIng Nov 27, 2017
5db153b
Merge branch 'testing' into patch-1
MichaIng Nov 27, 2017
8cba00a
Merge pull request #1259 from MichaIng/patch-1
Fourdee Nov 27, 2017
3525ac5
v159
Fourdee Nov 28, 2017
2b033ac
v159
Fourdee Nov 28, 2017
dff920a
v159
Fourdee Nov 28, 2017
14dfbfe
v159
Fourdee Nov 29, 2017
a632056
v159
Fourdee Nov 29, 2017
2d37d73
v159
Fourdee Nov 29, 2017
a2b36ea
v159
Fourdee Nov 29, 2017
0c7a253
v159
Fourdee Nov 29, 2017
4160a54
v159
Fourdee Nov 29, 2017
93ec4c7
DietPi-Software | PHP: Fix 'upload_tmp_dir' patch
MichaIng Nov 30, 2017
a00f119
v159
MichaIng Nov 30, 2017
3aa5dd0
v159
Fourdee Nov 30, 2017
2679d9c
v159
Fourdee Nov 30, 2017
58396d7
v159
Fourdee Nov 30, 2017
bc3fa9f
Merge pull request #1265 from MichaIng/patch-1
Fourdee Dec 1, 2017
35f9d00
v159
Fourdee Dec 1, 2017
bf5eeea
v159
Fourdee Dec 1, 2017
f9f629d
v159
Fourdee Dec 1, 2017
6e6221d
v159
Fourdee Dec 2, 2017
7fe0ef4
v159
Fourdee Dec 2, 2017
f3b3ab2
v159
Fourdee Dec 2, 2017
ea4342d
v159
Fourdee Dec 2, 2017
4f21c2d
DietPi-Software | ownCloud/Nextcloud: Enable background cron jobs
MichaIng Dec 2, 2017
20d1c9b
DietPi-Software | ownCloud/Nextcloud: Add occ command alias to bashrc
MichaIng Dec 2, 2017
d31b49e
DietPi-Config | ownCloud/Nextcloud: Patch cronjob and occ alias on di…
MichaIng Dec 2, 2017
487a23e
Merge branch 'testing' into patch-2
MichaIng Dec 2, 2017
bae6922
Merge branch 'testing' into patch-2
MichaIng Dec 2, 2017
1b6faf0
v159
MichaIng Dec 2, 2017
3a451c1
v159
Fourdee Dec 3, 2017
992dd50
v159
Fourdee Dec 3, 2017
2c48217
v159
Fourdee Dec 3, 2017
41d47a2
v159
Fourdee Dec 3, 2017
b79a75a
v159
Fourdee Dec 3, 2017
72fa011
v159
MichaIng Dec 4, 2017
7ed6dad
v159
MichaIng Dec 4, 2017
59bbf55
v159
MichaIng Dec 4, 2017
0bf9a3c
DietPi-Software | ownCloud/Nextcloud: Enable MySQL 4-byte support on …
MichaIng Dec 5, 2017
e2293e3
DietPi-Software | ownCloud/Nextcloud: Prevent configuration from over…
MichaIng Dec 5, 2017
d972f5e
v159
MichaIng Dec 5, 2017
5f8b8ab
DietPi-Software | ownCloud/Nextcloud: Save MySQL backup to user data …
MichaIng Dec 5, 2017
6939331
v159
MichaIng Dec 5, 2017
76c9353
v159
MichaIng Dec 5, 2017
595ec99
DietPi-Software || ownCloud/Nextcloud: Control maintenance mode durin…
MichaIng Dec 5, 2017
d481738
v159
MichaIng Dec 5, 2017
b837ac3
v159
Fourdee Dec 5, 2017
7daa5c0
Merge pull request #1261 from MichaIng/patch-2
Fourdee Dec 5, 2017
7165c96
v159
MichaIng Dec 5, 2017
8e291a3
v159
MichaIng Dec 5, 2017
14122b3
v159
MichaIng Dec 6, 2017
e522b8c
v159
MichaIng Dec 6, 2017
15feb6d
v159
MichaIng Dec 6, 2017
206e526
v159
MichaIng Dec 6, 2017
0991b68
v159
MichaIng Dec 6, 2017
25420eb
v159
MichaIng Dec 6, 2017
6976b98
v159
MichaIng Dec 6, 2017
29a33b2
v159
MichaIng Dec 6, 2017
a5f9cc4
v159
MichaIng Dec 7, 2017
bcc10f3
Merge pull request #1272 from MichaIng/patch-1
Fourdee Dec 7, 2017
c07909b
v159
Fourdee Dec 7, 2017
e2fb0eb
v159
Fourdee Dec 7, 2017
8c7d22c
v159
Fourdee Dec 7, 2017
3173643
v159
Fourdee Dec 7, 2017
5ba37d6
v159
Fourdee Dec 7, 2017
e35fac8
v159
Fourdee Dec 8, 2017
bdfb73e
v159
Fourdee Dec 8, 2017
fd46105
v159
Fourdee Dec 8, 2017
892a371
v159
Fourdee Dec 8, 2017
69e9d85
v159
Fourdee Dec 9, 2017
fe8f8ac
v159
Fourdee Dec 9, 2017
d02af8e
v159
Fourdee Dec 9, 2017
827e276
DietPi-Software | ownCloud/Nextcloud: Tiny polish
MichaIng Dec 9, 2017
3184340
Merge pull request #1284 from MichaIng/patch-4
Fourdee Dec 9, 2017
17a7eee
v159
Fourdee Dec 9, 2017
2eeece9
v159
Fourdee Dec 9, 2017
38a1696
v159
Fourdee Dec 9, 2017
3165361
v159
Fourdee Dec 9, 2017
4eaeb31
v159
Fourdee Dec 9, 2017
69edcdc
v159
Fourdee Dec 10, 2017
eb6b425
v159
Fourdee Dec 10, 2017
7d0278b
v159
Fourdee Dec 10, 2017
c7f6543
v159
Fourdee Dec 10, 2017
e30065d
v159
Fourdee Dec 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ DietPi-Config | Time sync modes: NTP is now uninstalled when SystemD timedatectl
DietPi-Software | APT log: Moved to /etc/dietpi/logs/dietpi-software_apt.log, to prevent RAMlog clearing log during automated installations.
DietPi-Software | MPD (Stretch): Install updated to 0.20.11: https://github.com/Fourdee/DietPi/issues/1236
DietPi-Software | moOde: MPD now installed via pre-built binaries. Will reduce install time: https://github.com/Fourdee/DietPi/issues/1223#issuecomment-345265290
DietPi-Software | Nextcloud: Correct database access issue for MariaDB + minor fixes: https://github.com/Fourdee/DietPi/pull/1242
DietPi-Software | ownCloud: Installation fixed, respecting different distro repos: https://github.com/Fourdee/DietPi/pull/1243

Bug Fixes:
DietPi-Config | Nvidia driver: nouveau now disabled during install, fix for 750Ti and possibily other Nvidia chipsets (thanks dubyazero): https://github.com/Fourdee/DietPi/issues/1244
63 changes: 43 additions & 20 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
@@ -1240,7 +1240,7 @@ _EOF_
#--------------------------------------------------------------------------------
index_current=47

aSOFTWARE_WHIP_NAME[$index_current]='OwnCloud'
aSOFTWARE_WHIP_NAME[$index_current]='ownCloud'
aSOFTWARE_WHIP_DESC[$index_current]='your very own cloud (eg: dropbox)'
aSOFTWARE_CATEGORY_INDEX[$index_current]=4
aSOFTWARE_TYPE[$index_current]=0
@@ -4099,31 +4099,52 @@ _EOF_

fi

#OwnCloud
#ownCloud
INSTALLING_INDEX=47
if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then

Banner_Installing

INSTALL_URL_ADDRESS='https://download.owncloud.org/download/repositories/stable/Debian_8.0/Release.key'
if (( $DISTRO == 3 )); then

INSTALL_URL_ADDRESS='https://download.owncloud.org/download/repositories/stable/Debian_8.0/Release.key'

elif (( $DISTRO == 4 )); then

INSTALL_URL_ADDRESS='https://download.owncloud.org/download/repositories/stable/Debian_9.0/Release.key'

else

INSTALL_URL_ADDRESS='https://download.owncloud.org/community/owncloud-latest.zip'

fi

/DietPi/dietpi/func/check_connection "$INSTALL_URL_ADDRESS"
#Install
if (( $? == 0 )); then

if [ ! -f /etc/apt/sources.list.d/owncloud.list ]; then

wget "$INSTALL_URL_ADDRESS" -O owncloud.key
apt-key add - < owncloud.key
rm owncloud.key
wget "$INSTALL_URL_ADDRESS" -O owncloud.key_or_zip
apt-key add - < owncloud.key_or_zip &> /dev/null
unzip -o owncloud.key_or_zip -d /var/www &> /dev/null
rm owncloud.key_or_zip

echo -e "deb http://download.owncloud.org/download/repositories/stable/Debian_8.0/ /" > /etc/apt/sources.list.d/owncloud.list
if (( $DISTRO == 3 )); then

apt-get update
echo -e "deb https://download.owncloud.org/download/repositories/stable/Debian_8.0/ /" > /etc/apt/sources.list.d/owncloud.list
apt-get update

elif (( $DISTRO == 4 )); then

echo -e "deb https://download.owncloud.org/download/repositories/stable/Debian_9.0/ /" > /etc/apt/sources.list.d/owncloud.list
apt-get update

fi

fi

AGI owncloud
AGI owncloud-files &> /dev/null

else

@@ -9068,16 +9089,12 @@ _EOF_
INSTALLING_INDEX=47
if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then

#Symlink /usr/share/owncloud to /var/www/owncloud: https://github.com/Fourdee/DietPi/issues/1225#issuecomment-343263082
rm -R /var/www/owncloud &> /dev/null
ln -fs /usr/share/owncloud /var/www/owncloud

#Setup Data directory
local target_data_dir="$FP_DIETPI_USERDATA_DIRECTORY/owncloud_data"
mkdir -p "$target_data_dir"

#Create symlink from default owncloud/data to FP_DIETPI_USERDATA_DIRECTORY
local target_data_symlink="/usr/share/owncloud/data"
local target_data_symlink="/var/www/owncloud/data"
mkdir -p "$target_data_symlink" &> /dev/null

# - Copy existing data to our data location
@@ -9296,10 +9313,15 @@ _EOF_

fi

sudo -u www-data php /var/www/nextcloud/occ maintenance:install --no-interaction --database "mysql" --database-name "nextcloud" --database-user "root" --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$FP_DIETPI_USERDATA_DIRECTORY/nextcloud_data"
# Terminal installation:
# For MariaDB, temporary database admin user needs to be created, as 'root' uses unix_socket login, which cannot be accessed by sudo -u www-data.
mysql -uroot -p"$GLOBAL_PW" -e "grant all privileges on *.* to 'tmp_root'@'localhost' identified by '$GLOBAL_PW' with grant option"
sudo -u www-data php /var/www/nextcloud/occ maintenance:install --no-interaction --database "mysql" --database-name "nextcloud" --database-user "tmp_root" --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$FP_DIETPI_USERDATA_DIRECTORY/nextcloud_data"
mysql -uroot -p"$GLOBAL_PW" -e "drop user 'tmp_root'@'localhost'"

# Remove obsolete 'oc_admin'@'%' MySQL user:
mysql -uroot -p"$GLOBAL_PW" -e "drop user $(grep -m1 "'dbuser'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/,//")"
# Removing MySQL parent user 'oc_admin'@'%' could be done, but then privileges on database has to be granted to child user 'oc_admin'@'localhost' first.
# We leave it, as limitation to localhost database could limit extended Nextcloud features.
#mysql -uroot -p"$GLOBAL_PW" -e "drop user $(grep -m1 "'dbuser'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/,//")"

# Disable trusted_domains.
if (( ! $(cat /var/www/nextcloud/config/config.php | grep -ci -m1 "1 => '*'") )); then
@@ -9309,7 +9331,7 @@ _EOF_
fi

# Set CLI URL to Nextcloud sub directory:
sed -i "s#'http://localhost'#'http://localhost/nextcloud'#g"
sed -i "s#'http://localhost'#'http://localhost/nextcloud'#g" /var/www/nextcloud/config/config.php

# Owncloud/Nextcloud ignores system wide php.ini settings. Use their own config.
# - max upload size
@@ -13124,10 +13146,10 @@ _EOF_

elif (( $1 == 47 )); then

AGP owncloud
AGP owncloud-files owncloud owncloud-deps
systemctl start mysql
mysqladmin -u root -p"$GLOBAL_PW" drop owncloud -f
rm /etc/apt/sources.list.d/owncloud.list
rm /etc/apt/sources.list.d/owncloud.list $> /dev/null
apt-get update
rm -R /var/www/owncloud

@@ -13136,6 +13158,7 @@ _EOF_
systemctl start mysql
mysqladmin -u root -p"$GLOBAL_PW" drop nextcloud -f
mysql -uroot -p"$GLOBAL_PW" -e "drop user $(grep -m1 "'dbuser'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/,//")@$(grep -m1 "'dbhost'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/,//")"
mysql -uroot -p"$GLOBAL_PW" -e "drop user $(grep -m1 "'dbuser'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/,//")"
rm -R /var/www/nextcloud
a2dissite nextcloud &>/dev/null
rm /etc/apache2/sites-available/nextcloud.conf &>/dev/null
11 changes: 1 addition & 10 deletions dietpi/patch_file
Original file line number Diff line number Diff line change
@@ -2769,16 +2769,7 @@ _EOF_
#Reinstalls
# Squeezelite / Shairport-sync
/DietPi/dietpi/dietpi-software reinstall 36 37
#-------------------------------------------------------------------------------
#Nextcloud: Remove obsolete MySQL user
if [ -f /var/www/nextcloud/config/config.php ]; then

if ! [ "$(grep -m1 "'dbhost'" /var/www/nextcloud/config/config.php 2> /dev/null | awk '{print $3}' | sed "s/,//")" == "''" ]; then
mysql -uroot -p"$GLOBAL_PW" -e "drop user $(grep -m1 "'dbuser'" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/,//")" &> /dev/null
fi

fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
#WiFi module disable powersave addition:
echo -e "options wlan_8192eu rtw_power_mgnt=0" > /etc/modprobe.d/wlan_8192eu.conf
#-------------------------------------------------------------------------------