colours.txt ins Theme Verzeichnis geschoben,

daher auch Anpassungen an den Firewall*.cgi
kleinere Fixes an der samba.cgi
default Config Dateien für Samba ins SVN gestellt


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@463 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/samba/default.global

@@ -0,0 +1,36 @@
+# global.settings by IPFire Project
+
+[global]
+netbios name = ipfire
+server string = Samba
+workgroup = homeip.net
+
+keep alive = 30
+os level = 33
+fstype = NTFS
+
+kernel oplocks = false
+map to guest = false
+smb ports = 445 139
+unix charset = CP850
+
+security = user
+encrypt passwords = yes
+guest account = samba
+unix password sync = false
+null passwords = yes
+
+bind interfaces only = true
+interfaces =  eth0
+socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
+
+username level = 1
+wins support = true
+
+log file       = /var/log/samba/samba-log.%m
+lock directory = /var/lock/samba
+pid directory = /var/run/
+	
+preferred master = false
+domain master = false
+local master = false

config/samba/default.pdc

@@ -0,0 +1,19 @@
+[homes]
+path = /home/%u
+comment = Benutzer-Verzeichnisse
+browseable = yes
+writeable = yes
+valid users = %S
+
+[netlogon]
+path = /var/samba/netlogon
+browseable = no
+writeable = no
+comment = NetLogON
+
+[profiles]
+path = /var/samba/profiles
+browseable = no
+writeable = yes
+comment = Benutzerprofile
+valid users = %S

config/samba/default.printer

@@ -0,0 +1,23 @@
+# start printer
+[printers]
+	comment     = Drucker
+	security    = server
+	path        = /var/log/spool/lpd/lp
+	lprm command = /usr/local/bin/lprm -P%p %j 
+	lpq command = /usr/local/bin/lpq %p
+	browseable  = yes
+	printable   = yes
+	public      = yes
+	writable    = no
+	create mode = 0700
+
+[Drucker]
+	security      = server
+	path          = /var/log/spool/lpd/lp
+	printer name  = lp
+	writable      = no
+	public        = yes
+	printable     = yes
+	print command = lpr -r -h -P %p %s
+	use client driver = Yes
+# end printer

config/samba/default.settings

@@ -0,0 +1,16 @@
+NETBIOSNAME=ipfire
+BINDINTERFACESONLY=True
+WINSSUPPORT=on
+WINSSRV=
+GUESTACCOUNT=samba
+BLUE=off
+SECURITY=share
+OTHERINTERFACES=
+WORKGRP=homeip.net
+GREEN=on
+OSLEVEL=33
+MAPTOGUEST='Bad User'
+SRVSTRING='Samba'
+INTERFACES=' eth0'
+VPN=off
+ORANGE=off

config/samba/default.shares

@@ -0,0 +1,21 @@
+[Temp]
+path = /var/samba/tmp
+comment = Temp
+browseable = yes
+writeable = yes
+create mask = 0777
+directory mask = 0777
+guest ok = yes
+public = yes
+force user = samba
+
+[P2P]
+path = /var/samba/p2p
+comment = P2P
+browseable = yes
+writeable = yes
+create mask = 0777
+directory mask = 0777
+guest ok = yes
+public = yes
+force user = samba

html/cgi-bin/logs.cgi/firewalllogip.dat

@@ -7,8 +7,7 @@
 # JC HERITIER 
 # page inspired from the initial firewalllog.dat
 #
-# Modified for IPFire by Christian Schmidt
-#	                     and Michael Tremer (www.ipfire.org)
+# modified for ipcop by Markus Hoffmann und Michael Winkler and for ipfire by Christian Schmidt
 
 use strict;
 use Geo::IP::PurePerl;
@@ -388,16 +387,16 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
 	$mygraph->set( dclrs => [ "colour1" , "colour2" , "colour3" , "colour4" , "colour5" , "colour6" , "colour7" , "colour8" , "colour9" , "colour10" ] );
 	my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
 
-	my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-ip*.png");
+	my @filenames = glob("/srv/web/ipfire/html/fwlogs/ip*.png");
 	unlink(@filenames);
 	my $imagerandom = rand(1000000);
-	my $imagename = "/srv/web/ipfire/html/graphs/fwlog-ip$imagerandom.png";
+	my $imagename = "/srv/web/ipfire/html/fwlogs/ip$imagerandom.png";
 	open(FILE,">$imagename");
 	print FILE $myimage->png;
 	close(FILE);
 	#####################################################
 	print "<table align='center'><tr><td>";
-	print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
+	print "<img src='/fwlogs/ip$imagerandom.png'>";
 	print "</td></tr></table>";
 }
 

html/cgi-bin/logs.cgi/firewalllogport.dat

@@ -7,8 +7,7 @@
 # JC HERITIER 
 # page inspired from the initial firewalllog.dat
 #
-# Modified for IPFire by Christian Schmidt
-#	                     and Michael Tremer (www.ipfire.org)
+# modified for ipcop by Markus Hoffmann und Michael Winkler and for ipfire by Christian Schmidt
 
 use strict;
 
@@ -388,16 +387,16 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
 	$mygraph->set( dclrs => [ "colour1" , "colour2" , "colour3" , "colour4" , "colour5" , "colour6" , "colour7" , "colour8" , "colour9" , "colour10" ] );
 	my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
 
-	my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-port*.png");
+	my @filenames = glob("/srv/web/ipfire/html/fwlogs/port*.png");
 	unlink(@filenames);
 	my $imagerandom = rand(1000000);
-	my $imagename = "/srv/web/ipfire/html/graphs/fwlog-port$imagerandom.png";
+	my $imagename = "/srv/web/ipfire/html/fwlogs/port$imagerandom.png";
 	open(FILE,">$imagename");
 	print FILE $myimage->png;
 	close(FILE);
 	#####################################################
 	print "<table align='center'><tr><td>";
-	print "<img src='/graphs/fwlog-port$imagerandom.png'>";
+	print "<img src='/fwlogs/port$imagerandom.png'>";
 	print "</td></tr></table>";
 }
 

lfs/samba

@@ -99,5 +99,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #	cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
 	cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
 	cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
+	mkdir /var/samba	
+	cp -vf $(DIR_SRC)/config/samba /var/ipfire/samba
+	chown nobody:nobody /var/ipfire/samba/default.*
+	chmod 644 /var/ipfire/samba/default.*
+	cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
+	cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
+	cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
+	cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
+	cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)