WebSVN – ALCASAR – Path Comparison – / – /scripts/alcasar-uninstall.sh Rev 1832 and /scripts/alcasar-uninstall.sh Rev 1833

Ignore whitespace Rev 1832 → Rev 1833

 /scripts/alcasar-uninstall.sh
 ,31 → 41,33
         fi
 done
 echo "Reset ALCASAR main functions : "
-#init
 echo -en "\n- init(1) : "
 # les fichiers situés dans /usr/local/ seront supprimés à la fin car encore utiles ici
 rm -f /root/ALCASAR* && echo -n "1"
 sleep 1
-# gestion
-echo -en "\n- gestion(10) : "
+echo -en "\n- time(2) : "
+[ -e /etc/ntp/step-stickers.default ] && mv /etc/ntp/step-stickers.default /etc/ntp/step-sticker.conf && echo -n "1, "
+[ -e /etc/ntp.conf.default ] && mv /etc/ntp.conf.default /etc/ntp.conf && echo -n "2"
+echo -en "\n- ACC(11) : "
 [ -d /var/www/html ] && rm -rf /var/www/html && echo -n "1, "
-[ -e /etc/httpd/conf/httpd.conf.default ] && mv /etc/httpd/conf/httpd.conf.default /etc/httpd/conf/httpd.conf && echo -n "2, "
-[ -e /etc/httpd/conf/modules.d/00_base.conf.default ] && mv /etc/httpd/conf/modules.d/00_base.conf.default /etc/httpd/conf/modules.d/00_base.conf && echo -n "3, "
-[ -e /etc/php.ini.default ] && mv /etc/php.ini.default /etc/php.ini && echo -n "4, "
-[ -e /etc/httpd/conf/vhosts-ssl.default ] && FIC_VIRTUAL_SSL=`find /etc/httpd/conf -type f -name *default_ssl_vhost.conf` && mv /etc/httpd/conf/vhosts-ssl.default $FIC_VIRTUAL_SSL && echo -n "5, "
+[ -d /etc/freeradius-web ] && rm -rf /etc/freeradius-webl && echo -n "2, "
+[ -e /etc/httpd/conf/httpd.conf.default ] && mv /etc/httpd/conf/httpd.conf.default /etc/httpd/conf/httpd.conf && echo -n "3, "
+[ -e /etc/httpd/conf/modules.d/00_base.conf.default ] && mv /etc/httpd/conf/modules.d/00_base.conf.default /etc/httpd/conf/modules.d/00_base.conf && echo -n "4, "
+[ -e /etc/php.ini.default ] && mv /etc/php.ini.default /etc/php.ini && echo -n "5, "
+[ -e /etc/httpd/conf/vhosts-ssl.default ] && FIC_VIRTUAL_SSL=`find /etc/httpd/conf -type f -name *default_ssl_vhost.conf` && mv /etc/httpd/conf/vhosts-ssl.default $FIC_VIRTUAL_SSL && echo -n "6, "
 if [ -d /usr/local/etc/digest ] # v >= 2.0
-        then rm -rf /usr/local/etc/digest && echo -n "6, "
-        else echo -n "6, "
+        then rm -rf /usr/local/etc/digest && echo -n "7, "
+        else echo -n "7, "
 fi
-[ -e /etc/httpd/conf/webapps.d/alcasar.conf ] && rm -f /etc/httpd/conf/webapps.d/alcasar.conf && echo -n "7, "
-[ -e /etc/httpd/conf/conf.d/ssl.conf.default ] && mv /etc/httpd/conf/conf.d/ssl.conf.default /etc/httpd/conf/conf.d/ssl.conf && echo -n "8, "
-[ -e /usr/share/httpd/error/include/top.html.default ] && mv /usr/share/httpd/error/include/top.html.default /usr/share/httpd/error/include/top.html && echo -n "9, "
-[ -e /usr/share/httpd/error/include/bottom.html.default ] && mv /usr/share/httpd/error/include/bottom.html.default /usr/share/httpd/error/include/top.html && echo -n "10"
+[ -e /etc/httpd/conf/webapps.d/alcasar.conf ] && rm -f /etc/httpd/conf/webapps.d/alcasar.conf && echo -n "8, "
+[ -e /etc/httpd/conf/conf.d/ssl.conf.default ] && mv /etc/httpd/conf/conf.d/ssl.conf.default /etc/httpd/conf/conf.d/ssl.conf && echo -n "9, "
+[ -e /usr/share/httpd/error/include/top.html.default ] && mv /usr/share/httpd/error/include/top.html.default /usr/share/httpd/error/include/top.html && echo -n "10, "
+[ -e /usr/share/httpd/error/include/bottom.html.default ] && mv /usr/share/httpd/error/include/bottom.html.default /usr/share/httpd/error/include/top.html && echo -n "11"
 sleep 1
-# CA
-echo -en "\n- AC(4) : "
+echo -en "\n- CA(4) : "
 [ -e /etc/pki/CA/alcasar-ca.crt ] && rm -f /etc/pki/CA/alcasar-ca.crt && echo -n "1, "
 [ -e /etc/pki/CA/private/alcasar-ca.key ] && rm -f /etc/pki/CA/private/alcasar-ca.key && echo -n "2, "
 [ -e /etc/pki/tls/certs/alcasar.crt ] && rm -f /etc/pki/tls/certs/alcasar.crt && echo -n "3, "
 ,7 → 74,6
 [ -e /etc/pki/tls/private/alcasar.key ] && rm -f /etc/pki/tls/private/alcasar.key && echo -n "4"
 sleep 1
-#init_db
 echo -en "\n- init_db(2) : "
 [ -e /etc/my.cnf.default ] && mv -f /etc/my.cnf.default /etc/my.cnf && echo -n "1, "
 [ -e /lib/systemd/system/mysqld.service.default ] && mv -f /lib/systemd/system/mysqld.service.default /lib/systemd/system/mysqld.service && echo -n "2"
 ,7 → 81,6
 rm -rf /var/lib/mysql
 sleep 1
-#param_radius
 echo -en "\n- radius(9) : "
 [ -e /etc/raddb/radiusd-db-vierge.sql ] && rm -f /etc/raddb/radiusd-db-vierge.sql && echo -n "1, "
 [ -e /etc/raddb/radiusd.conf.default ] && mv /etc/raddb/radiusd.conf.default /etc/raddb/radiusd.conf && echo -n "2, "
 ,15 → 93,6
 [ -e /lib/systemd/system/radiusd.service.default ] && mv /lib/systemd/system/radiusd.service.default /lib/systemd/system/radiusd.service && echo -n "9"
 sleep 1
-#param_web_radius
-echo -en "\n- web_radius(4) : "
-[ -e /etc/freeradius-web/admin.conf.default ] && mv /etc/freeradius-web/admin.conf.default /etc/freeradius-web/admin.conf && echo -n "1, "
-[ -e /etc/freeradius-web/naslist.conf ] && rm /etc/freeradius-web/naslist.conf && echo -n "2, "
-[ -e /etc/freeradius-web/user_edit.attrs.default ] && mv /etc/freeradius-web/user_edit.attrs.default /etc/freeradius-web/user_edit.attrs && echo -n "3, "
-[ -e /etc/freeradius-web/sql.attrmap.default ] || mv /etc/freeradius-web/sql.attrmap.default /etc/freeradius-web/sql.attrmap && echo -n "4"
-sleep 1
-#param_chilli
 echo -en "\n- chilli(4) : "
 [ -e /etc/init.d/chilli.default ] && mv /etc/init.d/chilli.default /etc/init.d/chilli && echo -n "1, "
 [ -e /usr/libexec/chilli ] && rm /usr/libexec/chilli && echo -n "2, "
 ,7 → 100,6
 [ -e /lib/systemd/system/chilli.service ] && rm /lib/systemd/system/chilli.service && echo -n "4"
 sleep 1
-#param_dansguardian
 echo -en "\n- dansguardian(8) : "
 [ -d /var/dansguardian ] && rm -rf /var/dansguardian && echo -n "1, "
 [ -e /etc/dansguardian/dansguardian.conf.default ] && mv /etc/dansguardian/dansguardian.conf.default /etc/dansguardian/dansguardian.conf && echo -n "2, "
 ,7 → 111,6
 [ -e /etc/dansguardian/lists/bannedsitelist.default ] && mv /etc/dansguardian/lists/bannedsitelist.default /etc/dansguardian/lists/bannedsitelist && echo -n "8"
 sleep 1
-#antivirus
 echo -en "\n- antivirus(5) : "
 if [ -e /etc/init.d/havp ]
         then
 ,7 → 124,6
 fi
 sleep 1
-#tinyproxy
 echo -en "\n- tinyproxy(2) : "
 if [ -e /etc/init.d/tinyproxy ]
         then
 ,7 → 133,6
 fi
 sleep 1
-#param_ulogd
 echo -en "\n- ulogd(6) : "
 i=0
 for log_type in traceability ssh ext-access
 ,17 → 144,14
       done
 sleep 1
-#nfsen
 echo -en "\n- nfsen(1) : "
 [ -e /lib/systemd/system/nfsen.service ] && rm -f /lib/systemd/system/nfsen.service && echo -n "1"
 sleep 1
-#vnstat
 echo -en "\n- vnstat(1) : "
 [ -e /etc/vnstat.conf.default ] && mv /etc/vnstat.conf.default /etc/vnstat.conf && echo -n "1"
 sleep 1
-#DnsMasq
 echo -en "\n- dnsmasq(9) : "
 if [ -e /lib/systemd/system/dnsmasq.service ]
 then
 ,11 → 170,9
 fi
 sleep 1
-#BL
 echo -en "\n- BL(0) : "
 sleep 1
-#dhcpd
 echo -en "\n- dhcp-server(1) : "
 if [ -e /etc/init.d/dhcpd ]
 then
 ,7 → 181,6
 fi
 sleep 1
-#fail2ban
 echo -en "\n- fail2ban(8) : "
 [ -e /etc/fail2ban/fail2ban.conf.default ] && mv /etc/fail2ban/fail2ban.conf.default /etc/fail2ban/fail2ban.conf && echo -n "1, "
 [ -e /etc/fail2ban/jail.conf.default ] && mv /etc/fail2ban/jail.conf.default /etc/fail2ban/jail.conf && echo -n "2, "
 ,7 → 192,6
 [ -e /lib/systemd/system/fail2ban.service.default ] && mv /lib/systemd/system/fail2ban.service.default /lib/systemd/system/fail2ban.service && echo -n "8"
 sleep 1
-#cron
 echo -en "\n- cron(9) : "
 [ -e /etc/crontab.default ] && mv /etc/crontab.default /etc/crontab && echo -n "1, "
 [ -e /etc/anacrontab.default ] && mv /etc/anacrontab.default /etc/anacrontab && echo -n "2, "
 ,7 → 205,6
 sleep 1
-#gammu-smsd
 echo -en "\n- gammu-smsd(3) : "
 [ -e /etc/gammu_smsd_conf ] && rm -f /etc/gammu_smsd_conf && echo -n "1, "
 [ -e /etc/udev/rules.d/66-huawei.rules ] && rm -f /etc/udev/rules.d/66-huawei.rules && echo -n "2, "
 ,8 → 211,7
 [ -e /var/log/gammu-smsd ] && rm -rf /var/log/gammu-smsd && echo -n "3"
 sleep 1
-#network
-echo -en "\n- network(10) : "
+echo -en "\n- network(9) : "
 hostname localhost
 CONF_FILE="/usr/local/etc/alcasar.conf"
 EXTIF=`grep ^EXTIF= $CONF_FILE|cut -d"=" -f2`           # EXTernal InterFace
 ,12 → 225,11
         done
 [ -e /etc/sysconfig/network.default ] && mv /etc/sysconfig/network.default /etc/sysconfig/network && echo -n "3, "
 [ -e /etc/hosts.default ] && mv /etc/hosts.default /etc/hosts && echo -n "4, "
-[ -e /etc/ntp.conf.default ] && mv /etc/ntp.conf.default /etc/ntp.conf && echo -n "5, "
-[ -e /etc/hosts.allow.default ] && mv /etc/hosts.allow.default /etc/hosts.allow && echo -n "6, "
-[ -e /etc/hosts.deny.default ] && mv /etc/hosts.deny.default /etc/hosts.deny && echo -n "7, "
-[ -e /etc/modprobe.preload.default ] && mv /etc/modprobe.preload.default /etc/modprobe.preload && echo -n "8, "
-[ -e /lib/systemd/system/iptables.service.default ] && mv /lib/systemd/system/iptables.service.default /lib/systemd/system/iptables.service && echo -n "9, "
-[ -e /usr/libexec/iptables.init.default ] && mv /usr/libexec/iptables.init.default /usr/libexec/iptables.init && echo -n "10"
+[ -e /etc/hosts.allow.default ] && mv /etc/hosts.allow.default /etc/hosts.allow && echo -n "5, "
+[ -e /etc/hosts.deny.default ] && mv /etc/hosts.deny.default /etc/hosts.deny && echo -n "6, "
+[ -e /etc/modprobe.preload.default ] && mv /etc/modprobe.preload.default /etc/modprobe.preload && echo -n "7, "
+[ -e /lib/systemd/system/iptables.service.default ] && mv /lib/systemd/system/iptables.service.default /lib/systemd/system/iptables.service && echo -n "8, "
+[ -e /usr/libexec/iptables.init.default ] && mv /usr/libexec/iptables.init.default /usr/libexec/iptables.init && echo -n "9"
 /sbin/ifup $EXTIF
 sleep 1

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1832 → Rev 1833