merge
This commit is contained in:
commit
f6f8b115b0
|
@ -6,3 +6,10 @@ foreach my $event (qw/bootstrap-console-save share-modify ibay-modify/){
|
|||
templates2events("/etc/clamrt.list", $event);
|
||||
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/clamrt");
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
safe_touch("root/var/service/clamrt/down");
|
||||
safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/clamrt');
|
||||
safe_symlink("/var/service/clamrt" , 'root/service/clamrt');
|
||||
|
||||
>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
|
||||
|
|
|
@ -6,4 +6,9 @@ my $a = esmith::AccountsDB->open_ro || die "Couldn't open AccountsDB\n";
|
|||
my @ibays = $a->ibays();
|
||||
my @shares = $a->get_all_by_prop(type=>'share');
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
$OUT .= '';
|
||||
|
||||
>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
|
||||
}
|
||||
|
|
|
@ -6,5 +6,9 @@ foreach my $share (@shares){
|
|||
next unless ($av eq 'enabled');
|
||||
$OUT .= "/home/e-smith/files/shares/$name/files\n";
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
$OUT .= '';
|
||||
>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
|
||||
}
|
||||
|
|
|
@ -6,5 +6,9 @@ foreach my $ibay (@ibays){
|
|||
next unless ($av eq 'enabled');
|
||||
$OUT .= "/home/e-smith/files/ibays/$name\n";
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
$OUT .= '';
|
||||
>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
# Just a dummy rep so there's always a rep to watch
|
||||
}
|
||||
/tmp
|
||||
/home/e-smith/files/samba/netlogon
|
|
@ -2,7 +2,11 @@
|
|||
# Name: Daniel B.
|
||||
|
||||
Summary: On access AV scanner
|
||||
<<<<<<< HEAD
|
||||
%define name smeserver-webapps-common
|
||||
=======
|
||||
%define name smeserver-clamrt
|
||||
>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
|
||||
Name: %{name}
|
||||
%define version 0.0.1
|
||||
%define release 1.beta0
|
||||
|
|
Loading…
Reference in New Issue