From 6eacde73690fab3ce6e34fb99034e8f2917a1164 Mon Sep 17 00:00:00 2001 From: Silvino Silva Date: Tue, 17 Jul 2018 15:29:02 +0100 Subject: better comments backup-system --- core/scripts/backup-system.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/scripts/backup-system.sh b/core/scripts/backup-system.sh index ba6a961..9e1ed2f 100644 --- a/core/scripts/backup-system.sh +++ b/core/scripts/backup-system.sh @@ -27,16 +27,20 @@ ConfirmOrExit () } mkbk_coll_pkg() { + # backup binary packages per collection col=$1 - # make copy of packages + # make backup collection directory mkdir ${PORT_PKG}/${col} + # for each package listed in col_name.pkg while read line; do + # if binary package don't exist try to build if [ ! -f /usr/ports/packages/${line} ]; then echo "Building package: ${line};\n" name=$(echo ${line} | cut -d "#" -f 1) - #$sudo prt-get update -fr ${name} + $sudo prt-get update -fr ${name} fi + # if binary package exist copy to destination if [ -f /usr/ports/packages/${line} ]; then echo "Backing up package: ${line}" echo ${line} >> ${DEST_DIR}/backup.pkg @@ -49,18 +53,14 @@ mkbk_coll_pkg() { } mkbk_coll_ports() { + # backup collection ports col=$1 - # tar --xattrs -zcpf $PORT_PRT/${col}-`date '+%Y-%j-%H-%M-%S'`.tar.gz \ - # --directory=$ROOT_DIR/usr/ports/${col} \ - # . tar --xattrs -zcpf $PORT_PRT/${col}.tar.gz \ --directory=$ROOT_DIR/usr/ports/${col} \ --exclude=.git/ \ - . } - mkbk_metadata() { # archive pkgutils data @@ -252,7 +252,7 @@ done while true do - echo -n "Backup server data ? Please confirm (y or n) :" + echo -n "Backup web services data (/srv) ? Please confirm (y or n) :" read CONFIRM case $CONFIRM in n|N|no|NO|No) break ;; -- cgit 1.4.1-2-gfad0 -- cgit 1.4.1-2-gfad0 From a689b25f8799c924c54898b118d6dac628389102 Mon Sep 17 00:00:00 2001 From: Silvino Silva Date: Fri, 20 Jul 2018 17:06:57 +0100 Subject: bumped new release --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 29cbabc..00851d0 100644 --- a/index.html +++ b/index.html @@ -38,7 +38,7 @@

Version;

-        rev 0.3.5
+        rev 0.3.6
Links contains relevant -- cgit 1.4.1-2-gfad0 From b6655563e76cc547fbdd834c155b482e3f88026c Mon Sep 17 00:00:00 2001 From: Silvino Silva Date: Fri, 20 Jul 2018 17:51:29 +0100 Subject: release 0.3.6 fixes --- core/scripts/iptables.sh | 13 ++-- tools/conf/etc/X11/xinit/xinitrc | 35 +++++++++++ tools/conf/etc/skel/.xinitrc | 12 ++-- tools/conf/usr/etc/X11/xinit/xinitrc | 33 ---------- tools/qemu.html | 2 +- tools/scripts/pkgmk-test.conf | 2 +- tools/x.html | 116 ++++++++++++++++++++--------------- 7 files changed, 121 insertions(+), 92 deletions(-) create mode 100644 tools/conf/etc/X11/xinit/xinitrc delete mode 100644 tools/conf/usr/etc/X11/xinit/xinitrc diff --git a/core/scripts/iptables.sh b/core/scripts/iptables.sh index db1078d..0516d94 100644 --- a/core/scripts/iptables.sh +++ b/core/scripts/iptables.sh @@ -271,9 +271,11 @@ case $TYPE in $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap3 --physdev-out tap2 -s ${BR_NET} -d ${BR_NET} -j ACCEPT $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap2 --physdev-out tap3 -s ${BR_NET} -d ${BR_NET} -j ACCEPT - # Tap1 can access external http + # Tap1 and Tap3 can access external http $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap1 -j cli_http_in $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap1 --physdev-out ${PUB_IF} -j cli_http_out + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap3 -j cli_http_in + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap3 --physdev-out ${PUB_IF} -j cli_http_out ####### Forward TAP2 ssh, http and https ###### $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap2 -j srv_ssh_in @@ -290,12 +292,15 @@ case $TYPE in # $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap2 --physdev-out ${PUB_IF} -j srv_dhcp # $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap2 -j srv_dhcp - # Tap1 and Tap2 can access external https + # Tap1, Tap2 and Tap3 can access external https + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap1 --physdev-out ${PUB_IF} -j cli_https_out + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap1 -j cli_https_in + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap2 --physdev-out ${PUB_IF} -j cli_https_out $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap2 -j cli_https_in - $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap1 --physdev-out ${PUB_IF} -j cli_https_out - $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap1 -j cli_https_in + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in tap3 --physdev-out ${PUB_IF} -j cli_https_out + $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} --physdev-out tap3 -j cli_https_in #Less noise $IPT -A FORWARD -i ${BR_IF} -o ${BR_IF} -m physdev --physdev-in ${PUB_IF} -p udp --dport 519 --sport 520 -j DROP diff --git a/tools/conf/etc/X11/xinit/xinitrc b/tools/conf/etc/X11/xinit/xinitrc new file mode 100644 index 0000000..2607046 --- /dev/null +++ b/tools/conf/etc/X11/xinit/xinitrc @@ -0,0 +1,35 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources + +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" + +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi diff --git a/tools/conf/etc/skel/.xinitrc b/tools/conf/etc/skel/.xinitrc index c331d37..6ccd340 100644 --- a/tools/conf/etc/skel/.xinitrc +++ b/tools/conf/etc/skel/.xinitrc @@ -1,11 +1,13 @@ +## Start the window manager -#xrandr --output eDP1 --mode 1024x768 +xrandr -s 1366x768 #xrandr --dpi 100 +#xrandr --output eDP1 --mode 1366x768 #xgamma -gamma 0.8 -syndaemon -d -# -## Start the window manager +#syndaemon -d +setxkbmap dvorak -#exec dwm #exec openbox-session +#exec dwm exec spectrwm +#exec start-mate diff --git a/tools/conf/usr/etc/X11/xinit/xinitrc b/tools/conf/usr/etc/X11/xinit/xinitrc deleted file mode 100644 index 36b3c3c..0000000 --- a/tools/conf/usr/etc/X11/xinit/xinitrc +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/etc/X11/xinit/.Xresources -sysmodmap=/usr/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /usr/etc/X11/xinit/xinitrc.d ] ; then - for f in /usr/etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi diff --git a/tools/qemu.html b/tools/qemu.html index e180ed4..a6621a1 100644 --- a/tools/qemu.html +++ b/tools/qemu.html @@ -335,7 +335,7 @@

Update grub configuration on guest machine;

-        # update-grub
+        # grub-mkconfig -o /boot/grub/grub.cfg

4.2. Guest Sound

diff --git a/tools/scripts/pkgmk-test.conf b/tools/scripts/pkgmk-test.conf index 6dec896..715ac01 100644 --- a/tools/scripts/pkgmk-test.conf +++ b/tools/scripts/pkgmk-test.conf @@ -4,7 +4,7 @@ source /etc/pkgmk.conf -PKGMK_SOURCE_MIRRORS=() +#PKGMK_SOURCE_MIRRORS=() PKGMK_SOURCE_DIR="$PWD" PKGMK_PACKAGE_DIR="$PWD" PKGMK_WORK_DIR="$PWD/work" diff --git a/tools/x.html b/tools/x.html index cbc9d3e..913f1f0 100644 --- a/tools/x.html +++ b/tools/x.html @@ -13,6 +13,9 @@

Install

+ +

Xorg

+ 
         $ sudo prt-get depinst xorg-server \
              xorg-xinit \
@@ -28,7 +31,7 @@
              xkeyboard-config
-

Fonts

+

Fonts

         $ sudo prt-get depinst xorg-font-util \
@@ -50,35 +53,76 @@
         $ prt-get depinst otf-sourcecode
+

Utilities

+ + 
+        $ sudo prt-get depinst \
+            alsa-utils \
+            libdrm \
+            mesa3d \
+            ffmpeg \
+            gstreamer \
+            gstreamer-vaapi \
+            gst-plugins-base \
+            gst-plugins-good \
+            gst-plugins-bad \
+            gst-plugins-ugly \
+            cmus \
+            dmenu \
+            st \
+            gparted \
+            gimp \
+            libreoffice \
+            ca-certificates \
+	    linux-pam \
+	    gstreamer \
+	    libgd \
+            icu \
+	    syndaemon
+
+ +

Window Managers

+ + 
+        $ sudo prt-get depinst \
+		openbox \
+		dwm \
+         	spectrwm \
+	 	mate
+
+

Configure

-

Example of /etc/skel/.xinitrc;

+

Local xinitrc

- 
-        #xrandr --output eDP1 --mode 1024x768
-        #xrandr --dpi 100
-        #xgamma -gamma 0.8
-        syndaemon -d
-        #
-        ## Start the window manager
+        
Local xinitrc configuration: /etc/skel/.xinitrc;

 
-        #exec dwm
-        #exec twm
-        #exec openbox-session
-        exec spectrwm
+        
+	## Start the window manager
+
+	xrandr -s 1366x768
+	#xrandr --dpi 100
+	#xrandr --output eDP1 --mode 1366x768
+	#xgamma -gamma 0.8
+	#syndaemon -d
+	setxkbmap dvorak
+
+	#exec openbox-session
+	#exec dwm
+	exec spectrwm
+	#exec start-mate
         

 
-
-        
Example of
-        /usr/etc/X11/xinit/xinitrc;

+        
Global xinitrc

+        
Global xinitrc configuration: /usr/etc/X11/xinit/xinitrc;

 
         
         #!/bin/sh
 
         userresources=$HOME/.Xresources
         usermodmap=$HOME/.Xmodmap
-        sysresources=/usr/etc/X11/xinit/.Xresources
-        sysmodmap=/usr/etc/X11/xinit/.Xmodmap
+        sysresources=/etc/X11/xinit/.Xresources
+        sysmodmap=/etc/X11/xinit/.Xmodmap
 
         # merge in defaults and keymaps
 
@@ -102,15 +146,17 @@
 
         # start some nice programs
 
-        if [ -d /usr/etc/X11/xinit/xinitrc.d ] ; then
-         for f in /usr/etc/X11/xinit/xinitrc.d/?*.sh ; do
+        if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+         for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
           [ -x "$f" ] && . "$f"
          done
          unset f
         fi
         

 
-        
/etc/X11/xorg.conf.d/10-keyboard.conf

+        
Global keyboard config 

+
+	
Xorg global default keyboard configuration; /etc/X11/xorg.conf.d/10-keyboard.conf

 
         
          Section "InputClass"
@@ -120,7 +166,7 @@
          EndSection
         

 
-        
/etc/X11/xorg.conf.d/50-synaptics.conf

+	
Xorg synaptics configuration; /etc/X11/xorg.conf.d/50-synaptics.conf

 
         
         # Example xorg.conf.d snippet that assigns the touchpad driver
@@ -180,32 +226,6 @@
 
         
Window Managers

 
-
-        
-        $ sudo prt-get depinst \
-            alsa-utils \
-            libdrm \
-            mesa3d \
-            ffmpeg \
-            gstreamer \
-            gstreamer-vaapi \
-            gst-plugins-base \
-            gst-plugins-good \
-            gst-plugins-bad \
-            gst-plugins-ugly \
-            cmus \
-            adwaita-icon-theme \
-            dmenu \
-            st \
-            conky \
-            dillo \
-            spectrwm \
-            gparted \
-            gimp \
-            libreoffice \
-            epiphany
-        

-
         
Spectrwm

 
         
Edit ~/.spectrwm.conf

-- 
cgit 1.4.1-2-gfad0