Browse Source

Merge branch 'restructure-as-describe-in-doc' into develop

pull/26/head
6543 4 years ago
parent
commit
2b7eb9620a
  1. 19
      doc/draft_mod-pronects
  2. 8
      doc/proj-head
  3. 34
      script/add_project.sh
  4. 3
      src/config.sample.cfg
  5. 34
      src/proj/base
  6. 67
      src/proj/debian
  7. 227
      src/proj/desinfect.15
  8. 262
      src/proj/desinfect.16
  9. 256
      src/proj/desinfect.17
  10. 1
      src/proj/ubuntu
  11. 8
      src/proj/ubuntu.14.04
  12. 1
      src/proj/ubuntu.16.04
  13. 1391
      src/remaster.sh

19
doc/draft_mod-pronects

@ -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:~$

8
doc/proj-head

@ -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

@ -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"

3
src/config.sample.cfg

@ -4,9 +4,6 @@
## sample-config rename it to config.cfg after changes ##
#########################################################

## MODUS
modus_default="update_pxe"

#CD/DVD
#entweder iso_source oder squashfs_path alls quelle
# -> bei iso gen erforderlich!

34
src/proj/base

@ -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"
}

67
src/proj/debian

@ -2,14 +2,18 @@
#remaster lib
[ -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 ####
####################################
# .


#tools_add [chroot_dir] [tools_list]
function tools_add() {
function tools_add-debian() {
echo "add tools ... "
#$1 = chroot directory
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:"
echo "done"
}
function tools_add() { tools_add-debian $@; }

#os_update [chroot_dir]
function os_update() {
function os_update-debian() {
echo "updating os ... "
#$1 = chroot directory

@ -35,3 +40,59 @@ function os_update() {

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

@ -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

@ -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 $@; }

256
src/proj/desinfect.17

@ -5,5 +5,259 @@
#desinfect.17
# . -Y ubuntu.16.04 -> ubuntu -> debian
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 $@; }

1
src/proj/ubuntu

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

8
src/proj/ubuntu.14.04

@ -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"

1
src/proj/ubuntu.16.04

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

1391
src/remaster.sh

File diff suppressed because it is too large
Loading…
Cancel
Save