renamed: pmg-cron-hourly to pmg-hourly

diff --git a/Makefile b/Makefile
index 7d9d5926cc5f93918742b3cf126d3ab81a7ab374..4daac834f5dd32f52a176f2e70e634b0176a4baf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ REPOID=`./repoid.pl .git`
 SERVICES = pmgdaemon pmgproxy
 CLITOOLS = pmgdb pmgconfig pmgperf
 CLISCRIPTS = pmg-smtp-filter pmgsh pmgpolicy
-CRONSCRIPTS = pmg-cron-hourly
+CRONSCRIPTS = pmg-hourly
 
 CLI_CLASSES = $(addprefix PMG/CLI/, $(addsuffix .pm, ${CLITOOLS}))
 SERVICE_CLASSES = $(addprefix PMG/Service/, $(addsuffix .pm, ${SERVICES}))

diff --git a/bin/pmg-cron-hourly b/bin/pmg-cron-hourly
deleted file mode 100644 (file)
index a90390d..0000000
--- a/bin/pmg-cron-hourly
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/perl -T
-
-$ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
-
-delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};  
-
-use strict;
-use warnings;
-
-use PVE::SafeSyslog;
-use PVE::INotify;
-use PVE::RESTEnvironment;
-
-use PMG::Utils;
-use PMG::Config;
-use PMG::ClusterConfig;
-use PMG::LDAPSet;
-
-$SIG{'__WARN__'} = sub {
-    my $err = $@;
-    my $t = $_[0];
-    chomp $t;
-    print STDERR "$t\n";
-    syslog('warning', "%s", $t);
-    $@ = $err;
-};
-
-PVE::RESTEnvironment->setup_default_cli_env();
-
-initlog('pmg-cron-hourly', 'mail');
-
-my $cfg = PMG::Config->new();
-
-my $demo = $cfg->get('admin', 'demo');
-
-my $cluster = PMG::ClusterConfig->new();
-
-if ($demo) {
-    # fixme: generate fake statistics
-
-    return;
-}
-  
-PMG::Utils::service_cmd('pmgpolicy', 'restart');
-
-my $ldap_cfg = PVE::INotify::read_file("pmg-ldap.conf");
-PMG::LDAPSet::ldap_resync($ldap_cfg);
-
-# sync bayes journal to database
-system('sa-learn --sync >/dev/null 2>&1');
-
-# make sure clamav-daemon is running
-PMG::Utils::service_cmd('clamav-daemon', 'start');
-
-exit(0);
-    

diff --git a/bin/pmg-hourly b/bin/pmg-hourly
new file mode 100644 (file)
index 0000000..cfc29a9
--- /dev/null
+++ b/bin/pmg-hourly
@@ -0,0 +1,56 @@
+#!/usr/bin/perl -T
+
+$ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
+
+delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};  
+
+use strict;
+use warnings;
+
+use PVE::SafeSyslog;
+use PVE::INotify;
+use PVE::RESTEnvironment;
+
+use PMG::Utils;
+use PMG::Config;
+use PMG::ClusterConfig;
+use PMG::LDAPSet;
+
+$SIG{'__WARN__'} = sub {
+    my $err = $@;
+    my $t = $_[0];
+    chomp $t;
+    print STDERR "$t\n";
+    syslog('warning', "%s", $t);
+    $@ = $err;
+};
+
+PVE::RESTEnvironment->setup_default_cli_env();
+
+initlog('pmg-hourly', 'mail');
+
+my $cfg = PMG::Config->new();
+
+my $demo = $cfg->get('admin', 'demo');
+
+my $cluster = PMG::ClusterConfig->new();
+
+if ($demo) {
+    # fixme: generate fake statistics
+
+    return;
+}
+  
+PMG::Utils::service_cmd('pmgpolicy', 'restart');
+
+my $ldap_cfg = PVE::INotify::read_file("pmg-ldap.conf");
+PMG::LDAPSet::ldap_resync($ldap_cfg);
+
+# sync bayes journal to database
+system('sa-learn --sync >/dev/null 2>&1');
+
+# make sure clamav-daemon is running
+PMG::Utils::service_cmd('clamav-daemon', 'start');
+
+exit(0);
+    

diff --git a/debian/pmg-cron-hourly.service b/debian/pmg-cron-hourly.service
deleted file mode 100644 (file)
index 3e3f57c..0000000
--- a/debian/pmg-cron-hourly.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Proxmox Mail Gateway Hourly Tasks
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/pmg/bin/pmg-cron-hourly

diff --git a/debian/pmg-cron-hourly.timer b/debian/pmg-cron-hourly.timer
deleted file mode 100644 (file)
index 8db1f02..0000000
--- a/debian/pmg-cron-hourly.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run pmg-cron-hourly.service hourly
-
-[Timer]
-OnCalendar=hourly
-Persistent=true     
-
-[Install]
-WantedBy=timers.target
\ No newline at end of file

diff --git a/debian/pmg-hourly.service b/debian/pmg-hourly.service
new file mode 100644 (file)
index 0000000..a1e1250
--- /dev/null
+++ b/debian/pmg-hourly.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Hourly Proxmox Mail Gateway activities
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/pmg/bin/pmg-cron-hourly

diff --git a/debian/pmg-hourly.timer b/debian/pmg-hourly.timer
new file mode 100644 (file)
index 0000000..8fb658e
--- /dev/null
+++ b/debian/pmg-hourly.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hourly Proxmox Mail Gateway activities
+
+[Timer]
+OnCalendar=hourly
+Persistent=true     
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 2891c733502d24fd9ae34041f58df5e7728e0888..b6243759bc6972abfb20c7b89fc71ed2a9b28d45 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,10 @@ override_dh_installinit:
        dh_systemd_enable --name=pmg-smtp-filter pmg-smtp-filter.service
        dh_systemd_enable --name=pmgpolicy pmgpolicy.service
        dh_systemd_enable --name=pmgnetcommit pmgnetcommit.service
-       dh_systemd_enable --name=pmg-cron-hourly pmg-cron-hourly.service
+       dh_systemd_enable --name=pmg-hourly pmg-hourly.service
 
 override_dh_systemd_start:
-       dh_systemd_start pmg-cron-hourly.timer
+       dh_systemd_start pmg-hourly.timer
        dh_systemd_start --no-restart-on-upgrade --no-start pmgnetcommit.service
        dh_systemd_start pmgdaemon.service pmgproxy.service pmg-smtp-filter.service pmgpolicy.service