diff --git a/share/pkgs/logrotate/opennebula b/share/pkgs/logrotate/opennebula index 1ccd62e28f..a075ba6ce2 100644 --- a/share/pkgs/logrotate/opennebula +++ b/share/pkgs/logrotate/opennebula @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-econe b/share/pkgs/logrotate/opennebula-econe index 9af70eb67e..113d6865d9 100644 --- a/share/pkgs/logrotate/opennebula-econe +++ b/share/pkgs/logrotate/opennebula-econe @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-flow b/share/pkgs/logrotate/opennebula-flow index 7767a322b3..11c503b1c6 100644 --- a/share/pkgs/logrotate/opennebula-flow +++ b/share/pkgs/logrotate/opennebula-flow @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-gate b/share/pkgs/logrotate/opennebula-gate index c15e4ee4f4..20d58543f2 100644 --- a/share/pkgs/logrotate/opennebula-gate +++ b/share/pkgs/logrotate/opennebula-gate @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-hem b/share/pkgs/logrotate/opennebula-hem index eac069ae0a..9839d4c667 100644 --- a/share/pkgs/logrotate/opennebula-hem +++ b/share/pkgs/logrotate/opennebula-hem @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-novnc b/share/pkgs/logrotate/opennebula-novnc index 9ac1d567af..2f9334d5b5 100644 --- a/share/pkgs/logrotate/opennebula-novnc +++ b/share/pkgs/logrotate/opennebula-novnc @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-scheduler b/share/pkgs/logrotate/opennebula-scheduler index 9bdf4d26a9..404336919c 100644 --- a/share/pkgs/logrotate/opennebula-scheduler +++ b/share/pkgs/logrotate/opennebula-scheduler @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/logrotate/opennebula-sunstone b/share/pkgs/logrotate/opennebula-sunstone index 84eb47b111..1ff2b656ef 100644 --- a/share/pkgs/logrotate/opennebula-sunstone +++ b/share/pkgs/logrotate/opennebula-sunstone @@ -3,6 +3,7 @@ dateext dateformat -%Y%m%d-%s compress + maxsize 100M weekly rotate 52 missingok diff --git a/share/pkgs/services/legacy/ubuntu/opennebula b/share/pkgs/services/legacy/ubuntu/opennebula index 758fa89fcc..85aa4246f8 100755 --- a/share/pkgs/services/legacy/ubuntu/opennebula +++ b/share/pkgs/services/legacy/ubuntu/opennebula @@ -38,7 +38,6 @@ do_start() { mkdir -p /var/run/one /var/lock/one chown oneadmin /var/run/one /var/lock/one - logrotate -f /etc/logrotate.d/opennebula /etc/logrotate.d/opennebula-scheduler su oneadmin -s /bin/sh -c 'one start' ONE_START=$? @@ -66,7 +65,6 @@ do_stop() do_start_sched() { - logrotate -f /etc/logrotate.d/opennebula-scheduler su oneadmin -s /bin/sh -c 'one start-sched' } diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-econe b/share/pkgs/services/legacy/ubuntu/opennebula-econe index cc48eb0725..31003b2b0d 100755 --- a/share/pkgs/services/legacy/ubuntu/opennebula-econe +++ b/share/pkgs/services/legacy/ubuntu/opennebula-econe @@ -36,7 +36,6 @@ do_start() { mkdir -p /var/run/one /var/lock/one /var/log/one chown oneadmin /var/run/one /var/lock/one /var/log/one - logrotate -f /etc/logrotate.d/opennebula-econe su oneadmin -s /bin/sh -c "$DAEMON start" } diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-flow b/share/pkgs/services/legacy/ubuntu/opennebula-flow index da821c138b..b670b8b05b 100755 --- a/share/pkgs/services/legacy/ubuntu/opennebula-flow +++ b/share/pkgs/services/legacy/ubuntu/opennebula-flow @@ -36,7 +36,6 @@ do_start() { mkdir -p /var/run/one /var/lock/one /var/log/one chown oneadmin /var/run/one /var/lock/one /var/log/one - logrotate -f /etc/logrotate.d/opennebula-flow su oneadmin -s /bin/sh -c "$DAEMON start" } diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-gate b/share/pkgs/services/legacy/ubuntu/opennebula-gate index 7b03dae32f..f4d7471df2 100755 --- a/share/pkgs/services/legacy/ubuntu/opennebula-gate +++ b/share/pkgs/services/legacy/ubuntu/opennebula-gate @@ -36,7 +36,6 @@ do_start() { mkdir -p /var/run/one /var/lock/one /var/log/one chown oneadmin /var/run/one /var/lock/one /var/log/one - logrotate -f /etc/logrotate.d/opennebula-gate su oneadmin -s /bin/sh -c "$DAEMON start" } diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-novnc b/share/pkgs/services/legacy/ubuntu/opennebula-novnc index 2bff30a69c..f583a5fe1c 100644 --- a/share/pkgs/services/legacy/ubuntu/opennebula-novnc +++ b/share/pkgs/services/legacy/ubuntu/opennebula-novnc @@ -35,7 +35,6 @@ do_start() { mkdir -p /var/lock/one /var/log/one chown oneadmin /var/lock/one /var/log/one - logrotate -f /etc/logrotate.d/opennebula-novnc su oneadmin -s /bin/sh -c "$DAEMON start" } diff --git a/share/pkgs/services/legacy/ubuntu/opennebula-sunstone b/share/pkgs/services/legacy/ubuntu/opennebula-sunstone index d769427078..34e9e1fbfb 100755 --- a/share/pkgs/services/legacy/ubuntu/opennebula-sunstone +++ b/share/pkgs/services/legacy/ubuntu/opennebula-sunstone @@ -37,7 +37,6 @@ do_start() service opennebula-novnc start mkdir -p /var/run/one /var/lock/one /var/log/one chown oneadmin /var/run/one /var/lock/one /var/log/one - logrotate -f /etc/logrotate.d/opennebula-sunstone su oneadmin -s /bin/sh -c "$DAEMON start-sunstone" } diff --git a/share/pkgs/services/systemd/opennebula-econe.service b/share/pkgs/services/systemd/opennebula-econe.service index d4bbfe9a22..918ef8fa49 100644 --- a/share/pkgs/services/systemd/opennebula-econe.service +++ b/share/pkgs/services/systemd/opennebula-econe.service @@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/ec2_auth Type=simple Group=oneadmin User=oneadmin -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-econe -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/ruby /usr/lib/one/ruby/cloud/econe/econe-server.rb StartLimitInterval=60 StartLimitBurst=3 diff --git a/share/pkgs/services/systemd/opennebula-flow.service b/share/pkgs/services/systemd/opennebula-flow.service index 7e5a55e536..adbd69feb1 100644 --- a/share/pkgs/services/systemd/opennebula-flow.service +++ b/share/pkgs/services/systemd/opennebula-flow.service @@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/oneflow_auth Type=simple Group=oneadmin User=oneadmin -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-flow -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/ruby /usr/lib/one/oneflow/oneflow-server.rb StartLimitInterval=60 StartLimitBurst=3 diff --git a/share/pkgs/services/systemd/opennebula-gate.service b/share/pkgs/services/systemd/opennebula-gate.service index 3d22f88633..c88591f38a 100644 --- a/share/pkgs/services/systemd/opennebula-gate.service +++ b/share/pkgs/services/systemd/opennebula-gate.service @@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/onegate_auth Type=simple Group=oneadmin User=oneadmin -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-gate -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb StartLimitInterval=60 StartLimitBurst=3 diff --git a/share/pkgs/services/systemd/opennebula-hem.service b/share/pkgs/services/systemd/opennebula-hem.service index e172ce2fbb..b9c80c883b 100644 --- a/share/pkgs/services/systemd/opennebula-hem.service +++ b/share/pkgs/services/systemd/opennebula-hem.service @@ -8,7 +8,6 @@ Type=simple Group=oneadmin User=oneadmin EnvironmentFile=-/var/run/one/ssh-agent.env -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-hem -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/ruby /usr/lib/one/onehem/onehem-server.rb StartLimitInterval=60 StartLimitBurst=3 diff --git a/share/pkgs/services/systemd/opennebula-novnc.service b/share/pkgs/services/systemd/opennebula-novnc.service index 8d99a5f325..36d9921caa 100644 --- a/share/pkgs/services/systemd/opennebula-novnc.service +++ b/share/pkgs/services/systemd/opennebula-novnc.service @@ -6,7 +6,6 @@ After=syslog.target network.target Type=forking Group=oneadmin User=oneadmin -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-novnc -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/novnc-server start PIDFile=/var/lock/one/.novnc.lock StartLimitInterval=60 diff --git a/share/pkgs/services/systemd/opennebula-scheduler.service b/share/pkgs/services/systemd/opennebula-scheduler.service index e3437a0bd0..a1772104de 100644 --- a/share/pkgs/services/systemd/opennebula-scheduler.service +++ b/share/pkgs/services/systemd/opennebula-scheduler.service @@ -8,7 +8,6 @@ AssertFileNotEmpty=/var/lib/one/.one/one_auth Type=simple Group=oneadmin User=oneadmin -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-scheduler -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/mm_sched StartLimitInterval=60 StartLimitBurst=3 diff --git a/share/pkgs/services/systemd/opennebula-sunstone.service b/share/pkgs/services/systemd/opennebula-sunstone.service index 211e6ca9a5..23be26ec4b 100644 --- a/share/pkgs/services/systemd/opennebula-sunstone.service +++ b/share/pkgs/services/systemd/opennebula-sunstone.service @@ -9,7 +9,6 @@ AssertFileNotEmpty=/var/lib/one/.one/sunstone_auth Type=simple Group=oneadmin User=oneadmin -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula-sunstone -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb StartLimitInterval=60 StartLimitBurst=3 diff --git a/share/pkgs/services/systemd/opennebula.service b/share/pkgs/services/systemd/opennebula.service index ecabd86bd1..a1cbe23448 100644 --- a/share/pkgs/services/systemd/opennebula.service +++ b/share/pkgs/services/systemd/opennebula.service @@ -14,7 +14,6 @@ Group=oneadmin User=oneadmin Environment="PATH=/usr/lib/one/sh/override:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" EnvironmentFile=-/var/run/one/ssh-agent.env -ExecStartPre=-/usr/sbin/logrotate -f /etc/logrotate.d/opennebula -s /var/lib/one/.logrotate.status ExecStart=/usr/bin/oned -f ExecStopPost=/usr/share/one/follower_cleanup PIDFile=/var/lock/one/one