webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2008-11-05 21:11:59 +00:00
parent 5c06561e97 c81e9e4321
commit 4aefeb0c5e
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/rootfiles/updater/update.sh
View File

@@ -63,6 +63,14 @@ echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
# #
# Remove some files from the rootfiles
cat /opt/pakfire/tmp/ROOTFILES \
| grep -v "var/log/cache" \
| grep -v "var/updatecache" > /opt/pakfire/tmp/ROOTFILESNEW
mv -f /opt/pakfire/tmp/ROOTFILESNEW /opt/pakfire/tmp/ROOTFILES
tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \ tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
-T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
echo echo
@@ -241,3 +249,11 @@ chmod +x /tmp/remove_obsolete_paks
echo echo
echo Please wait until pakfire has ended... echo Please wait until pakfire has ended...
echo echo
echo
echo Finaly were going to renew all ssh keys
echo
rm -f /etc/ssh/ssh_host_rsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
rm -f /etc/ssh/ssh_host_key* && ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
rm -f /etc/ssh/ssh_host_dsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa

12
lfs/updater
View File

@@ -55,6 +55,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -p /install/packages mkdir -p /install/packages
find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES
cat /tmp/ROOTFILES \
| grep -v "etc/httpd/conf" \
| grep -v "etc/ssl/openssl.cnf" \
| grep -v "etc/ssh/sshd_config" \
| grep -v "etc/ipsec.conf" \
| grep -v "etc/ipsec.secrets" \
| grep -v "etc/snort/snort.conf" \
| grep -v "etc/squid/squid.conf" \
| grep -v "srv/web/ipfire/html/proxy.pac" \
| grep -v "srv/web/ipfire/html/wpad.dat" \
> /tmp/ROOTFILESNEW
mv -f /tmp/ROOTFILESNEW /tmp/ROOTFILES
sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
tar -c -C / --files-from=/tmp/ROOTFILES \ tar -c -C / --files-from=/tmp/ROOTFILES \
-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \

9
src/initscripts/init.d/sshd
View File

@@ -12,7 +12,14 @@
case "$1" in case "$1" in
start) start)
[ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled if [ ! -e /etc/ssh/ssh_host_rsa_key ]; then
echo "Generating SSH Keys"
ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa
fi
[ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled
boot_mesg "Starting SSH Server..." boot_mesg "Starting SSH Server..."
# Also prevent ssh from being killed by out of memory conditions # Also prevent ssh from being killed by out of memory conditions
loadproc /usr/sbin/sshd loadproc /usr/sbin/sshd