update files to start builds for testing

bookworm/BldHelper-release.sh

@@ -0,0 +1,83 @@
+ #!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
+# BldHelper-release.sh
+# This script is meant to be run on the build server and expects to find and update itself from adjacent repos.
+# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build.
+
+### ## # Set build working variables HERE # ## ###
+
+PREFIX=Pepserver	# Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
+SUFFIX=amd64		# Also used by <HouseKeeping>. And to distinguish between amd64 and x86 or devuan and ubuntu . 
+BUILD=Deb	# Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable]
+
+##################################################
+### ## # Make NO Edits Below This Line !! # ## ###
+##################################################
+
+TODAY=$(date -u +"%Y-%m-%d") && export TODAY 		# If MasterBuilder.sh is used IT will set the date. If not used, we set it here.
+FileName="${PREFIX}-${SUFFIX}"				# This will give a uniquely named and dated ISO and checksum for <HouseKeeping>.
+LOCATION=/var/www/html/nightly/PepOSServer/${BUILD}				# Tells <HouseKeeping> and the script which 2 files to remove and where to put them.
+LogDir=/var/log/Live-Build				# This folder contains a log for the last $[PREFIX]-$[SUFFIX] build.
+WorkingDir=/home/pepadmin/PepOSServer/Deb	#* If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. *
+OutFile="/tmp/${PREFIX}${SUFFIX}.out"
+LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log"
+_cache="./cache"
+_break=0 ; _wait=30	# Time (in seconds) to wait
+cd ${WorkingDir}
+
+# Run the build script.
+./pepbld.sh 2>&1 | tee -a ${OutFile}
+
+
+# Timing matters, don't destroy the old one without a replacement.
+# Check for the ISO to appear and wait for things to settle.
+until [ -e fusato/*.iso ]
+      do ((++_break))
+	 [ $_break -gt $_wait ] && break || sleep 1
+done
+
+if [ ${_break} -lt ${_wait} ] ; then
+
+mv fusato/*.iso fusato/${FileName}.iso
+
+# Make the checksum file.
+cd fusato
+echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
+sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
+
+### <HouseKeeping>
+# Remove the previous files in ${LOCATION} .
+rm -f ${LOCATION}/${FileName}*.iso
+rm -f ${LOCATION}/${FileName}*-sha512.checksum
+#rm -f ${LOCATION}/${FileName}*.torrent
+
+#mv $(FileName}*  ${LOCATION}/
+mv ${FileName}.iso             ${LOCATION}/${FileName}.iso
+mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum
+
+# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}*
+touch ${LOCATION}/${FileName}*
+
+lb clean &
+
+# Move the log file to the log directory.
+[ ! -e ${LogDir} ] && mkdir -p ${LogDir}
+mv ${OutFile} ${LogFile}
+
+# Remove old packages from the cache directory
+for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
+           do for j in $_cache/packages.*/${i}*.deb
+                  do  [ -e $j ] && rm $j
+              done
+done
+
+### </HouseKeeping>
+
+else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
+     mv ${OutFile} ${LogFile}
+fi
+

bookworm/pepbld.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
 # Set the working folder variable
@@ -48,8 +53,7 @@ mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.chroot/boot/grub
 mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default
 mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
-mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib
-mkdir -p $uchinanchu/fusato/config/includes.bootstrap/etc
+mkdir -p $uchinanchu/fusato/config/includes.chroot/etc
 
 # Install software
 echo "#Install system packages.
@@ -61,7 +65,6 @@ task-ssh-server
 task-web-server
 sshguard
 htop
-#ufw
 fail2ban
 whois
 rkhunter
@@ -82,9 +85,7 @@ podman
 cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.chroot/etc/default
 cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal
 cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
-cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.bootstrap/etc
-cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/etc
-cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib
+cp $uchinanchu/pepfirewall/* $uchinanchu/fusato/config/includes.chroot/etc
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
 
 

bookworm/pepfirewall

@@ -0,0 +1 @@
+../pepfirewall

bookworm/pepgrub

@@ -0,0 +1 @@
+../pepgrub

bookworm/pephooks/normal/0520-removeapps.hook.chroot

@@ -1,12 +1,16 @@
 #!/bin/bash
 
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
 ### Error checking added to "lint-trap" section.
 ### Missing files no longer cause builds to fail.
 
 # Remove software
 # apt remove -y firefox-esr
 # apt remove -y termit
-apt --purge --yes autoremove nvidia* firmware-nvidia* nftables
+apt --purge --yes autoremove nvidia* 
 
 
 

bookworm/pephooks/normal/0620-enable.services.hook.chroot

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
+# List of services to be enabled
+services=("nftables" "cockpit" "ssh" "sshguard" "apache2") # Add more services as needed
+
+# Loop to enable each service
+for service in "${services[@]}"; do
+  # Check if the service is already enabled
+  if systemctl is-enabled "$service" >/dev/null 2>&1; then
+    echo "Service $service is already enabled."
+  else
+    # Enable the service
+    systemctl enable "$service"
+    echo "Service $service has been successfully enabled."
+  fi
+done
+
+# Reload the services
+systemctl daemon-reload
+
+echo "Completed."
+
+

bookworm/pepinstaller

@@ -0,0 +1 @@
+../pepinstaller

bookworm/pepissue/hostname

@@ -1 +0,0 @@
-PepOS

bookworm/pepissue/issue

@@ -1,2 +0,0 @@
-Peppermint OS GNU/Linux \n \l
-

bookworm/pepissue/issue.net

@@ -1 +0,0 @@
-Peppermint OS 

bookworm/peploadersplash

@@ -0,0 +1 @@
+../peploadersplash

bookworm/peposrelease/os-release

@@ -1,6 +0,0 @@
-PRETTY_NAME="PeppermintOS"
-NAME="Peppermint"
-ID=peppermint
-HOME_URL="https://peppermintos.com"
-SUPPORT_URL="https://forum.peppermintos.com"
-BUG_REPORT_URL="https://forum.peppermintos.com"

bookworm/peprepo

@@ -0,0 +1 @@
+../peprepo

bookworm/peprepo/peppermint.list.binary

@@ -1,9 +0,0 @@
-#Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
-deb http://repo.peppermintos.com/packages peptesting main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peptesting main contrib non-free
-
-

bookworm/peprepo/peppermint.list.chroot

@@ -1,9 +0,0 @@
-#Main repos
-#deb http://repo.peppermintos.com/packages peppermint main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free
-
-#Testing repos
-deb http://repo.peppermintos.com/packages peptesting main contrib non-free
-#deb-src http://repo.peppermintos.com/packages peptesting main contrib non-free
-
-

bookworm/pepufw/before.rules

@@ -1,157 +0,0 @@
-#
-
-# rules.before
-
-#
-
-# Rules that should be run before the ufw command line added rules. Custom
-
-# rules should be added to one of these chains:
-
-#   ufw-before-input
-
-#   ufw-before-output
-
-#   ufw-before-forward
-
-#
-
-
-
-# Don't delete these required lines, otherwise there will be errors
-
-*filter
-
-:ufw-before-input - [0:0]
-
-:ufw-before-output - [0:0]
-
-:ufw-before-forward - [0:0]
-
-:ufw-not-local - [0:0]
-
-# End required lines
-
-
-
-
-
-# allow all on loopback
-
--A ufw-before-input -i lo -j ACCEPT
-
--A ufw-before-output -o lo -j ACCEPT
-
-
-
-# hand off control for sshd to sshguard
-
-:sshguard - [0:0]
-
--A ufw-before-input -p tcp --dport 22 -j sshguard
-
-
-
-# quickly process packets for which we already have a connection
-
--A ufw-before-input -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-
--A ufw-before-output -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-
--A ufw-before-forward -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-
-
-
-# drop INVALID packets (logs these in loglevel medium and higher)
-
--A ufw-before-input -m conntrack --ctstate INVALID -j ufw-logging-deny
-
--A ufw-before-input -m conntrack --ctstate INVALID -j DROP
-
-
-
-# ok icmp codes for INPUT
-
--A ufw-before-input -p icmp --icmp-type destination-unreachable -j ACCEPT
-
--A ufw-before-input -p icmp --icmp-type time-exceeded -j ACCEPT
-
--A ufw-before-input -p icmp --icmp-type parameter-problem -j ACCEPT
-
--A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT
-
-
-
-# ok icmp code for FORWARD
-
--A ufw-before-forward -p icmp --icmp-type destination-unreachable -j ACCEPT
-
--A ufw-before-forward -p icmp --icmp-type time-exceeded -j ACCEPT
-
--A ufw-before-forward -p icmp --icmp-type parameter-problem -j ACCEPT
-
--A ufw-before-forward -p icmp --icmp-type echo-request -j ACCEPT
-
-
-
-# allow dhcp client to work
-
--A ufw-before-input -p udp --sport 67 --dport 68 -j ACCEPT
-
-
-
-#
-
-# ufw-not-local
-
-#
-
--A ufw-before-input -j ufw-not-local
-
-
-
-# if LOCAL, RETURN
-
--A ufw-not-local -m addrtype --dst-type LOCAL -j RETURN
-
-
-
-# if MULTICAST, RETURN
-
--A ufw-not-local -m addrtype --dst-type MULTICAST -j RETURN
-
-
-
-# if BROADCAST, RETURN
-
--A ufw-not-local -m addrtype --dst-type BROADCAST -j RETURN
-
-
-
-# all other non-local packets are dropped
-
--A ufw-not-local -m limit --limit 3/min --limit-burst 10 -j ufw-logging-deny
-
--A ufw-not-local -j DROP
-
-
-
-# allow MULTICAST mDNS for service discovery (be sure the MULTICAST line above
-
-# is uncommented)
-
--A ufw-before-input -p udp -d 224.0.0.251 --dport 5353 -j ACCEPT
-
-
-
-# allow MULTICAST UPnP for service discovery (be sure the MULTICAST line above
-
-# is uncommented)
-
--A ufw-before-input -p udp -d 239.255.255.250 --dport 1900 -j ACCEPT
-
-
-
-# don't delete the 'COMMIT' line or these rules won't be processed
-
-COMMIT

buildall.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git pull --ff
+
+./bookworm/BldHelper-release.sh
+./daedalus/BldHelper-release.sh
+

bullseye/pepgrub/grub

@@ -1,39 +0,0 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-# For full documentation of the options in this file, see:
-#   info -f grub -n 'Simple configuration'
-
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Peppermint"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to enable BadRAM filtering, modify to suit your needs
-# This works with Linux (no patch required) and with any kernel that obtains
-# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
-#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
-
-# Uncomment this to run os-prober so search for and add other OS
-# installations to the grub boot menu
-GRUB_DISABLE_OS_PROBER=false
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=1360x768
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"
-
-#Grub theme
-GRUB_THEME="/boot/grub/themes/peppermint/theme.txt"