/var/ipfire/samba/settings
/var/ipfire/samba/shares
/var/ipfire/samba/smb.conf
+/var/ipfire/samba/smb.conf.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules
srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
var/ipfire/dma
var/ipfire/time
var/ipfire/firewall/locationblock
var/ipfire/urlfilter/blacklist
var/ipfire/urlfilter/settings
var/lib/alternatives
+var/lib/location/database.db
var/log/cache
var/log/dhcpcd.log
var/log/messages
--- /dev/null
+../../../common/libloc
\ No newline at end of file
etc/rc.d/helper/oci-setup
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
+etc/rc.d/init.d/sshd
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/setaliases
var/ipfire/graphs.pl
+var/ipfire/header.pl
+var/ipfire/langs
print FILE "smb encrypt = $1\n";
}
+# Include smb.conf.local
+if (-e "${General::swroot}/samba/smb.conf.local") {
+ open(LOCAL, "<${General::swroot}/samba/smb.conf.local");
+
+ # Copy content line by line
+ while (<LOCAL>) {
+ print FILE $_;
+ }
+
+ close(LOCAL);
+}
+
print FILE <<END;
# Export all printers
[printers]
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 74
+PAK_VER = 75
DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp
[ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled
boot_mesg "Starting SSH Server..."
- loadproc /usr/sbin/sshd
+ loadproc -f /usr/sbin/sshd
# Also prevent ssh from being killed by out of memory conditions
(
stop)
boot_mesg "Stopping SSH Server..."
- killproc /usr/sbin/sshd
+ killproc -p "/var/run/sshd.pid" /usr/sbin/sshd
;;
reload)