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

Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Peter Pfeiffer
2009-05-15 08:08:12 +02:00
parent 31f3654f30 5c237109bd
commit fb26467bb3
35 changed files with 207 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/collectd/collectd.conf
View File

@@ -25,7 +25,6 @@ LoadPlugin processes
LoadPlugin rrdtool
LoadPlugin sensors
LoadPlugin swap
LoadPlugin thermal
LoadPlugin syslog
#LoadPlugin wireless
@@ -82,14 +81,4 @@ LoadPlugin syslog
LogLevel info
</Plugin>
<Plugin thermal>
Device "cooling_device0"
Device "cooling_device1"
Device "cooling_device2"
Device "cooling_device3"
Device "cooling_device4"
Device "cooling_device5"
Device "cooling_device6"
Device "cooling_device7"
IgnoreSelected true
</Plugin>
#include "/etc/collectd.thermal"

13
config/collectd/collectd.thermal Normal file
View File

@@ -0,0 +1,13 @@
LoadPlugin thermal
<Plugin thermal>
Device "cooling_device0"
Device "cooling_device1"
Device "cooling_device2"
Device "cooling_device3"
Device "cooling_device4"
Device "cooling_device5"
Device "cooling_device6"
Device "cooling_device7"
IgnoreSelected true
</Plugin>

2
config/etc/inittab
View File

@@ -25,5 +25,7 @@ su:S016:once:/sbin/sulogin
4:2345:respawn:/sbin/agetty tty4 9600
5:2345:respawn:/sbin/agetty tty5 9600
6:2345:respawn:/sbin/agetty tty6 9600
# *** Uncomment for serial console
#7:2345:respawn:/sbin/agetty ttyS0 38400
# End /etc/inittab

5
config/grub/grub.conf
View File

@@ -3,7 +3,12 @@ default saved
foreground = 6d6963
background = ffffff
#hiddenmenu
# *** If you want use serial console comment next line
splashimage (hd0,0)/grub/ipfire.xpm.gz
# *** add "console=ttyS0,38400n8" to kernel cmdline,
# *** uncomment following lines and check also inittab
#serial --unit=0 --speed=38400
#terminal --timeout=1 serial console
title IPFire
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT

1
config/rootfiles/common/collectd
View File

@@ -1,4 +1,5 @@
etc/collectd.conf
etc/collectd.thermal
etc/rc.d/init.d/collectd
etc/rc.d/rc0.d/K50collectd
etc/rc.d/rc3.d/S21collectd

6
config/rootfiles/core/28/filelists/files
View File

@@ -1,7 +1,13 @@
bin/probenic.sh
etc/collectd.conf
etc/collectd.thermal
etc/ntp
etc/rc.d/init.d/beep
etc/rc.d/init.d/console
etc/rc.d/init.d/collectd
etc/rc.d/init.d/snort
etc/rc.d/init.d/networking/red
etc/ppp/ip-up
etc/ssh/moduli
etc/ssh/ssh_config
etc/ssh/sshd_config

16
config/rootfiles/packages/clamav
View File

@@ -1,6 +1,7 @@
#usr/bin/clamav-config
#usr/bin/clamconf
usr/bin/clamdscan
usr/bin/clamdtop
usr/bin/clamscan
usr/bin/freshclam
usr/bin/sigtool
@@ -8,23 +9,24 @@ usr/bin/sigtool
#usr/lib/libclamav.a
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.5
usr/lib/libclamav.so.5.0.4
usr/lib/libclamav.so.6
usr/lib/libclamav.so.6.0.3
#usr/lib/libclamunrar.a
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.5
usr/lib/libclamunrar.so.5.0.4
usr/lib/libclamunrar.so.6
usr/lib/libclamunrar.so.6.0.3
#usr/lib/libclamunrar_iface.a
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.5
usr/lib/libclamunrar_iface.so.5.0.4
usr/lib/libclamunrar_iface.so.6
usr/lib/libclamunrar_iface.so.6.0.3
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
#usr/share/man/man1/clamconf.1
#usr/share/man/man1/clamdscan.1
#usr/share/man/man1/clamdtop.1
#usr/share/man/man1/clamscan.1
#usr/share/man/man1/freshclam.1
#usr/share/man/man1/sigtool.1
@@ -35,6 +37,6 @@ usr/share/clamav
#var/ipfire/clamav
var/ipfire/clamav/clamd.conf
var/ipfire/clamav/freshclam.conf
var/run/clamav
etc/rc.d/init.d/clamav
usr/local/bin/clamavctrl
var/run/clamav

9
config/rootfiles/packages/elinks
View File

@@ -1,11 +1,7 @@
usr/local/bin/elinks
#usr/local/etc
#usr/local/etc/elinks
usr/local/etc/elinks/elinks.conf
usr/local/bin/elinks
#usr/local/man/man1/elinks.1
#usr/local/man/man5
#usr/local/man/man5/elinks.conf.5
#usr/local/man/man5/elinkskeys.5
#usr/local/share/locale/be
#usr/local/share/locale/be/LC_MESSAGES
#usr/local/share/locale/be/LC_MESSAGES/elinks.mo
@@ -97,3 +93,6 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo
#usr/local/share/locale/uk
#usr/local/share/locale/uk/LC_MESSAGES
#usr/local/share/locale/uk/LC_MESSAGES/elinks.mo
#usr/local/share/man/man1/elinks.1
#usr/local/share/man/man5/elinks.conf.5
#usr/local/share/man/man5/elinkskeys.5

29
config/rootfiles/packages/git
View File

@@ -1,5 +1,7 @@
usr/bin/git
usr/bin/git-cvsserver
usr/bin/git-receive-pack
usr/bin/git-shell
usr/bin/git-upload-archive
usr/bin/git-upload-pack
#usr/bin/gitk
@@ -16,6 +18,7 @@ usr/libexec/git-core/git-apply
usr/libexec/git-core/git-archimport
usr/libexec/git-core/git-archive
usr/libexec/git-core/git-bisect
usr/libexec/git-core/git-bisect--helper
usr/libexec/git-core/git-blame
usr/libexec/git-core/git-branch
usr/libexec/git-core/git-bundle
@@ -42,6 +45,8 @@ usr/libexec/git-core/git-diff
usr/libexec/git-core/git-diff-files
usr/libexec/git-core/git-diff-index
usr/libexec/git-core/git-diff-tree
usr/libexec/git-core/git-difftool
usr/libexec/git-core/git-difftool--helper
usr/libexec/git-core/git-fast-export
usr/libexec/git-core/git-fast-import
usr/libexec/git-core/git-fetch
@@ -57,7 +62,9 @@ usr/libexec/git-core/git-gc
usr/libexec/git-core/git-get-tar-commit-id
usr/libexec/git-core/git-grep
usr/libexec/git-core/git-gui
usr/libexec/git-core/git-gui--askpass
usr/libexec/git-core/git-hash-object
usr/libexec/git-core/git-help
usr/libexec/git-core/git-http-fetch
usr/libexec/git-core/git-http-push
usr/libexec/git-core/git-imap-send
@@ -84,6 +91,7 @@ usr/libexec/git-core/git-merge-resolve
usr/libexec/git-core/git-merge-subtree
usr/libexec/git-core/git-merge-tree
usr/libexec/git-core/git-mergetool
usr/libexec/git-core/git-mergetool--lib
usr/libexec/git-core/git-mktag
usr/libexec/git-core/git-mktree
usr/libexec/git-core/git-mv
@@ -124,6 +132,7 @@ usr/libexec/git-core/git-show
usr/libexec/git-core/git-show-branch
usr/libexec/git-core/git-show-index
usr/libexec/git-core/git-show-ref
usr/libexec/git-core/git-stage
usr/libexec/git-core/git-stash
usr/libexec/git-core/git-status
usr/libexec/git-core/git-stripspace
@@ -188,22 +197,29 @@ usr/share/git-core/templates/info/exclude
#usr/share/git-gui/lib/index.tcl
#usr/share/git-gui/lib/logo.tcl
#usr/share/git-gui/lib/merge.tcl
#usr/share/git-gui/lib/mergetool.tcl
#usr/share/git-gui/lib/msgs
#usr/share/git-gui/lib/msgs/de.msg
#usr/share/git-gui/lib/msgs/fr.msg
#usr/share/git-gui/lib/msgs/hu.msg
#usr/share/git-gui/lib/msgs/it.msg
#usr/share/git-gui/lib/msgs/ja.msg
#usr/share/git-gui/lib/msgs/nb.msg
#usr/share/git-gui/lib/msgs/ru.msg
#usr/share/git-gui/lib/msgs/sv.msg
#usr/share/git-gui/lib/msgs/zh_cn.msg
#usr/share/git-gui/lib/option.tcl
#usr/share/git-gui/lib/remote.tcl
#usr/share/git-gui/lib/remote_add.tcl
#usr/share/git-gui/lib/remote_branch_delete.tcl
#usr/share/git-gui/lib/search.tcl
#usr/share/git-gui/lib/shortcut.tcl
#usr/share/git-gui/lib/spellcheck.tcl
#usr/share/git-gui/lib/sshkey.tcl
#usr/share/git-gui/lib/status_bar.tcl
#usr/share/git-gui/lib/tclIndex
#usr/share/git-gui/lib/tools.tcl
#usr/share/git-gui/lib/tools_dlg.tcl
#usr/share/git-gui/lib/transport.tcl
#usr/share/git-gui/lib/win32.tcl
#usr/share/git-gui/lib/win32_shortcut.js
@@ -213,18 +229,7 @@ usr/share/git-core/templates/info/exclude
#usr/share/gitk/lib/msgs/de.msg
#usr/share/gitk/lib/msgs/es.msg
#usr/share/gitk/lib/msgs/it.msg
#usr/share/gitk/lib/msgs/ru.msg
#usr/share/gitk/lib/msgs/sv.msg
#usr/share/man/man3/Git.3
#usr/share/man/man3/private-Error.3
usr/bin/git-cvsserver
usr/bin/git-shell
usr/libexec/git-core/git-gui--askpass
usr/libexec/git-core/git-help
usr/libexec/git-core/git-stage
#usr/share/git-gui/lib/mergetool.tcl
#usr/share/git-gui/lib/msgs/nb.msg
#usr/share/git-gui/lib/remote_add.tcl
#usr/share/git-gui/lib/search.tcl
#usr/share/git-gui/lib/sshkey.tcl
#usr/share/git-gui/lib/tools.tcl
#usr/share/git-gui/lib/tools_dlg.tcl

24
config/rootfiles/packages/nano
View File

@@ -2,6 +2,24 @@
etc/nano/nanorc.sample
usr/bin/nano
usr/bin/pico
#usr/info/nano.info
#usr/man/man1/nano.1
#usr/man/man5/nanorc.5
usr/bin/rnano
#usr/share/info/nano.info
#usr/share/man/man1/nano.1
#usr/share/man/man1/rnano.1
#usr/share/man/man5/nanorc.5
#usr/share/nano
usr/share/nano/asm.nanorc
usr/share/nano/c.nanorc
usr/share/nano/groff.nanorc
usr/share/nano/html.nanorc
usr/share/nano/java.nanorc
usr/share/nano/man.nanorc
usr/share/nano/mutt.nanorc
usr/share/nano/nanorc.nanorc
usr/share/nano/patch.nanorc
usr/share/nano/perl.nanorc
usr/share/nano/pov.nanorc
usr/share/nano/python.nanorc
usr/share/nano/ruby.nanorc
usr/share/nano/sh.nanorc
usr/share/nano/tex.nanorc

6
config/rootfiles/packages/postfix
View File

@@ -2,8 +2,11 @@ etc/aliases
#etc/postfix
#etc/postfix/LICENSE
#etc/postfix/TLS_LICENSE
etc/postfix/access
etc/postfix/body_checks
#etc/postfix/bounce.cf.default
etc/postfix/canonical
etc/postfix/generic
etc/postfix/header_checks
etc/postfix/main.cf
#etc/postfix/makedefs.out
@@ -15,6 +18,9 @@ etc/postfix/post-install
etc/postfix/postfix-files
etc/postfix/postfix-script
etc/rc.d/init.d/postfix
etc/postfix/relocated
etc/postfix/transport
etc/postfix/virtual
usr/bin/mailq
usr/bin/newaliases
#usr/lib/postfix

7
config/updxlrator/download
View File

@@ -49,7 +49,6 @@ $vendorid =~ tr/A-Z/a-z/;
unless (-d "$repository/download/$vendorid")
{
system("mkdir -p $repository/download/$vendorid");
system("chown -R nobody.squid $repository/download/$vendorid");
system("chmod 775 $repository/download/$vendorid");
}
@@ -159,15 +158,13 @@ if ($_ == 0)
unless (-d "$repository/$vendorid")
{
system("mkdir -p $repository/$vendorid");
system("chown -R nobody.squid $repository/$vendorid");
system("mkdir -p $repository/$vendorid");
system("chmod 775 $repository/$vendorid");
}
unless (-d "$repository/$vendorid/$uuid")
{
system("mkdir -p $repository/$vendorid/$uuid");
system("chown -R nobody.squid $repository/$vendorid/$uuid");
system("chmod 775 $repository/$vendorid/$uuid");
}
@@ -183,7 +180,7 @@ if ($_ == 0)
&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time);
&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
system("chown -R nobody.squid $repository/$vendorid/$uuid/*");
system("/usr/local/bin/squidctrl setperms");
system("chmod 775 $repository/$vendorid/$uuid/*");
unlink ("$repository/download/$vendorid/$updatefile.info");