tags/ipasserelle-base-0.2.65-1
Daniel Berteaud 13 years ago
commit b6b5e83125
  1. 1
      createlinks
  2. 176
      ipasserelle-base.spec
  3. 21
      root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm
  4. 6
      root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm

@ -21,7 +21,6 @@ foreach my $event (qw/ipasserelle-update bootstrap-console-save user-create user
event_link("generate-email-sign", "$event", "50");
}
# CAcert
# Initialisation des domaines
foreach my $event (qw/ipasserelle-update bootstrap-ldap-save/){
event_link("private-cacert", "$event", "25");

@ -0,0 +1,176 @@
%define version 0.2.0
%define release 1.beta0
%define name ipasserelle-base
Summary: Meta-Package to turn a SME Server into an iPasserelle
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
License: GPL
Group: Networking/Daemons
Source: %{name}-%{version}.tar.gz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildArchitectures: noarch
BuildRequires: e-smith-devtools
Requires: e-smith-base >= 5.2.0
Requires: e-smith-ldap
Requires: smeserver-remoteuseraccess
Requires: smeserver-zabbix-agent
Requires: smeserver-zabbix-proxy
Requires: smeserver-denyhosts
Requires: logwatch
Requires: smeserver-shared-folders
Requires: smeserver-qos
Requires: smeserver-fetchmail
Requires: smeserver-mailstats
Requires: smeserver-webapps-common
Requires: bash-completion
Requires: ipasserelle-repo
Requires: qmail-notify
Requires: iftop
Requires: openssl-perl
Requires: perl(List::MoreUtils)
Requires: perl(Text::Unaccent::PurePerl)
Requires: perl(Net::LDAP)
Requires: perl(Proc::ProcessTable)
Requires: perl(Proc::ProcessTable::Process)
%description
Meta package to configure an iPasserelle Server
Based on SMEServer, iPasserelle is a specially configured
SME Server, with some additionnal modules
%changelog
* Sun Mar 11 2012 Daniel Berteaud <daniel@firewall-services.com> 0.2.0-1.sme
- Switch to git
* Sun Mar 04 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-24.sme
- Fix cron scripts permissions
- Add scan share with required permissions for scan2file (smb)
- Fix private cacert script
- Work arround a bug with spam score in some locales
- Add greylisting support in qpsmtpd
* Thu Mar 01 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-23.sme
- Rise MySQL open_files_limit to 4096
* Thu Dec 01 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-22.sme
- Monthly archive maillog's Maildir (if qpsmtpd->ArchiveBcc is enabled)
- Add a new url attribute (not in LDAP, only for signature __URL__)
- Requires openssl-perl
- Stop running navigation-conf in ipasserelle-update
- Chown signature dir to the user
- Use larger fields in panel
* Fri Oct 28 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-20.sme
- Add a custom template (no other choice) to send samba audit log to a separate file
* Thu Jul 21 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-19.sme
- Remove LL::NG dep and all portal related stuff
- Separate tel and mob in signature generation script
- Add all functions variable in email signature generation script
- Kill stalled qpsmtpd process to prevent reaching instance limit
- Allow to choose email signature template per user (SignatureTemplate)
- Rename tag __SECTEUR__ to __SERVICE__ for the signature
* Wed Jul 13 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-18.sme
- Remove defaults example vhost and categories from LL::NG conf
- LL::NG Self protect the manager
* Fri Jul 08 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-17.sme
- Generate both txt and html version of the signature
* Fri Jul 08 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-16.sme
- Fix tel tag in signature
* Thu Jul 07 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-15.sme
- Disable weekly raid checks
- Add a basic email signature generator
- Fix a small typo in userinfo fr locale
- requires iftop
* Mon Jul 04 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-14.sme
- Depend on LL::NG and add / change some default config to match what
is expected on iPasserelle
* Tue Jun 28 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-13.sme
- Fix a typo in group-modify event
* Mon Jun 20 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-12.sme
- Add support for qmail-notify
* Sun Jun 19 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-11.sme
- Add PreferredMail as the first mail attribute in LDAP
- Fix copyright header
* Sat Jun 18 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-10.sme
- Add alternative Email addresses in userinfo panel
* Wed May 11 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-9.sme
- Don't let Squid send XForwardedFor headers
- Don't cache yum repo data with squid
* Tue May 10 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-8.sme
- Fix a typo in the tools share ReadGroup prop
* Wed Apr 06 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-7.sme
- Display group alias in viewgroups panel
* Tue Apr 05 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-6.sme
- Add userpanel-viewgroups
* Mon Apr 04 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-5.sme
- Re-create userpanels symlinks in ipasserelle-update
* Thu Mar 17 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-4.sme
- Add desktopLoginShell LDAP attr
- Allow empty preferred mail
* Mon Mar 14 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-3.sme
- Add autofs and ipmi service entries in the DB
- Add postalCode LDAP attribute
- Add validation routine for some fields
* Tue Mar 7 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-2.sme
- Add extensionNumber LDAP attribute
* Thu Jan 20 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-1.sme
- initial release
%prep
%setup -q -n %{name}-%{version}
%build
%{__mkdir_p} root/home/e-smith/files/shares/tools/files/templates_signatures/
%{__mkdir_p} root/home/e-smith/files/scan
%{__mkdir_p} root/var/lib/qpsmtpd/greylisting
perl createlinks
%install
/bin/rm -rf $RPM_BUILD_ROOT
(cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
/bin/rm -f %{name}-%{version}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
--file /etc/cron.hourly/qpsmtpd-cleanup 'attr(0755,root,root)' \
--file /etc/cron.monthly/maillog-rotate 'attr(0755,root,root)' \
--file /etc/cron.hourly/qmail-notify 'attr(0755,root,root)' \
--dir /home/e-smith/files/scan 'attr(0750,root,shared)' \
--dir /var/lib/qpsmtpd/greylisting 'attr(0750,qpsmtpd,qpsmtpd)' \
> %{name}-%{version}-filelist
%files -f %{name}-%{version}-filelist
%defattr(-,root,root)
%clean
rm -rf $RPM_BUILD_ROOT
%post
%preun

@ -62,8 +62,7 @@ sub print_user_table {
my @users = $accountdb->get('admin');
push @users, $accountdb->users();
unless ( scalar @users )
{
unless ( scalar @users ) {
print $q->Tr($q->td($self->localise('NO_USER_ACCOUNTS')));
return "";
}
@ -125,8 +124,7 @@ sub modify_user {
my $acct = $accountdb->get($acctName);
my $acctType = $acct->prop('type');
if ($acctType eq "user" || $acctName eq 'admin')
{
if ($acctType eq "user" || $acctName eq 'admin') {
$accountdb->remove_user_auto_pseudonyms($acctName);
my %newProperties = (
'FirstName' => $self->{cgi}->param('FirstName'),
@ -193,26 +191,21 @@ sub pseudonym_clash {
my $da = $dp->prop('Account') if $dp;
my $ua = $up->prop('Account') if $up;
if ($dp and $da and $da ne $acctName)
{
return $self->localise('PSEUDONYM_CLASH',
{
if ($dp and $da and $da ne $acctName) {
return $self->localise('PSEUDONYM_CLASH', {
acctName => $acctName,
clashName => $da,
pseudonym => $dp->key
});
}
elsif ($up and $ua and $ua ne $acctName)
{
return $self->localise('PSEUDONYM_CLASH',
{
elsif ($up and $ua and $ua ne $acctName) {
return $self->localise('PSEUDONYM_CLASH', {
acctName => $acctName,
clashName => $ua,
pseudonym => $up->key
});
}
else
{
else {
return "OK";
}
}

@ -14,7 +14,6 @@ use Carp;
our @ISA = qw(esmith::FormMagick Exporter);
our @EXPORT = qw(
show_initial
genUsers
get_accounts_prop
@ -72,7 +71,7 @@ sub get_description {
=head2 get_group_mail
Get the mail address for the group named in the CGI argument "GroupName"
Get the mail address for the group named in the CGI argument "groupName"
=cut
@ -164,7 +163,7 @@ in $fm->{cgi}->parm('groupName')checked.
=cut
sub genUsers () {
my $fm = shift;
my $fm = shift;
my $members = "";
my $group = $fm->{'cgi'}->param('groupName');
@ -189,3 +188,4 @@ sub genUsers () {
return $out;
}
1;

Loading…
Cancel
Save