diff --git a/bin/backup_status.sh b/bin/backup_status.sh new file mode 100755 index 0000000..73f1dcb --- /dev/null +++ b/bin/backup_status.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# Create backup status csv + +. /etc/default/openmanage + +pushd $OPENMANAGE_DJANGO_ROOT/omva +python manage.py backupstatus +popd diff --git a/deploy/make_tarball.sh b/deploy/make_tarball.sh index 82c8ea8..2c11762 100755 --- a/deploy/make_tarball.sh +++ b/deploy/make_tarball.sh @@ -75,7 +75,7 @@ mkdir $buildit_dir/sql cp $source_dir/sql/*.sql $buildit_dir/sql # Package the configuration files. -included_management="openmanage_defaults apt_list py_list agent_config.json.sample nginx_vhost crontab log_rotate_directory_agent" +included_management="openmanage_defaults apt_list py_list agent_config.json.sample nginx_vhost crontab log_rotate_directory_agent log_rotate_backup_status" for file in $included_management; do cp $source_dir/etc/$file $buildit_dir/etc done diff --git a/django/apps/blue_management/blue_mgnt/management/commands/backupstatus.py b/django/apps/blue_management/blue_mgnt/management/commands/backupstatus.py index afddf23..6587afb 100644 --- a/django/apps/blue_management/blue_mgnt/management/commands/backupstatus.py +++ b/django/apps/blue_management/blue_mgnt/management/commands/backupstatus.py @@ -29,7 +29,7 @@ def add_arguments(self, parser): parser.add_argument('-b', '--backed-up-within', default=90, type=int) parser.add_argument('-n', '--not-backed-up-within', default=3, type=int) parser.add_argument( - '-o', '--outdir', default='/home/openmanage/backup_status', type=str + '-o', '--outdir', default='/var/log/omva/backup_status', type=str ) def _backed_up_within(self, last_backup_complete, backed_up_within): diff --git a/django/apps/blue_management/blue_mgnt/views/views.py b/django/apps/blue_management/blue_mgnt/views/views.py index 061dffe..a77cb84 100644 --- a/django/apps/blue_management/blue_mgnt/views/views.py +++ b/django/apps/blue_management/blue_mgnt/views/views.py @@ -555,7 +555,6 @@ def users_csv_download(request, api, account_info, config, username): class ReadOnlyWidget(forms.Widget): def render(self, name, value, attrs): - self.build_attrs(attrs, name=name) if hasattr(self, 'initial'): value = self.initial return "%s" % (value if value is not None else '') diff --git a/etc/log_rotate_backup_status b/etc/log_rotate_backup_status new file mode 100644 index 0000000..1088448 --- /dev/null +++ b/etc/log_rotate_backup_status @@ -0,0 +1,8 @@ +/var/log/omva/backup_status/*.csv { + daily + maxage 7 + rotate 7 + nocompress + missingok + notifempty +} diff --git a/upgrade/scripts/2017-03-30_backup_status.sh b/upgrade/scripts/2017-03-30_backup_status.sh new file mode 100755 index 0000000..4b63a02 --- /dev/null +++ b/upgrade/scripts/2017-03-30_backup_status.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Symlink logrotate config and run backup status daily + +. /etc/default/openmanage + +mkdir -p /var/log/omva/backup_status + +sudo ln -s $OPENMANAGE_ROOT/etc/log_rotate_backup_status /etc/logrotate.d/backup_status +sudo ln -s $OPENMANAGE_ROOT/bin/backup_status.sh /etc/cron.daily/backup_status