53 Commits

Author SHA1 Message Date
2ffe939f5c Merge branch 'develop' into feature-lxc
lxc version aktuall.
2018-06-02 22:16:16 +02:00
f809343015 report corect meaning 2018-06-01 01:56:41 +02:00
4cb8816cc1 notes, smal fix 2018-05-22 12:46:20 +02:00
268e327351 mod proj template 2018-05-22 02:12:28 +02:00
f5a2ddb0c4 apply changes to main script too 2018-05-22 02:10:45 +02:00
27b9155cd9 apply all new changes 2018-05-22 02:07:01 +02:00
aa0e1fbd6d v 2.0.4 2018-05-22 01:51:17 +02:00
83d8ace4e5 Merge branch 'feature-iso-extract-from-url' into develop 2018-05-22 01:47:46 +02:00
2b7eb9620a Merge branch 'restructure-as-describe-in-doc' into develop 2018-05-22 01:47:34 +02:00
32cfb2a7a4 finish 2018-05-22 01:47:10 +02:00
05bf2a4cdf add new sub func 2018-05-22 01:38:30 +02:00
2a081ad517 add logic 2018-05-22 01:34:32 +02:00
7d4c1015d5 switch checks 2018-05-22 01:30:35 +02:00
f3c3ba82f5 Merge branch 'restructure-mv-last-dependencys' into restructure-as-describe-in-doc 2018-05-22 01:25:35 +02:00
23e39f21f6 readd proj mods 2018-05-22 01:25:13 +02:00
f303797810 add new base function 2018-05-22 01:20:55 +02:00
fad9574ebb Merge branch 'restructure-rm-diff-modes' into restructure-as-describe-in-doc 2018-05-22 01:17:36 +02:00
cd15118bb8 beautysh -f src/remaster.sh 2018-05-22 01:17:02 +02:00
756d389c6d mv renew position 2018-05-22 01:16:14 +02:00
eb96f7a0e4 rm unused modes 2018-05-22 01:15:08 +02:00
9b5cc1665d use renew as base template 2018-05-22 01:14:21 +02:00
631d78798d Merge branch 'restructure-use-overide' into restructure-as-describe-in-doc 2018-05-22 01:08:33 +02:00
04e4e98525 semilicon fix 2018-05-22 01:05:32 +02:00
32d09b764b overlod functions... 2018-05-22 00:58:05 +02:00
2752dcc5ca change desinfect.17 to overload some funktions 2018-05-22 00:47:11 +02:00
29a8d529c9 remove special function cals 2018-05-22 00:46:31 +02:00
c4eeb44eaa use online functions instead alias 2018-05-22 00:30:51 +02:00
15f5ad5fab example in debian template 2018-05-21 16:25:43 +02:00
7601e2b93f Merge branch 'restructure-add-base-proj' into restructure-as-describe-in-doc 2018-05-21 16:21:10 +02:00
013edd6c0f change debian template for script 2018-05-21 16:20:42 +02:00
8990b7ea1e add base template 2018-05-21 16:16:22 +02:00
10dce09e4d add proj gen script 2018-05-21 16:16:07 +02:00
f77f690751 change proj-head docu for script 2018-05-21 16:15:36 +02:00
fbf1a80b7b add idear 2018-05-21 13:05:02 +02:00
0ffbae48a7 das große wandern 2018-05-21 13:04:37 +02:00
636aba43d5 docu ... 2018-05-21 12:45:42 +02:00
e32c217fea generalize project file format 2018-05-21 12:42:10 +02:00
7c46700bd5 init 2018-05-21 12:34:55 +02:00
be32c02a81 add some more messages to log 2018-05-21 12:07:47 +02:00
f6aa1b24fd Merge branch 'change_names' into develop 2018-05-21 01:04:05 +02:00
6bc29a5011 remove tmp-fix 2018-05-21 00:46:33 +02:00
002487c5d1 some name changes 2018-05-21 00:25:27 +02:00
6076f1372d docu ... 2018-05-21 00:16:26 +02:00
226c2567d9 Merge pull request #23 from 6543/develop
update feature branch
2018-05-20 23:51:20 +02:00
9301b1a39c fix duble report 2018-05-20 23:44:26 +02:00
fb524720f4 Merge pull request #19 from 6543/develop
update feature-fxc branch
2018-05-17 01:13:02 +02:00
adc9f4f7b5 Merge branch 'fix-standalone_executable' into feature-lxc
fix-standalone_executable
2018-05-11 00:06:48 +02:00
edfeec5868 Merge branch 'hotfix-1.9.3' into feature-lxc
hotfix-1.9.3
2018-05-10 22:48:08 +02:00
a5de57abb7 Merge branch 'bugfix-1.9.2' into feature-lxc
docu
2018-05-10 18:52:04 +02:00
127d682cfb bugfix-1.9.2++ 2018-05-10 17:27:36 +02:00
d4b7654769 Merge branch 'bugfix-1.9.2' into feature-lxc
finished bugfix-1.9.2
2018-05-10 17:15:04 +02:00
a45c267641 use lxc 2018-05-10 15:12:36 +02:00
76fc7b342f merge diff 2018-05-10 15:12:06 +02:00
29 changed files with 1243 additions and 1371 deletions

View File

@ -1,6 +1,6 @@
Package: remaster Package: remaster
Source: remaster Source: remaster
Version: 2.0.3 Version: 2.0.4
Architecture: all Architecture: all
Maintainer: 6543 <6543@obermui.de> Maintainer: 6543 <6543@obermui.de>
Installed-Size: <SIZE> Installed-Size: <SIZE>

View File

@ -24,3 +24,9 @@
* change Strukture.md * change Strukture.md
* add config check * add config check
* some help scripts * some help scripts
2018-05-22 - 2.0.4
* add iso_source as URL
* restructure code
* use proj templates
* some help scripts

Binary file not shown.

Binary file not shown.

19
doc/draft_mod-pronects Normal file
View File

@ -0,0 +1,19 @@
maddl@NB-Maddl:~$ function a() { echo null; }
maddl@NB-Maddl:~$ a
null
maddl@NB-Maddl:~$ function a_desinfect() { echo desinfect; }
maddl@NB-Maddl:~$ a_desinfect
desinfect
maddl@NB-Maddl:~$ alias a=a_desinfect
maddl@NB-Maddl:~$ a
desinfect
maddl@NB-Maddl:~$ alias --help
bash: alias: --: Ungültige Option
alias: Gebrauch: alias [-p] [Name[=Wert] ... ]
maddl@NB-Maddl:~$ man alias
Kein Handbucheintrag für alias vorhanden
maddl@NB-Maddl:~$ alias a=a
maddl@NB-Maddl:~$ a
null
maddl@NB-Maddl:~$

2
doc/notes Normal file
View File

@ -0,0 +1,2 @@
initrd:
https://help.ubuntu.com/community/LiveCDCustomization#Removing_the_.28Casper.29_Autologina

8
doc/proj-head Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#<PROJECT_NAME>
#<project_relation>
source <LIBDIR>/proj/<BASE>
project_relation="<PROJECT_NAME> $project_relation"

34
script/add_project.sh Executable file
View File

@ -0,0 +1,34 @@
#!/bin/bash
#check param
[ -z "$1" ] && { echo "$0 \"name\" [base]"; exit 1; }
name="$1"
base="$2"
#gen project
cp "doc/proj-head" "src/proj/$name"
#set base_relations
if [ -z "$base" ]; then
base_relations="base"
base="base"
sed -i "/project_relation=/c\project_relation=\"<PROJECT_NAME>\"" "src/proj/$name"
else
[ -f "src/proj/$base" ] || {
echo "BASE: $base dont exist"
exit 1
}
#get base of $base
base_base=`grep '# . ->' src/proj/$base`
base_relations=`echo $base_base | sed "s/#\ \./$base/g"`
fi
## replace strings
# . -> <PROJECT_PARENT> -> base
sed -i "s/<project_relation>/\ \.\ ->\ $base_relations/g" "src/proj/$name"
#<PROJECT_NAME>
sed -i "s/<PROJECT_NAME>/$name/g" "src/proj/$name"
sed -i "s/<BASE>/$base/g" "src/proj/$name"
#open
editor "src/proj/$name"

View File

@ -4,20 +4,17 @@
## sample-config rename it to config.cfg after changes ## ## sample-config rename it to config.cfg after changes ##
######################################################### #########################################################
## MODUS
modus_default="update_pxe"
#CD/DVD #CD/DVD
#entweder iso_source oder filesystem_source alls quelle #entweder iso_source oder squashfs_path alls quelle
# -> bei iso gen erforderlich! # -> bei iso gen erforderlich!
iso_source="/data/remaster/desinfect-2017.iso" iso_source="/data/remaster/desinfect-2017.iso"
#destination optinal #destination optinal
iso_destination="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso" iso_aim="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
iso_lable="DESINFECT_`date '+%Y-%m-%d'`" iso_lable="DESINFECT_`date '+%Y-%m-%d'`"
#Filesystem (for pxe) #Filesystem (for pxe)
#entweder iso_source oder filesystem_source alls quelle #entweder iso_source oder squashfs_path alls quelle
filesystem_source="/data/remaster/result/filesystem.squashfs" squashfs_path="/data/remaster/result/filesystem.squashfs"
#Network #Network
proxy_host="proxy.local" proxy_host="proxy.local"
@ -26,7 +23,7 @@ domain="local"
nameserver="10.x.x.2,10.x.x.1" nameserver="10.x.x.2,10.x.x.1"
#remaster_script #remaster_script
distro="desinfect2017" project="desinfect.17"
#LOG #LOG
log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log" log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log"

View File

@ -2,65 +2,44 @@
#remaster lib #remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; } [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#check_config [log_file] #check_config
function check_config() { 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 #Project
[ -f "<LIBDIR>/proj/$distro" ] || { [ -f "<LIBDIR>/proj/$project" ] || {
echo "No Project \"$distro\" is not supported" | tee -a "$log_file" echo "No Project \"$project\" is not supported"
return 3 return 3
} }
#live-system files #live-system files
if [ -f "$iso_source" ]; then if [ -f "$iso_source" ]; then
if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then if [ -n "$iso_aim" ] && [ -d "${iso_aim%/*}" ]; then
#Lable #Lable
[ -z "$iso_lable" ] && iso_lable="$distro" [ -z "$iso_lable" ] && iso_lable="$project"
echo 'iso_source -> iso_destination' | tee -a "$log_file" echo 'iso_source -> iso_aim'
echo 'iso_source -> squashfs [optinal]' | tee -a "$log_file" echo 'iso_source -> squashfs [optinal]'
else else
if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then if [ -n "$squashfs_path" ] && [ -d "${squashfs_path%/*}" ]; then
echo 'iso_source -> squashfs' | tee -a "$log_file" echo 'iso_source -> squashfs'
else else
# ERROR # ERROR
echo "No corect AIM in Settings" | tee -a "$log_file" echo "No corect AIM in Settings"
return 3 return 3
fi fi
fi fi
else else
if [ -f "$filesystem_source" ]; then if [ -f "$squashfs_path" ]; then
if [ -n "$iso_destination" ]; then if [ -n "$iso_aim" ]; then
# ERROR # ERROR
echo "only Squashfs source in Settings, cant creat ISO" | tee -a "$log_file" echo "only Squashfs source in Settings, cant creat ISO"
return 3 return 3
else else
echo 'squashfs -> squashfs' | tee -a "$log_file" echo 'squashfs -> squashfs'
fi fi
else else
# ERROR # ERROR
echo "No corect Source in Settings" | tee -a "$log_file" echo "No corect Source in Settings"
return 3 return 3
fi fi
fi fi

View File

@ -5,7 +5,7 @@
#check_dependency #check_dependency
# -> 0 | -> 16 # -> 0 | -> 16
function check_dependency() { function check_dependency() {
for packet in squashfs-tools xorriso wget sed sendemail; do for packet in squashfs-tools xorriso lxc wget sed sendemail; do
[ "`dpkg -l $packet 2>&1`" == "dpkg-query: Kein Paket gefunden, das auf $packet passt" ] && { [ "`dpkg -l $packet 2>&1`" == "dpkg-query: Kein Paket gefunden, das auf $packet passt" ] && {
echo "### ERROR ### Packet $packet not installed" echo "### ERROR ### Packet $packet not installed"
return 16 return 16

View File

@ -5,9 +5,9 @@
#check_update #check_update
function 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 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' echo 'INFO: Programm Aktuell'
else else
echo 'REMASTER: Warning: neue Version verfügbar' echo 'WARNUNG: Ausgeführte Version entspricht nicht dem offiziellen Release'
fi fi
} }

20
src/func/check_url Normal file
View File

@ -0,0 +1,20 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#check_url [URL]
function check_url() {
URL="$1"
if [[ `wget -S --spider "$URL" 2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
echo "true"
return 0
else
echo "false"
return 1
fi
}
#this func is standalone executable
[ -n "$1" ] && {
check_url $@
}

32
src/func/chroot Executable file
View File

@ -0,0 +1,32 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
## overload chroot with lxc
function chroot() {
lxc-attach -n _remaster_ -- "$2" "$3" "$4" "$5" "$6" "$7"
}
## create lxc config
#chroot_config [chroot_dir]
function chroot_config() {
chroot_dir="$1"
# Container specific configuration
echo "lxc.rootfs = $chroot_dir"
echo "lxc.rootfs.backend = dir"
echo "lxc.utsname = _remaster_"
# Network configuration
echo "lxc.network.type = veth"
echo "lxc.network.link = lxcbr0"
echo "lxc.network.flags = up"
echo "lxc.network.hwaddr = 00:16:3e:5a:ba:1e"
}
[ -n "$1" ] && {
echo param
$1
}

View File

@ -13,11 +13,13 @@ function chroot_initial() {
return 12 return 12
} }
#mount virus definitions [ -d "/var/lib/lxc/_remaster_/" ] && {
mount -t tmpfs tmpfs "$chroot_dir/tmp" echo "### Warning ### chroot_initial: lxc container exists"
mount -t tmpfs tmpfs "$chroot_dir/root" [ -f "/var/lib/lxc/_remaster_/config" ] && {
mount --bind /dev "$chroot_dir/dev" mv -f "/var/lib/lxc/_remaster_/config" "/var/lib/lxc/_remaster_/config.old"
mount --bind /proc "$chroot_dir/proc" }
}
mkdir -p "/var/lib/lxc/_remaster_/"
rm "$chroot_dir/etc/resolv.conf" rm "$chroot_dir/etc/resolv.conf"
cp "/etc/resolv.conf" "$chroot_dir/etc/resolv.conf" cp "/etc/resolv.conf" "$chroot_dir/etc/resolv.conf"

View File

@ -7,12 +7,15 @@
function chroot_is_mounted() { function chroot_is_mounted() {
#$1 = chroot directory #$1 = chroot directory
if [ "`mount | grep "$1"`" != "" ] ; then #get state of _remaster from lxc
#ther is smething mounted STATE=`lxc-ls _remaster_ -f -F STATE | tail -n 1 | sed 's/ //g'`
echo "true"
else if [ "#$STATE#" == "#STOPPED#" ] ; then
#nothing mounted #nothing running
echo "false" echo "false"
else
#container is running
echo "true"
fi fi
} }

View File

@ -2,6 +2,9 @@
#remaster lib #remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; } [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#dependency
source <LIBDIR>/func/filesystem_get_type
#filesystem_extract [filesystem_img_source] [chroot_path] #filesystem_extract [filesystem_img_source] [chroot_path]
function filesystem_extract() { function filesystem_extract() {
echo "extract filesystem ..." echo "extract filesystem ..."

View File

@ -15,18 +15,26 @@ function iso_extract() {
return 10 return 10
} }
iso_source="$1"
[ -f "$iso_source" ] || {
echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
return 11
}
iso_extr_dir="$2" iso_extr_dir="$2"
[ -d "$iso_extr_dir" ] || { [ -d "$iso_extr_dir" ] || {
echo "### ERROR ### iso_extract: aim directory not exist!" echo "### ERROR ### iso_extract: aim directory not exist!"
return 12 return 12
} }
iso_source="$1"
[ -f "$iso_source" ] || {
#if it is an url...
if [ "`check_url $iso_source`" == "true" ]; then
#dl to tmp + set iso_source
iso_tmp="`mktemp --suffix=.iso`"; rm "$iso_tmp"
wget -O "$iso_tmp" "$iso_source"
else
echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
return 11
fi
}
#mace tmp mountpoint #mace tmp mountpoint
tmpdir="`mktemp -d`" tmpdir="`mktemp -d`"
[ -d "$iso_extr_dir" ] && { [ -d "$iso_extr_dir" ] && {
@ -41,6 +49,7 @@ function iso_extract() {
#clear tmp mountpoint #clear tmp mountpoint
umount "$iso_source" umount "$iso_source"
rm -r "$tmpdir" rm -r "$tmpdir"
[ -n "$iso_tmp" ] && rm "$iso_tmp"
tmpdir= tmpdir=
echo "done" echo "done"

View File

@ -10,6 +10,9 @@ function workspace_erase() {
[ -d "$dir" ] && rm -r -f "$dir" [ -d "$dir" ] && rm -r -f "$dir"
done done
#lxc
[ -d /var/lib/lxc/_remaster_/ ] && rm -R /var/lib/lxc/_remaster_/
echo "done" echo "done"
} }

34
src/proj/base Executable file
View File

@ -0,0 +1,34 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
##################
##### B a s e ####
##################
# .
project_relation=""
[ -z "$project" ] && project=base
#tools_add [chroot_dir] [tools_list]
function tools_add() {
echo "$project: tools_add ot available"
}
#os_update [chroot_dir]
function os_update() {
echo "$project: os_update ot available"
}
#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable() {
echo "$project: proxy_enable ot available"
}
#dns_set [chroot_dir] [domain] [nameserver]
function dns_set() {
echo "$project: dns_set ot available"
}
function project_mods() {
echo "$project: project_mods ot available"
}

View File

@ -2,14 +2,18 @@
#remaster lib #remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; } [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
source <LIBDIR>/proj/base
#debian
# . -> base
project_relation="debian"
#################################### ####################################
##### Base Template D E B I A N #### ##### Base Template D E B I A N ####
#################################### ####################################
# .
#tools_add [chroot_dir] [tools_list] #tools_add [chroot_dir] [tools_list]
function tools_add() { function tools_add-debian() {
echo "add tools ... " echo "add tools ... "
#$1 = chroot directory #$1 = chroot directory
chroot_dir="$1" chroot_dir="$1"
@ -20,9 +24,10 @@ function tools_add() {
chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:" chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:"
echo "done" echo "done"
} }
function tools_add() { tools_add-debian $@; }
#os_update [chroot_dir] #os_update [chroot_dir]
function os_update() { function os_update-debian() {
echo "updating os ... " echo "updating os ... "
#$1 = chroot directory #$1 = chroot directory
@ -35,3 +40,59 @@ function os_update() {
echo "done" echo "done"
} }
function os_update() { os_update-debian $@; }
#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable-debian() {
echo -n "enable proxy ... "
chroot_dir="$1"
proxy_host="$2"
proxy_port="$3"
[ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
return 12
}
#Wenn alle zwei Parameter gegeben
if [ "$proxy_host" != "" ] && [ "$proxy_port" != "" ] ; then
echo "http_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
echo "https_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
echo "ftp_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
echo "HTTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
echo "HTTPS_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
echo "FTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
echo "Acquire::http::Proxy \"http://$proxy_host:$proxy_port\"\;" > $chroot_dir/etc/apt/apt.conf.d/90proxy
echo "Acquire::ftp::Proxy \"ftp://$proxy_host:$proxy_port\"\;" >> $chroot_dir/etc/apt/apt.conf.d/90proxy
echo "done"
else
if [ "$proxy_host" == "" ] && [ "$proxy_port" == "" ] ; then
echo "done"
else
echo "### ERROR ### proxy_enable: wrong parameters! (\"$chroot_dir\"; \"$proxy_host\"; \"$proxy_port\")"
echo "proxy_enable [chroot_dir] [proxy_host] [proxy_port]"
return 2
fi
fi
}
function proxy_enable() { proxy_enable-debian $@; }
#dns_set [chroot_dir] [domain] [nameserver]
function dns_set-debian() {
echo -n "set dns config ... "
rm "$chroot_dir/etc/resolv.conf"
[ "$2" != "" ] && echo "domain $2" >> "$chroot_dir/etc/resolv.conf"
echo "search $2" >> "$chroot_dir/etc/resolv.conf"
for namesv in `echo "$3" | tr "," " "`; do
echo "nameserver $namesv" >> "$chroot_dir/etc/resolv.conf"
done
echo "done"
}
function dns_set() { dns_set-debian $@; }

227
src/proj/desinfect.15 Executable file
View File

@ -0,0 +1,227 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#desinfect.15
# . -Y ubuntu.14.04 -> ubuntu -> debian
source <LIBDIR>/proj/ubuntu.14.04
project_relation="desinfect.15 $project_relation"
#iso_create-desinfect.15 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
function iso_create-desinfect.15() {
echo "prepere iso folder ... "
chroot_path="$1"
iso_extr_dir="$2"
iso_aim="$3"
iso_lable="$4"
#desinfect
rm "$iso_extr_dir/casper/initrd.lz"
wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
echo "done"
iso_create-debian "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
}
function iso_create() { iso_create-desinfect.15 $@; }
#chroot_initial-desinfect.15 [chroot_dir]
function chroot_initial-desinfect.15() {
#$1 = chroot dir
chroot_initial-debian "$1"
echo -n "initial desinfect on chroot ... "
#check chroot dir
chroot_dir="$1"
[ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
return 12
}
#mount virus definitions
#bitdefender
mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
echo "done"
}
function iso_create() { iso_create-desinfect.15 $@; }
#chroot_umount-desinfect.15 [chroot_dir]
function chroot_umount-desinfect.15() {
#call main mount
chroot_umount-debian "$1"
echo -n "unmount desinfect on chroot ... "
#check chroot dir
chroot_dir="$1"
[ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
return 12
}
for d in "$chroot_dir/opt/BitDefender-scanner/var/lib/scan" "$chroot_dir/var/kl/bases_rd" ; do
umount $d
retval=$?
[ "$retval" -gt 0 ] && {
echo "### ERROR ### chroot_umount_desinfect: can't umount \"$d\"!"
return 21
}
done
echo "done"
}
function chroot_umount() { chroot_umount-desinfect.15 $@; }
#proxy_enable-desinfect.15 [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable-desinfect.15() {
proxy_enable-debian $1 $2 $3
echo -n "enable proxy for desinfect's av ... "
chroot_dir="$1"
proxy_host="$2"
proxy_port="$3"
#Avast AntiVirus
sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
#BitDefender
echo "ProxyEnable = Yes" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
echo "ProxyHost = $proxy_host:$proxy_port" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
#Clam AV
echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
#Kaspersky
sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
echo "done"
}
function proxy_enable() { proxy_enable-desinfect.15 $@; }
#sourcelist_desinfect_set_nomal2015 [chroot_dir]
function sourcelist_desinfect_set_nomal2015() {
echo -n "build normal source.list ... "
#$1 = chroot directory
sourcelist="$1/etc/apt/sources.list"
echo "#### Desinfe't 2015 ####" > "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
echo "# ## developers who want to ship their latest software." >> "$sourcelist"
echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
echo "done"
}
#sourcelist_desinfect_set_extendet2015 [chroot_dir]
function sourcelist_desinfect_set_extendet2015() {
echo -n "build extendet source.list ... "
sourcelist="$1/etc/apt/sources.list"
echo "#### Desinfe't 2015 ####" > "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
echo "## developers who want to ship their latest software." >> "$sourcelist"
echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
echo "done"
}
#os_update-desinfect.15 [chroot_dir]
function os_update-desinfect.15() {
#$1 = chroot directory
chroot_dir="$1"
#call main os_update
os_update-debian "$chroot_dir"
echo "update virus definitions ... "
#BitDefender
chroot "$chroot_dir" /bin/bash -c "bdscan --update" | grep -v "... updated"
#Avast Avira
chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
#Clam AV
chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
rm -f "$chroot_dir/var/lib/clamav/daily.cld"
#Karspersky
echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
chmod +x "$chroot_dir/tmp/up_kasp"
chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
rm "$chroot_dir/tmp/up_kasp"
echo "done"
}
function os_update() { os_update-desinfect.15 $@; }
#tools_add-desinfect.15 [chroot_dir] [tools_list]
function tools_add-desinfect.15() {
#$1 = chroot directory
chroot_dir="$1"
tools_list="$2"
sourcelist_desinfect_set_extendet2015 "$chroot_dir"
tools_add-debian "$chroot_dir" "$tools_list"
sourcelist_desinfect_set_nomal2015 "$chroot_dir"
}
function tools_add() { tools_add-desinfect.15 $@; }

262
src/proj/desinfect.16 Executable file
View File

@ -0,0 +1,262 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#desinfect.16
# . -Y ubuntu.14.04 -> ubuntu -> debian
source <LIBDIR>/proj/ubuntu.14.04
project_relation="desinfect.16 $project_relation"
#chroot_initial-desinfect.16 [chroot_dir]
function chroot_initial-desinfect.16() {
#$1 = chroot dir
chroot_initial-debian "$1"
echo -n "initial desinfect on chroot ... "
#check chroot dir
chroot_dir="$1"
[ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
return 12
}
#mount virus definitions
mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
echo "done"
}
function chroot_initial() { chroot_initial-desinfect.16 $@; }
#chroot_umount-desinfect.16 [chroot_dir]
function chroot_umount-desinfect.16() {
#call main mount
chroot_umount-debian "$1"
echo -n "unmount desinfect on chroot ... "
#check chroot dir
chroot_dir="$1"
[ -d "$chroot_dir" ] || {
echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
return 12
}
umount "$chroot_dir/var/kl/bases_rd"
[ "$?" -gt 0 ] && {
echo "### ERROR ### chroot_umount_desinfect: can't umount \"$chroot_dir/var/kl/bases_rd\"!"
#return 21
}
echo "done"
}
function chroot_umount() { chroot_umount-desinfect.16 $@; }
#proxy_enable-desinfect.16 [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable-desinfect.16() {
proxy_enable-debian $1 $2 $3
echo -n "enable proxy for desinfect's av ... "
chroot_dir="$1"
proxy_host="$2"
proxy_port="$3"
tmp_file_344532="`mktemp`"
#Avast AntiVirus
sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
#Clam AV
cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
rm "$chroot_dir/etc/clamav/freshclam.conf"
cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
#Eset AV
cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
#Kaspersky
sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
rm "$tmp_file_344532"
tmp_file_344532=
echo "done"
}
function proxy_enable() { proxy_enable-desinfect.16 $@; }
#sourcelist_desinfect_set_nomal2016 [chroot_dir]
function sourcelist_desinfect_set_nomal2016() {
echo -n "build normal source.list ... "
#$1 = chroot directory
sourcelist="$1/etc/apt/sources.list"
echo "#### Desinfe't 2016 ####" > "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
echo "# ## developers who want to ship their latest software." >> "$sourcelist"
echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
echo "done"
}
#sourcelist_desinfect_set_extendet2016 [chroot_dir]
function sourcelist_desinfect_set_extendet2016() {
echo -n "build extendet source.list ... "
sourcelist="$1/etc/apt/sources.list"
echo "#### Desinfe't 2016 ####" > "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
echo "## developers who want to ship their latest software." >> "$sourcelist"
echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
echo "done"
}
#os_update-desinfect.16 [chroot_dir]
function os_update-desinfect.16() {
#$1 = chroot directory
chroot_dir="$1"
#call main os_update
os_update-debian "$chroot_dir"
echo "update virus definitions ... "
#Avast Avira
{
echo "Avira ..."
chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
echo "Avira done"
}
#Clam AV
{
echo "ClamAV..."
chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
rm -f "$chroot_dir/var/lib/clamav/daily.cld"
echo "ClamAV done"
}
#Eset AV
{
echo "Eset AV ..."
tmp_file_23421="`mktemp`"
cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
echo "set timeout: 2min"
av_eaet_timeout=1200
tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
#eig. update routine
chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
sleep 2
chroot "$chroot_dir" /bin/bash -c "/opt/eset/esets/sbin/esets_daemon --update"
#warten auf daemon update ...
sleep 10m
echo "wait 10min for Eset AV update"
while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
sleep 1
av_eaet_timeout=$((av_eaet_timeout-1))
[ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
done
sleep 4
chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
rm "$tmp_file_23421"
tmp_file_23421=
tmp_var_3092=
echo "Eset AV done"
}
#Karspersky
{
echo "Karspersky ..."
#gen update-scrypt
echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
chmod +x "$chroot_dir/tmp/up_kasp"
chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
rm "$chroot_dir/tmp/up_kasp"
echo "Karspersky done"
}
echo "update virus definitions done"
}
function os_update() { os_update-desinfect.16 $@; }
#tools_add-desinfect.16 [chroot_dir] [tools_list]
function tools_add-desinfect.16() {
#$1 = chroot directory
chroot_dir="$1"
tools_list="$2"
sourcelist_desinfect_set_extendet2016 "$chroot_dir"
tools_add-debian "$chroot_dir" "$tools_list"
sourcelist_desinfect_set_nomal2016 "$chroot_dir"
}
function tools_add() { tools_add-desinfect.16 $@; }

View File

@ -5,5 +5,278 @@
#desinfect.17 #desinfect.17
# . -Y ubuntu.16.04 -> ubuntu -> debian # . -Y ubuntu.16.04 -> ubuntu -> debian
source <LIBDIR>/proj/ubuntu.16.04 source <LIBDIR>/proj/ubuntu.16.04
project_relation="desinfect.17 $project_relation"
TEST2="na"
#sourcelist_desinfect_set_nomal2017 [chroot_dir]
function sourcelist_desinfect_set_nomal2017() {
echo -n "build normal source.list ... "
#$1 = chroot directory
sourcelist="$1/etc/apt/sources.list"
echo "#### Desinfe't 2017 ####" > "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "# #### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
echo "# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
echo "#" >> "$sourcelist"
echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
echo "# ## developers who want to ship their latest software." >> "$sourcelist"
echo "# deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
echo "done"
}
#sourcelist_desinfect_set_extendet2017 [chroot_dir]
function sourcelist_desinfect_set_extendet2017() {
echo -n "build extendet source.list ... "
sourcelist="$1/etc/apt/sources.list"
echo "#### Desinfe't 2017 ####" > "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "#### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
echo "deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
echo "" >> "$sourcelist"
echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
echo "## developers who want to ship their latest software." >> "$sourcelist"
echo "deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
echo "done"
}
#os_update-desinfect.17 [chroot_dir]
function os_update-desinfect.17() {
#$1 = chroot directory
chroot_dir="$1"
#call main os_update from debian
os_update-debian "$chroot_dir"
echo "update virus definitions ... "
#Avast Avira
{
echo "Avira ..."
#chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; /AntiVirUpdate/avupdate" | grep -v " -> "
chroot_sh "$chroot_dir" "/AntiVirUpdate/avupdate" | grep -v " -> "
echo "Avira done"
}
#Clam AV
{
echo "ClamAV..."
#chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; freshclam" > /dev/null
chroot_sh "$chroot_dir" "freshclam" > /dev/null
rm -f "$chroot_dir/var/lib/clamav/daily.cld"
echo "ClamAV done"
}
#Eset AV
{
echo "Eset AV ..."
tmp_file_23421="`mktemp`"
cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
av_eaet_timeout=300
echo "set timeout: $((av_eaet_timeout/60))min"
tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
#eig. update routine
#chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
chroot_sh "$chroot_dir" "/etc/init.d/esets restart"
sleep 2
#chroot "$chroot_dir" /bin/bash --login -c "/opt/eset/esets/sbin/esets_daemon --update"
chroot_sh "$chroot_dir" "/opt/eset/esets/sbin/esets_daemon --update"
#warten auf daemon update ...
echo "wait $((av_eaet_timeout/60))min for Eset AV update"
while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
sleep 10
av_eaet_timeout=$((av_eaet_timeout-10))
[ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
done
sleep 4
#chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
chroot_sh "$chroot_dir" "/etc/init.d/esets stop"
cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
rm "$tmp_file_23421"
tmp_file_23421=
tmp_var_3092=
echo "Eset AV done"
}
#Sophos
{
echo "Sophos..."
#chroot "$chroot_dir" /bin/bash --login -c "/opt/sophos-av/bin/savupdate -v3"
chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savupdate -v3"
chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savdstatus --version"
#chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3 -a"
echo "Sophos done"
}
#F-Secure
{
echo "F-Secure..."
chroot_sh "$chroot_dir" "/etc/init.d/fsaua start"
chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
( sleep 1m; chroot_sh "$chroot_dir" "/etc/init.d/fsaua start" ) &
chroot_sh "$chroot_dir" "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
sleep 1m
chroot_sh "$chroot_dir" "/etc/init.d/fsaua stop"
chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
echo "F-Secure done"
}
echo "update virus definitions done"
}
function os_update() { os_update-desinfect.17 $@; }
#proxy_enable-desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
function proxy_enable-desinfect.17() {
proxy_enable-debian $1 $2 $3
echo "enable proxy for desinfect's av ... "
chroot_dir="$1"
proxy_host="$2"
proxy_port="$3"
tmp_file_344532="`mktemp`"
#Avast AntiVirus
if [ -f "$chroot_dir/AntiVirUpdate/avupdate" ]; then
echo "Avast AntiVirus: Found"
sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
else
eco "Avast AntiVirus: NOT Found"
fi
#Eset AV
if [ -f "$chroot_dir/etc/opt/eset/esets/esets.cfg" ]; then
echo "Eset AV: Found"
cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
else
eco "Eset AV: NOT Found"
fi
#ClamAV
if [ -f "$chroot_dir/etc/clamav/freshclam.conf" ]; then
echo "ClamAV: Found"
cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
rm "$chroot_dir/etc/clamav/freshclam.conf"
cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
else
eco "ClamAV: NOT Found"
fi
#Sophos
if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
echo "Sophos: Found"
echo "<Source>sophos:</Source><Proxy><Address>http://$proxy_host:$proxy_port</Proxy></Address>" >> "$chroot_dir/opt/sophos-av/etc/savd.cfg"
else
eco "Sophos: NOT Found"
fi
#F-Secure
if [ -f "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" ]; then
echo "F-Secure: Found"
echo "enable_fsma=no" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
echo "update_servers=http://fsbwserver-direct.f-secure.com" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
echo "update_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
echo "http_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
cat "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" > "$chroot_dir/etc/opt/f-secure/fsaua/fsaua_config"
else
eco "F-Secure: NOT Found"
fi
rm "$tmp_file_344532"
tmp_file_344532=
echo "done"
}
function proxy_enable() { proxy_enable-desinfect.17 $@; }
#tools_add-desinfect.17 [chroot_dir] [tools_list]
function tools_add-desinfect.17() {
#$1 = chroot directory
chroot_dir="$1"
tools_list="$2"
sourcelist_desinfect_set_extendet2017 "$chroot_dir"
tools_add-debian "$chroot_dir" "$tools_list"
sourcelist_desinfect_set_nomal2017 "$chroot_dir"
}
function tools_add() { tools_add-desinfect.17 $@; }
function project_mods-desinfect.17() {
#config xrdp to start xfce
[ -d "$chroot_path/etc/xrdp/" ] && {
echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
}
}
function project_mods() { project_mods-desinfect.17 $@; }
function chroot_initial-desinfect2017() {
#$1 = chroot dir
<LIBDIR>/func/chroot_initial "$1"
#LXC Start
config="/var/lib/lxc/_remaster_/config"
#special conf for distros:
echo "lxc.include = /usr/share/lxc/config/nesting.conf" > $config
echo "lxc.include = /usr/share/lxc/config/ubuntu.common.conf" >> $config
echo "lxc.arch = x86_64" >> $config
#normal config
chroot_config "$chroot_dir" >> $config
#LXC End
}
function chroot_initial() { chroot_initial-desinfect.17 $@; }

View File

View File

@ -7,3 +7,4 @@
#################################### ####################################
# . -> debian # . -> debian
source <LIBDIR>/proj/debian source <LIBDIR>/proj/debian
project_relation="ubuntu $project_relation"

8
src/proj/ubuntu.14.04 Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
#remaster lib
[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
#ubuntu.14.04
# . -> ubuntu -> debian
source <LIBDIR>/proj/ubuntu
project_relation="ubuntu.14.04 $project_relation"

View File

@ -5,3 +5,4 @@
#ubuntu.16.04 #ubuntu.16.04
# . -> ubuntu -> debian # . -> ubuntu -> debian
source <LIBDIR>/proj/ubuntu source <LIBDIR>/proj/ubuntu
project_relation="ubuntu.16.04 $project_relation"

File diff suppressed because it is too large Load Diff