Merge branch 'release-2.0.0'

2018-05-12 23:06:43 +02:00
15 changed files with 67 additions and 316 deletions
--- a/DEBIAN/control
+++ b/DEBIAN/control
@ -1,6 +1,6 @@
 Package: remaster
 Source: remaster
-Version: 2.0.3
+Version: 2.0.0
 Architecture: all
 Maintainer: 6543 <6543@obermui.de>
 Installed-Size: <SIZE>
--- a/README.md
+++ b/README.md
@ -12,7 +12,6 @@ The aim of this Project is to create a daemon for a server, witch update live sy
 - wget
 - sed
 - sendemail
- curl

 ## To Do

--- a/autogen.sh
+++ b/autogen.sh
@ -104,7 +104,6 @@ function build-deb() {
    version="`cat build/DEBIAN/control | grep Version | cut -d " " -f 2`"
    arch="`cat build/DEBIAN/control | grep Arch | cut -d " " -f 2`"
    [ -f "release/remaster_"$version"_"$arch".deb" ] && rm "release/remaster_"$version"_"$arch".deb"
-    mkdir -p release
    mv -v "build.deb" "release/remaster_"$version"_"$arch".deb"
 }

--- a/changes/remaster.md
+++ b/changes/remaster.md
@ -11,16 +11,5 @@
 * add feature build debian packages
 * add Doc "Server Bedienung"
 * split functions
- * separate config into /etc/remaster/
+ * seperte config into /etc/remaster/

-2018-05-13 - 2.0.1
- * Update-Prüfmechanismus #15
-
-2018-05-13 - 2.0.2
- * hotfix-2.0.2 ( create release folder if not exist )
-
-2018-05-20 - 2.0.3
- * make email, proxy optional
- * change Strukture.md
- * add config check
- * some help scripts
--- a/doc/Strukture.md
+++ b/doc/Strukture.md
@ -1,113 +1,28 @@
-# 1. Starte "remaster"
+# Src

-## 1.1 Lade Grundfunctionen                                      [-> #functions]
+raw scripts ..

-## 1.2 Überprüfe ...
-  * auf Updates
-  * auf Rechte
+## functions

-## 1.3 Lade Richtige Einstellungen                               [-> #config]
-  * Lade /etc/remaster/<Conf>
-  * Überprüfe Conf. (Proj Exist; Mods Exist; ...)
+ - creat iso
+ - burn cd ...
+ - clean workspace ...

-## 1.4 Lade Proj-Func                                            [-> #projects]
-  * Überlade nach Abhängigkeit
-  * (z.B.  ubuntu.16.04 -> ubuntu -> debian)
-  * Prüfe Conf. (Proj Conform)

-## 1.5 Lade $n Mods (optional)                                   [-> #mods]
-  * Überprüfen
-  * Spechern in MOD_LST
+## distros

-# 2. Init Chroot
+scripts vor distros
+ - update
+ - set network settings
+ - set OS settings

-## 2.1 Dateien Entpacken
-  * ISO
-  * Squashfs
+## mods
+ - for example: install & enable xrdp
+ - set default passwd
+ - ...

-## 2.2 Config für Chroot (chroot_initial)
-  * (lxc-conf / tmpdir)
-  * Netzwerk
+## web
+placeholder for webfiles ...

-## 2.3 Starte Chroot
-  * (lxc-start / mount ...)
-
-# 3. Modivikationen
-
-## 3.1 Netzwerk
-
-## 3.2 Proj-Spez.
-  * (z.B. Desinfect: conky_info)
-
-## 3.3 Packet Mgr
-  * Updates
-  * Install
-  * Delete
-
-## 3.4 Weitere in $MOD_LST
-  * z.B. xrdp
-  * z.B. default pw
-
-# 4. Finish
-
-## 4.1 Aufreumen Live-Sys
-  * tmpfiles
-  * Packet Mgr
-
-## 4.2 Stop chroot
-  * Umount
-
-## 4.3. Gen ISO/PXE
-
-## 4.4. Del Chroot
-
-# 5. Send Log
-
----
-
-## lxc
-
-> chroot_sh exec lxc-attach
-
-> chroot_dir = container name
-
----
-
-## PXE
-
-> Install
-  * DHCP Relay
-  * NFS-Server
-  * TFTP-Server
-  * [Samba]
-
-> Setup
-  * (use <Lib>/proj/<proj> func)
-  * SMB/NFS LiveSys export
-  * TFTP (Boot Menue; Boot Loader; Kernel&Initrd)
-
-> Deinstall
-  * RM TFTP-Root
-  * RM SMB/NFS LiveSys export
-  * del DHCP Relay conf
-
----
-
-## Jobs
-  * Read Confs -> get time interfall I
-  * Exec remaster <Conf> for I
-
----
-
-## Web
-
-show/edit #Configs
-
-show (+live) #Logs
-
-start/stop/plan #Jobs
-
-start/stop/edit #PXE menue
-  * default
-  * all / single / none
-  * live view new clients
+## pxe
+placeholder for pxefiles ...
--- a/doc/lib-head+tail
+++ b/doc/lib-head+tail
@ -1,13 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#<function> [param]
-function <function>() {
-    #Code of <function>
-}
-
-#this func is standalone executable
-[ -n "$1" ] && {
-    <function> $@
-}
--- a/doc/lib-header.txt
+++ b/doc/lib-header.txt
@ -0,0 +1,5 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#beginn func
--- a/script/add_function.sh
+++ b/script/add_function.sh
@ -1,12 +0,0 @@
-#!/bin/bash
-
-#check param
-[ -z "$1" ] && { echo "$0 [name]"; exit 1; }
-name="$1"
-
-#gen function
-cp "doc/lib-head+tail" "src/func/$name"
-sed -i "s/<function>/$name/g" "src/func/$name"
-
-#open
-editor "src/func/$name"
--- a/script/get_version.sh
+++ b/script/get_version.sh
@ -1,3 +0,0 @@
-#!/bin/bash
-
-grep '@version ' src/remaster.sh | cut -d " " -f 2
--- a/script/set_version.sh
+++ b/script/set_version.sh
@ -8,10 +8,10 @@ date=`date +%Y-%m-%d`
  version_sed=`echo $version | sed 's/\./\\./g'`

  #nummer
-  sed -i "/#@version\ /c\#@version\ $version_sed" src/remaster.sh
+  sed -i "s/@version\ .\..\../@version\ $version_sed/g" src/remaster.sh

  #datum
-  sed -i "/#@date\ /c\#@date\ $date" src/remaster.sh
+  sed -i "s/@date\ ....-..-../@date\ $date/g" src/remaster.sh
 }

 [ -e "changes/remaster.md" ] && {
@ -22,5 +22,5 @@ date=`date +%Y-%m-%d`
 }

 [ -f "DEBIAN/control" ] && {
-  sed -i "/Version:\ /c\Version:\ $version_sed" "DEBIAN/control"
+  sed -i "s/Version:\ .\..\../Version:\ $version_sed/g" "DEBIAN/control"
 }
--- a/src/func/check_config
+++ b/src/func/check_config
@ -1,76 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#check_config [log_file]
-function check_config() {
-
-    #LOG
-    {
-      log_file=$1
-      [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
-
-      if [ -f "$log_file" ]; then
-        echo > "$log_file"
-      else
-        #check if folder exist
-        [ -d "${log_file%/*}" ] || {
-            # N-> exit 3
-            echo "Directory for Log didnt exist"
-            exit 3
-        }
-        #create LOG
-        touch "$log_file"
-      fi
-    }
-
-
-
-    #Project
-    [ -f "<LIBDIR>/proj/$distro" ] || {
-        echo "No Project \"$distro\" is not supported" | tee -a "$log_file"
-        return 3
-    }
-
-    #live-system files
-    if [ -f "$iso_source" ]; then
-        if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then
-            #Lable
-            [ -z "$iso_lable" ] && iso_lable="$distro"
-
-            echo 'iso_source -> iso_destination' | tee -a "$log_file"
-            echo 'iso_source -> squashfs [optinal]' | tee -a "$log_file"
-        else
-            if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then
-                echo 'iso_source -> squashfs' | tee -a "$log_file"
-            else
-                # ERROR
-                echo "No corect AIM in Settings" | tee -a "$log_file"
-                return 3
-            fi
-        fi
-    else
-        if [ -f "$filesystem_source" ]; then
-            if [ -n "$iso_destination" ]; then
-                # ERROR
-                echo "only Squashfs source in Settings, cant creat ISO" | tee -a "$log_file"
-                return 3
-            else
-                echo 'squashfs -> squashfs' | tee -a "$log_file"
-            fi
-        else
-            # ERROR
-            echo "No corect Source in Settings" | tee -a "$log_file"
-            return 3
-        fi
-    fi
-
-
-
-
-}
-
-#this func is standalone executable
-[ -n "$1" ] && {
-    check_config $@
-}
--- a/src/func/check_update
+++ b/src/func/check_update
@ -1,17 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#check_update
-function check_update() {
-    if curl https://raw.githubusercontent.com/6543/remaster/master/changes/remaster.md | diff - <(zcat <ROOTDIR>/usr/share/doc/remaster/changelog.gz ); then
-			echo 'REMASTER: Aktuell'
-	else
-			echo 'REMASTER: Warning: neue Version verfügbar'
-    fi
-}
-
-#this func is standalone executable
-[ -n "$1" ] && {
-    check_update
-}
--- a/src/func/on_exit
+++ b/src/func/on_exit
@ -4,31 +4,28 @@

 #on_exit [error_level]
 function on_exit() {
-  ### send mail
-  [ -n "$log_mail_aim" ] && {
-    #send log and errorlevel[success/errorr xy]
-    if [ "$1" != "0" ]; then
-      log_mail_subject="$log_mail_subject [ERROR]"
-    else
-      log_mail_subject="$log_mail_subject [Success]"
-    fi
+	#send log and errorlevel[success/errorr xy]

-    #Mail Body:
-    for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
-      {
-        echo "$log_mail_subject"
-        echo $'####################################################################################\n\n'
-        cat "$log_file"
-      } | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
-    done
-  }
+	if [ "$1" != "0" ]; then
+		log_mail_subject="$log_mail_subject [ERROR]"
+	else
+		log_mail_subject="$log_mail_subject [Success]"
+	fi

-  ### clean up
-  [ "$1" != "0" ] && {
-    chroot_umount$distro "$chroot_path" 2> /dev/null
-    workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
-  }
-  exit $1
+	#Mail Body:
+	for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
+		{
+			echo "$log_mail_subject"
+			echo $'####################################################################################\n\n'
+			cat "$log_file"
+		} | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
+	done
+
+	[ "$1" != "0" ] && {
+		chroot_umount$distro "$chroot_path" 2> /dev/null
+		workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
+	}
+	exit $1
 }

 #this func is standalone executable
--- a/src/proj/desinfect2017
+++ b/src/proj/desinfect2017
--- a/src/remaster.sh
+++ b/src/remaster.sh
@ -1,7 +1,7 @@
 #!/bin/bash
-#@version 2.0.3
+#@version 2.0.0
 #@autor 6543@obermui.de
-#@date 2018-05-20
+#@date 2018-05-12
 #@licence GNUv3

 #####################################################################################
@ -25,23 +25,6 @@ else
    exit 1
  fi
 fi
-#check LOG
-{
-  [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
-
-  if [ -f "$log_file" ]; then
-    echo > "$log_file"
-  else
-    #check if folder exist
-    [ -d "${log_file%/*}" ] || {
-        # N-> exit 3
-        echo "Directory for Log didnt exist"
-        exit 3
-    }
-    #create LOG
-    touch "$log_file"
-  fi
-}

 #####################################################################################
 ################## M o d e s ########################################################
@ -49,7 +32,8 @@ fi

 #remaster.sh renew
 function main_renew() {
-  #Start LOG
+
+  [ -f "$log_file" ] || touch "$log_file"
  tail -f "$log_file" --pid="$$" &

  chroot_path="`mktemp -d`"
@ -106,11 +90,6 @@ function main_renew() {
  check_dependency
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

-  check_config "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_update | tee -a "$log_file"
-
  [ "$distro" != "" ] && distro="_$distro"

  # 2. Entpacke ISO
@ -132,10 +111,9 @@ function main_renew() {
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

  # 5. Setzen der Netzwerk-Einstellungen:
-  [ -n "$proxy_host" ] && {
-    proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
+
+  proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

  dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@ -214,7 +192,8 @@ function main_renew() {
 #remaster.sh update_pxe
 function main_update_pxe() {

-  #Start LOG
+  [ "$log_file" == "" ] && log_file="`mktemp`"
+  [ -f "$log_file" ] || touch "$log_file"
  tail -f "$log_file" --pid="$$" &

  chroot_path="`mktemp -d`"
@ -258,14 +237,9 @@ function main_update_pxe() {
  check_user
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

-  check_update | tee -a "$log_file"
-
  check_dependency
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

-  check_config "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
  [ "$distro" != "" ] && distro="_$distro"

  # 1. Entpacken der Dateien des Live-Systems
@ -329,7 +303,7 @@ function main_update_pxe() {

 #remaster.sh update_iso #in arbeit
 function main_update_iso() {
-  #Start LOG
+  [ -f "$log_file" ] || touch "$log_file"
  tail -f "$log_file" --pid="$$" &

  chroot_path="`mktemp -d`"
@ -383,14 +357,9 @@ function main_update_iso() {
  check_user
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

-  check_update | tee -a "$log_file"
-
  check_dependency
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

-  check_config "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
  [ "$distro" != "" ] && distro="_$distro"

  # 2. Entpacke ISO
@ -422,10 +391,9 @@ function main_update_iso() {
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

  # 5. Setzen der Netzwerk-Einstellungen:
-  [ -n "$proxy_host" ] && {
-    proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
+
+  proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

  dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@ -497,15 +465,17 @@ function main_update_iso() {
  on_exit 0
 }

+#remaster.sh update
+function main_update() {
+  main_update_pxe
+}
+
 #####################################################################################
 ################## F u n c t i o n s ################################################
 #####################################################################################

 ### Error Handlings ###

-#check_config [log_file]
-source <LIBDIR>/func/check_config
-
 #on_exit [error_level]
 source <LIBDIR>/func/on_exit

@ -519,8 +489,6 @@ source <LIBDIR>/func/check_user
 # -> 0 | -> 16
 source <LIBDIR>/func/check_dependency

-#check_update
-source <LIBDIR>/func/check_update

 ### Workspace ###