Beta v7.8.0

.conf/desktop/lxde/panel

@@ -1,157 +1,152 @@
+# lxpanel <profile> config file. Manually editing is not recommended.
+# Use preference dialog in lxpanel to adjust config when you can.
 
 Global {
- edge=bottom
- allign=left
- margin=0
- widthtype=percent
- width=100
- height=36
- transparent=1
- tintcolor=#313131
- alpha=255
- autohide=0
- heightwhenhidden=2
- setdocktype=1
- setpartialstrut=1
- usefontcolor=1
- fontsize=10
- fontcolor=#ffffff
- usefontsize=0
- background=0
- iconsize=34
-}
-Plugin {
- type=space
- Config {
- Size=5
- }
+ edge=bottom
+ align=left
+ margin=0
+ widthtype=percent
+ width=100
+ height=36
+ transparent=1
+ tintcolor=#313131
+ alpha=255
+ setdocktype=1
+ setpartialstrut=1
+ autohide=0
+ heightwhenhidden=0
+ usefontcolor=1
+ fontcolor=#ffffff
+ background=0
+ iconsize=34
 }
+
 Plugin {
- type=menu
- Config {
- image=/usr/share/lxde/images/lxde-icon.png
- system {
- }
- separator {
+ type = space
+ Config {
+ Size=5
  }
- item {
- command=run
- }
- separator {
- }
- item {
- image=gnome-logout
- command=logout
- }
- }
-}
-Plugin {
- type=space
- Config {
- Size=20
- }
 }
+
 Plugin {
- type=launchbar
- Config {
- Button {
- id=/usr/share/applications/firefox-esr.desktop
+ type = menu
+ Config {
+ image=/usr/share/lxde/images/lxde-icon.png
+ system {
+ }
+ separator {
+ }
+ item {
+ command=run
+ }
+ separator {
+ }
+ item {
+ image=gnome-logout
+ command=logout
+ }
  }
- }
 }
+
 Plugin {
- type=space
- Config {
- Size=5
- }
+  type = space
+  Config {
+  Size=10
+  }
 }
+
 Plugin {
- type=launchbar
- Config {
- Button {
- id=pcmanfm.desktop
+ type = launchbar
+ Config {
+ Button {
+ id=firefox-esr.desktop
+ }
+ Button {
+ id=pcmanfm.desktop
+ }
+ Button {
+ id=lxterminal.desktop
+ }
  }
- }
 }
+
 Plugin {
- type=space
- Config {
- Size=5
- }
+  type = space
+  Config {
+  Size=10
+  }
 }
+
 Plugin {
- type=launchbar
- Config {
- Button {
- id=lxterminal.desktop
+ type = taskbar
+ expand=1
+ Config {
+ tooltips=1
+ IconsOnly=0
+ AcceptSkipPager=1
+ ShowIconified=1
+ ShowMapped=1
+ ShowAllDesks=0
+ UseMouseWheel=1
+ UseUrgencyHint=1
+ FlatButton=0
+ MaxTaskWidth=150
+ spacing=1
  }
- }
 }
+
 Plugin {
- type=space
- Config {
- Size=20
- }
+  type = space
+  Config {
+  Size=10
+  }
 }
+
 Plugin {
- type=taskbar
- expand=1
- Config {
- tooltips=1
- IconsOnly=0
- AcceptSkipPager=1
- ShowIconified=1
- ShowMapped=1
- ShowAllDesks=0
- UseMouseWheel=1
- UseUrgencyHint=1
- FlatButton=0
- MaxTaskWidth=150
- spacing=2
- UseSmallerIcons=-1
- }
+ type = tray
 }
+
 Plugin {
- type=space
- Config {
- Size=20
- }
+  type = space
+  Config {
+  Size=5
+  }
 }
+
 Plugin {
- type=cpu
- Config {
- ShowPercent=1
- }
+ type = cpu
 }
+
 Plugin {
- type=tray
- Config {
- }
+ type = space
+ Config {
+ Size=5
+ }
 }
+
 Plugin {
- type=volumealsa
- Config {
- }
+ type = volumealsa
 }
+
 Plugin {
- type=space
- Config {
- Size=5
- }
+  type = space
+  Config {
+  Size=5
+  }
 }
+
 Plugin {
- type=dclock
- Config {
- ClockFmt=%R
- TooltipFmt=%A %x
- BoldFont=0
- IconOnly=0
- CenterText=0
- }
+ type = dclock
+ Config {
+ ClockFmt=%R
+ TooltipFmt=%A %x
+ BoldFont=0
+ }
 }
+
 Plugin {
- type=space
- Config {
- Size=5
- }
+  type = space
+  Config {
+  Size=5
+  }
 }

.conf/dps_114/nginx.nextcloud.conf

@@ -24,7 +24,6 @@ location ^~ /nextcloud {
  #pagespeed off;
 
  # HTTP response headers borrowed from Nextcloud `.htaccess`
- #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always;
  add_header Referrer-Policy "no-referrer" always;
  add_header X-Content-Type-Options "nosniff" always;
  add_header X-Download-Options "noopen" always;

.conf/dps_47/nginx.owncloud.conf

@@ -3,7 +3,6 @@
 location ^~ /owncloud {
 
  # Add headers to serve security related headers
- #add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
  add_header X-Content-Type-Options nosniff always;
  add_header X-Frame-Options "SAMEORIGIN" always;
  add_header X-XSS-Protection "1; mode=block" always;

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # https://help.github.com/en/github/administering-a-repository/displaying-a-sponsor-button-in-your-repository
 patreon: DietPi
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6DVBECXRW3TAA
+custom: https://www.paypal.com/donate?hosted_button_id=6DVBECXRW3TAA

.meta/dietpi-imager

@@ -31,9 +31,9 @@
  readonly DIETPI_REPO="https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH"
 
  # Inputs
+ SOURCE_TYPE='Drive'
  if [[ -b $1 ]]
  then
- SOURCE_TYPE='Drive'
  FP_SOURCE=$1
 
  elif [[ -f $1 ]]
@@ -131,7 +131,8 @@
  G_EXEC_NOEXIT=1 G_EXEC losetup "$FP_SOURCE" "$FP_SOURCE_IMG" || return
  G_EXEC_NOEXIT=1 G_EXEC partprobe "$FP_SOURCE" || return
  G_EXEC_NOEXIT=1 G_EXEC partx -u "$FP_SOURCE" || return
- G_DIETPI-NOTIFY 0 "Mounted the image ($FP_SOURCE_IMG) as loopback device: $FP_SOURCE"
+ G_DIETPI-NOTIFY 0 "Attached the image ($FP_SOURCE_IMG) as loopback device: $FP_SOURCE"
+ sleep 0.5 # Give the root filesystem a little time to be detected
  fi
 
  Menu_Source_RootFS # Directly open this menu next
@@ -317,8 +318,8 @@
  # Remount image for any required edits
  G_EXEC mkdir $FP_MNT_TMP
  G_EXEC mount "$FP_ROOT_DEV" $FP_MNT_TMP
- # - Remove bash history, which is stored on shutdown, hence cannot be removed via DietPi-PREP
- rm -fv $FP_MNT_TMP/{root,home/*}/.bash_history
+ # - Remove bash history and DHCP leases, which are stored on shutdown, hence cannot be removed via DietPi-PREP
+ G_EXEC rm -f $FP_MNT_TMP/{root,home/*}/.bash_history $FP_MNT_TMP/var/lib/dhcp/*.leases
  if [[ $MOUNT_IT == 'On' ]] && G_WHIP_MSG "The ${SOURCE_TYPE,,} has been mounted to allow you reviewing or editing its content:
 - $FP_ROOT_DEV > $FP_MNT_TMP
 \nAn interactive bash subshell will open.
@@ -342,6 +343,10 @@
  # Shrink filesystem to minimum
  if [[ $ROOT_FS_TYPE == 'ext4' ]]
  then
+ # Disable and enable journal to clear it and allow further size reduction
+ G_EXEC tune2fs -O '^has_journal' "$FP_ROOT_DEV"
+ G_EXEC tune2fs -O 'has_journal' "$FP_ROOT_DEV"
+
  # Run multiple times until no change is done any more
  G_DIETPI-NOTIFY 2 'Shrinking root filesystem to minimum size...'
  local out
@@ -414,13 +419,19 @@
  [[ $type ]] || continue
  if [[ $type == 'ext'[234] ]]
  then
- G_EXEC_OUTPUT=1 G_EXEC zerofree -v "$path"
+ # Disable and enable journal on ext3 and ext3 to clear it, when not root filesystem (where it was done already)
+ if [[ $type != 'ext2' && $path != "$FP_ROOT_DEV" ]]
+ then
+ G_EXEC tune2fs -O '^has_journal' "$path" < /dev/tty
+ G_EXEC tune2fs -O 'has_journal' "$path" < /dev/tty
+ fi
+ G_EXEC_OUTPUT=1 G_EXEC zerofree -v "$path" < /dev/tty
  else
- G_EXEC mount "$path" $FP_MNT_TMP
- G_EXEC_OUTPUT=1 G_EXEC fstrim -v $FP_MNT_TMP
- Unmount_tmp
+ G_EXEC mount "$path" $FP_MNT_TMP < /dev/tty
+ G_EXEC_OUTPUT=1 G_EXEC fstrim -v $FP_MNT_TMP < /dev/tty
+ Unmount_tmp < /dev/tty
  # shellcheck disable=SC2015
- [[ $path == "$FP_ROOT_DEV" ]] && Run_fsck || G_EXEC_OUTPUT=1 G_EXEC fsck "$path"
+ [[ $path == "$FP_ROOT_DEV" ]] && Run_fsck < /dev/tty || G_EXEC_OUTPUT=1 G_EXEC fsck "$path" < /dev/tty
  fi
 
  done < <(lsblk -rnpo NAME,FSTYPE "$FP_SOURCE"?*)
@@ -623,6 +634,9 @@ _EOF_
 Final image file: $PWD/$OUTPUT_IMG_NAME.$OUTPUT_IMG_EXT
 Final 7z archive: $PWD/$OUTPUT_IMG_NAME.7z"
 
+ # Upload archive automatically if there is an upload.sh in the same directory
+ [[ -x 'upload.sh' ]] && ./upload.sh "$OUTPUT_IMG_NAME.7z"
+
  }
 
  #/////////////////////////////////////////////////////////////////////////////////////