Skip to content

Commit

Permalink
v6.27
Browse files Browse the repository at this point in the history
+ DietPi-Software | Redis: Disable file logging and enable syslog instead, which resolves reported startup issues in cases as well: #3291
+ DietPi-Software | Skip unhold packages on uninstall, since G_AGP uses "--allow-change-held-packages"
+ DietPi-Software | Remove obsolete Jessie code
  • Loading branch information
MichaIng authored Jan 1, 2020
1 parent 3bd973b commit 0a7bf0a
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -5234,9 +5234,6 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-

Banner_Installing

# Pre-reqs
G_AG_CHECK_INSTALL_PREREQ lsb-release

if (( $G_HW_MODEL < 10 )); then

G_AGI chromium-browser
Expand Down Expand Up @@ -7169,6 +7166,12 @@ _EOF_
# Enable redis php module, if installed
phpenmod redis 2> /dev/null

# Disable file logging and enable syslog instead, which resolves reported startup issues in cases as well: https://github.com/MichaIng/DietPi/issues/3291
G_CONFIG_INJECT 'loglevel[[:blank:]]' 'loglevel warning' /etc/redis/redis.conf
G_CONFIG_INJECT 'logfile[[:blank:]]' 'logfile ""' /etc/redis/redis.conf
G_CONFIG_INJECT 'syslog-enabled[[:blank:]]' 'syslog-enabled yes' /etc/redis/redis.conf
G_CONFIG_INJECT 'always-show-logo[[:blank:]]' 'always-show-logo no' /etc/redis/redis.conf

fi

software_id=58 # OpenBazaar
Expand Down Expand Up @@ -12539,12 +12542,11 @@ _EOF_

fi

software_id=91
software_id=91 # Redis
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
G_AGP redis-server redis-tools php*-redis
[[ -d '/etc/systemd/system/redis-server.service.d' ]] && rm -R /etc/systemd/system/redis-server.service.d # Jessie permissions fix

fi

Expand Down Expand Up @@ -12645,7 +12647,6 @@ _EOF_

Banner_Uninstalling
#apt-mark auto libavformat57 libupnp6 libao-common libao4 libasound2 libasound2-data libasyncns0 libaudiofile1 libavahi-client3 libavahi-common-data libavahi-common3 libavcodec56 libavformat56 libavresample2 libavutil54 libbinio1ldbl libcaca0 libcdio-cdda1 libcdio-paranoia1 libcdio13 libcups2 libcurl3-gnutls libdirectfb-1.2-9 libdnet libfaad2 libflac8 libfluidsynth1 libgme0 libgomp1 libgsm1 libice6 libid3tag0 libiso9660-8 libjack-jackd2-0 libjson-c2 libldb1 libmad0 libmikmod3 libmms0 libmodplug1 libmp3lame0 libmpcdec6 libmpg123-0 libnfs4 libntdb1 libogg0 libopenal-data libopenal1 libopenjpeg5 libopus0 liborc-0.4-0 libpulse0 libresid-builder0c2a libroar2 libsamplerate0 libschroedinger-1.0-0 libsdl1.2debian libshout3 libsidplay2 libsidutils0 libslp1 libsm6 libsmbclient libsndfile1 libsoxr0 libspeex1 libspeexdsp1 libsqlite3-0 libtalloc2 libtdb1 libtevent0 libtheora0 libva1 libvorbis0a libvorbisenc2 libvorbisfile3 libvpx1 libwavpack1 libwbclient0 libwildmidi-config libwildmidi1 libx11-6 libx11-data libx11-xcb1 libx264-142 libxau6 libxcb1 libxdmcp6 libxext6 libxi6 libxtst6 libxvidcore4 libyajl2 libzzip-0-13 mime-support python python-talloc python2.7 samba-libs x11-common file &> /dev/null
apt-mark unhold mpd 1> /dev/null
G_AGP mpd libmpdclient2
getent passwd mpd &> /dev/null && userdel -rf mpd
[[ -f '/lib/systemd/system/mpd.service' ]] && rm /lib/systemd/system/mpd.service
Expand Down Expand Up @@ -13904,18 +13905,17 @@ _EOF_

fi

software_id=113
software_id=113 # Chromium
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
#apt-mark auto libgnome-keyring0 libnspr4 libnss3 libnss3-1d libspeechd2 libxslt1.1 libxss1 xdg-utils libgnome-keyring-common libltdl7 &> /dev/null
apt-mark unhold chromium chromedriver

rm /etc/chromium.d/custom_flags
rm /var/lib/dietpi/dietpi-software/installed/chromium-autostart.sh
rm /root/.chromium-browser.init

G_AGP chromium* chromedriver # chromedriver: Jessie only
G_AGP chromium*

fi

Expand Down

0 comments on commit 0a7bf0a

Please sign in to comment.