Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
Johaney-s committed Feb 16, 2023
2 parents de38957 + 24d114b commit e33b2bc
Show file tree
Hide file tree
Showing 75 changed files with 424 additions and 137 deletions.
108 changes: 0 additions & 108 deletions gen/fbmi_doors

This file was deleted.

2 changes: 1 addition & 1 deletion other/generic-package/debian/control
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: generic-package
Section: utils
Priority: extra
Priority: optional
Maintainer: Michal Stava <[email protected]>
Build-Depends: debhelper (>= 8.0.0)
Standards-Version: 3.9.5
Expand Down
6 changes: 6 additions & 0 deletions other/perun-propagate/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-propagate (3.0.9) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-propagate (3.0.8) stable; urgency=medium

* define missing lsb functions for rhel compatibility
Expand Down
4 changes: 2 additions & 2 deletions other/perun-propagate/debian/control
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Source: perun-propagate
Section: utils
Priority: extra
Priority: optional
Maintainer: Pavel Zlamal <[email protected]>
Build-Depends: debhelper (>= 7)
Build-Depends: debhelper (>= 8.0.0)
Standards-Version: 3.9.5

Package: perun-propagate
Expand Down
6 changes: 6 additions & 0 deletions other/perun-slave-metacentrum/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-metacentrum (3.0.8) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-metacentrum (3.0.7) stable; urgency=medium

* removed pbs-phys-cluster and pbs-pre
Expand Down
4 changes: 2 additions & 2 deletions other/perun-slave-metacentrum/debian/control
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: perun-slave-metacentrum
Section: utils
Priority: extra
Priority: optional
Maintainer: Michal Stava <[email protected]>
Build-Depends: debhelper (>= 8.0.0)
Standards-Version: 3.9.5
Expand All @@ -10,5 +10,5 @@ Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: perun-slave-meta, perun-slave
Description: Package with required dependencies for slave scripts in Metacentrum.
Package containing all dependencies needed for regular
Package containing all dependencies needed for regular
work of Perun in the Metacentrum.
2 changes: 1 addition & 1 deletion send/VsupIfis.pm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use DBI;
sub init_config($) {

my $filename = shift;
my $configPath = "/home/perun/perun-sync/$filename";
my $configPath = "/etc/perun/ifis/$filename";
my $result = {};

open FILE, $configPath or die "Could not open config file $configPath: $!";
Expand Down
4 changes: 2 additions & 2 deletions send/ad_admin_group_mu_ucn
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ print "Group failed to remove: " . $counter_group_not_removed. " entries.\n";
$lock->unlock();

if ($counter_group_not_added or $counter_group_members_not_updated or $counter_group_not_removed or $counter_group_not_emptied) {
die "Some entries failed to process.\nSee log at: ~/perun-engine/send/logs/$service_name.log";
die "Some entries failed to process.\nSee log at: ~/send/logs/$service_name.log";
}
if ($counter_group_members_updated_with_errors > 0) { die "Some members were not updated.\nSee log at: ~/perun-engine/send/logs/$service_name.log";}
if ($counter_group_members_updated_with_errors > 0) { die "Some members were not updated.\nSee log at: ~/send/logs/$service_name.log";}

# END of main script

Expand Down
2 changes: 1 addition & 1 deletion send/ad_admin_user_mu_ucn
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ print "NOT Updated: " . $counter_update_fail. " entries.\n";

$lock->unlock();
my $counter_fail = $counter_remove_fail + $counter_update_fail;
if ($counter_fail > 0) { die "Failed to process: " . $counter_fail . " entries.\nSee log at: ~/perun-engine/send/logs/$service_name.log";}
if ($counter_fail > 0) { die "Failed to process: " . $counter_fail . " entries.\nSee log at: ~/send/logs/$service_name.log";}

# END of main script

Expand Down
2 changes: 1 addition & 1 deletion send/ad_group_vsup_o365
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ print "Group failed to update (members): " . $counter_group_members_not_updated.

$lock->unlock();

if ($counter_group_members_updated_with_errors > 0) { die "Failed to process: " . $counter_group_members_updated_with_errors . " entries.\nSee log at: ~/perun-engine/send/logs/$service_name.log";}
if ($counter_group_members_updated_with_errors > 0) { die "Failed to process: " . $counter_group_members_updated_with_errors . " entries.\nSee log at: ~/send/logs/$service_name.log";}

# END of main script

Expand Down
4 changes: 0 additions & 4 deletions send/fbmi_doors

This file was deleted.

21 changes: 21 additions & 0 deletions send/vsup_tritius
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,27 @@ foreach my $uco (sort keys %$dataByUco) {
my $TOWN = $dataByUco->{$uco}->{'TOWN'};
my $POSTAL_CODE = $dataByUco->{$uco}->{'POSTAL_CODE'};

if (defined $PHONE and length $PHONE > 20) {
print $uco . " | long telefon: " . $PHONE . "\n";
next;
}
if (defined $CARD_CHIP_NUMBER and length $CARD_CHIP_NUMBER > 20) {
print $uco . " | long kod cipu: " . $CARD_CHIP_NUMBER . "\n";
next;
}
if (defined $CARD_BARCODE and length $CARD_BARCODE > 20) {
print $uco . " | long kod karty: " . $CARD_BARCODE . "\n";
next;
}
if (defined $HOUSE_NUMBER and length $HOUSE_NUMBER > 20) {
print $uco . " | long adr_cp_co: " . $HOUSE_NUMBER . "\n";
next;
}
if (defined $POSTAL_CODE and length $POSTAL_CODE > 20) {
print $uco . " | long psc: " . $POSTAL_CODE . "\n";
next;
}

if($DEBUG == 1) { print "INSERT NEW RECORD: $uco\n"; }
$inserted++;
# we will do insert
Expand Down
6 changes: 6 additions & 0 deletions slave/base/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-base (3.1.18) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 19 Jan 2023 08:30:00 +0100

perun-slave-base (3.1.17) stable; urgency=low

* Added function log_warn_to_err_exit() that prints message to
Expand Down
6 changes: 6 additions & 0 deletions slave/meta/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-full (3.1.17) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-full (3.1.16) stable; urgency=medium

* new service oidc-with-groups-einfra
Expand Down
6 changes: 6 additions & 0 deletions slave/process-affiliation-mapping-mu/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-affiliation-mapping-mu (3.1.2) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-affiliation-mapping-mu (3.1.1) stable; urgency=low

* New package version for perun-slave-process-affiliation-mapping-mu
Expand Down
6 changes: 6 additions & 0 deletions slave/process-affiliation-mapping/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-affiliation-mapping (3.1.2) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-affiliation-mapping (3.1.1) stable; urgency=low

* New package version for perun-slave-process-affiliation-mapping
Expand Down
6 changes: 6 additions & 0 deletions slave/process-afs-group/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-afs-group (3.1.5) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-afs-group (3.1.4) stable; urgency=medium

* Changed architecture to all
Expand Down
6 changes: 6 additions & 0 deletions slave/process-afs/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-afs (3.1.9) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-afs (3.1.8) stable; urgency=medium

* Fixed escaping in echo of failed commands
Expand Down
6 changes: 6 additions & 0 deletions slave/process-apache-basic-auth/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-apache-basic-auth (3.1.5) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-apache-basic-auth (3.1.4) stable; urgency=medium

* Changed architecture to all
Expand Down
6 changes: 6 additions & 0 deletions slave/process-apache-shibboleth/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-apache-shibboleth (3.1.3) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-apache-shibboleth (3.1.2) stable; urgency=medium

* Changed architecture to all
Expand Down
6 changes: 6 additions & 0 deletions slave/process-apache-ssl/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-apache-ssl (3.1.5) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-apache-ssl (3.1.4) stable; urgency=medium

* Changed architecture to all
Expand Down
6 changes: 6 additions & 0 deletions slave/process-drupal-elixir/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-drupal-elixir (3.1.8) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 19 Jan 2023 08:30:00 +0100

perun-slave-process-drupal-elixir (3.1.7) stable; urgency=low
* upon finding duplicates the script now exits with an ok error code
to prevent rerun of propagation with the same data
Expand Down
6 changes: 6 additions & 0 deletions slave/process-eduroam-block/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-eduroam-block (3.0.3) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-eduroam-block (3.0.2) stable; urgency=medium

* Changed architecture to all
Expand Down
6 changes: 6 additions & 0 deletions slave/process-eduroam-radius/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-eduroam-radius (3.1.5) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-eduroam-radius (3.1.4) stable; urgency=medium

* Changed architecture to all
Expand Down
12 changes: 9 additions & 3 deletions slave/process-fs-home/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-fs-home (3.1.11) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-fs-home (3.1.10) stable; urgency=low

* It is now possible to skip creating a home directory from mid hook.
Expand All @@ -15,12 +21,12 @@ perun-slave-process-fs-home (3.1.9) stable; urgency=high
* some arguments as user login, home mount point, gid etc. were removed from
quotas template in script and also in pre script
* this version of service fs_home supports new quotas attributes in Perun,
although format of data in the file is the same. To active it administrator
although format of data in the file is the same. To active it administrator
has to set attribute readyForNewQuotas on Facility to 'true'
* Protocol version was increased, new format is not supported with older
versions of protocol communication
* IMPORTANT: pre|post scripts and mid hooks can be also affected by these
changes and administrator should check and modify their behavior before
* IMPORTANT: pre|post scripts and mid hooks can be also affected by these
changes and administrator should check and modify their behavior before
updating to this version

-- Michal Stava <[email protected]> Tue, 02 Apr 2019 13:25:00 +0200
Expand Down
8 changes: 7 additions & 1 deletion slave/process-fs-project/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
perun-slave-process-fs-project (3.1.8) stable; urgency=low

* Fixed package priority from 'extra' to 'optional'.

-- Pavel Zlamal <[email protected]> Thu, 18 Aug 2022 09:00:00 +0200

perun-slave-process-fs-project (3.1.7) stable; urgency=medium

* Changed architecture to all
Expand All @@ -6,7 +12,7 @@ perun-slave-process-fs-project (3.1.7) stable; urgency=medium

perun-slave-process-fs-project (3.1.6) stable; urgency=high

* setfacl need to set also permissions for owner itself, not just user.
* setfacl need to set also permissions for owner itself, not just user.
This will prevent situation where owner can't access own directory.

-- Michal Stava <[email protected]> Tue, 09 Oct 2018 14:10:00 +0200
Expand Down
Loading

0 comments on commit e33b2bc

Please sign in to comment.