From dce0f43698fa6271234a46d5c6a7cdc7eed33264 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 27 Apr 2015 19:09:22 +0200 Subject: Clarifying Description of all units. Generalizing backup-mariadb.* to backup-mysql.* --- system/backup-aura-states.service | 2 +- system/backup-aura-states.timer | 2 +- system/backup-bitlbee.service | 2 +- system/backup-bitlbee.timer | 2 +- system/backup-etc.service | 2 +- system/backup-etc.timer | 2 +- system/backup-mail.service | 2 +- system/backup-mail.timer | 2 +- system/backup-mariadb.service | 12 ------------ system/backup-mariadb.timer | 10 ---------- system/backup-mysql.service | 12 ++++++++++++ system/backup-mysql.timer | 10 ++++++++++ system/backup-var-log-journal.service | 2 +- system/backup-var-log-journal.timer | 2 +- system/backup-var-log.service | 2 +- system/backup-var-log.timer | 2 +- system/backup-websites.service | 2 +- system/backup-websites.timer | 2 +- system/cleanup-backup.timer | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 system/backup-mariadb.service delete mode 100644 system/backup-mariadb.timer create mode 100644 system/backup-mysql.service create mode 100644 system/backup-mysql.timer diff --git a/system/backup-aura-states.service b/system/backup-aura-states.service index 5dfc42a..3f8c619 100644 --- a/system/backup-aura-states.service +++ b/system/backup-aura-states.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup /var/cache/aura/states directory +Description=Backup /var/cache/aura/states ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-aura-states ConditionFileIsExecutable=/usr/bin/sudo ConditionFileIsExecutable=/usr/bin/aura diff --git a/system/backup-aura-states.timer b/system/backup-aura-states.timer index aed709d..d779061 100644 --- a/system/backup-aura-states.timer +++ b/system/backup-aura-states.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup aura states every Monday +Description=Backup aura states [Timer] # Every Monday diff --git a/system/backup-bitlbee.service b/system/backup-bitlbee.service index 5ab261a..8996fd8 100644 --- a/system/backup-bitlbee.service +++ b/system/backup-bitlbee.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup Bitlbee configs +Description=Backup Bitlbee configuration ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-bitlbee [Service] diff --git a/system/backup-bitlbee.timer b/system/backup-bitlbee.timer index 2ff52ce..e2460c5 100644 --- a/system/backup-bitlbee.timer +++ b/system/backup-bitlbee.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup of Bitlbee configuration every 2nd and 17th of a month +Description=Backup Bitlbee configuration [Timer] # Every 2nd and 17th of each month at 5:00 diff --git a/system/backup-etc.service b/system/backup-etc.service index ea7c488..a6d690c 100644 --- a/system/backup-etc.service +++ b/system/backup-etc.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup /etc directory +Description=Backup /etc ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-etc [Service] diff --git a/system/backup-etc.timer b/system/backup-etc.timer index a183646..b5af2fd 100644 --- a/system/backup-etc.timer +++ b/system/backup-etc.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup /etc directory every Monday +Description=Backup /etc [Timer] # Every Monday diff --git a/system/backup-mail.service b/system/backup-mail.service index b211205..bbbc781 100644 --- a/system/backup-mail.service +++ b/system/backup-mail.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup mail accounts and mailman mailing lists +Description=Backup mail accounts and mailman lists ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-mail [Service] diff --git a/system/backup-mail.timer b/system/backup-mail.timer index 22367df..e7a81ab 100644 --- a/system/backup-mail.timer +++ b/system/backup-mail.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup mail and mailman every first day of the month +Description=Backup mail accounts and mailman lists [Timer] # Every 1st of each month at 5:00 diff --git a/system/backup-mariadb.service b/system/backup-mariadb.service deleted file mode 100644 index 8aa6622..0000000 --- a/system/backup-mariadb.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Backup MariaDB databases -ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-mariadb -ConditionFileIsExecutable=/usr/bin/mysql - -[Service] -EnvironmentFile=/etc/backup-settings -Nice=19 -IOSchedulingClass=2 -IOSchedulingPriority=7 -ExecStart=/usr/lib/systemd/scripts/backup-mariadb - diff --git a/system/backup-mariadb.timer b/system/backup-mariadb.timer deleted file mode 100644 index 1f9fca6..0000000 --- a/system/backup-mariadb.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Backup MariaDB databases every Monday at 3:00 - -[Timer] -# Every Monday at 3:00 -OnCalendar=Mon *-*-* 03:00 -Persistent=true - -[Install] -WantedBy=timers.target diff --git a/system/backup-mysql.service b/system/backup-mysql.service new file mode 100644 index 0000000..c676839 --- /dev/null +++ b/system/backup-mysql.service @@ -0,0 +1,12 @@ +[Unit] +Description=Backup MySQL databases +ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-mariadb +ConditionFileIsExecutable=/usr/bin/mysql + +[Service] +EnvironmentFile=/etc/backup-settings +Nice=19 +IOSchedulingClass=2 +IOSchedulingPriority=7 +ExecStart=/usr/lib/systemd/scripts/backup-mariadb + diff --git a/system/backup-mysql.timer b/system/backup-mysql.timer new file mode 100644 index 0000000..836ee1c --- /dev/null +++ b/system/backup-mysql.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Backup MySQL databases + +[Timer] +# Every Monday at 3:00 +OnCalendar=Mon *-*-* 03:00 +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/system/backup-var-log-journal.service b/system/backup-var-log-journal.service index 6d1a5ec..67baf4a 100644 --- a/system/backup-var-log-journal.service +++ b/system/backup-var-log-journal.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup /var/log/journal directory +Description=Backup /var/log/journal ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-var-log-journal [Service] diff --git a/system/backup-var-log-journal.timer b/system/backup-var-log-journal.timer index 30bd91c..052dbf3 100644 --- a/system/backup-var-log-journal.timer +++ b/system/backup-var-log-journal.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup /var/log/journal every Tuesday at 06:00 +Description=Backup /var/log/journal [Timer] # Every Tuesday at 06:00 diff --git a/system/backup-var-log.service b/system/backup-var-log.service index 6c9fc79..8471eb6 100644 --- a/system/backup-var-log.service +++ b/system/backup-var-log.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup /var/log directory +Description=Backup /var/log ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-var-log [Service] diff --git a/system/backup-var-log.timer b/system/backup-var-log.timer index 489abe1..42f76dd 100644 --- a/system/backup-var-log.timer +++ b/system/backup-var-log.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup /var/log every Tuesday at 05:30 +Description=Backup /var/log [Timer] # Every Tuesday at 5:30 diff --git a/system/backup-websites.service b/system/backup-websites.service index c350b21..606a987 100644 --- a/system/backup-websites.service +++ b/system/backup-websites.service @@ -1,5 +1,5 @@ [Unit] -Description=Backup Websites +Description=Backup website directories ConditionFileIsExecutable=/usr/lib/systemd/scripts/backup-websites [Service] diff --git a/system/backup-websites.timer b/system/backup-websites.timer index 5c08795..23f2cd3 100644 --- a/system/backup-websites.timer +++ b/system/backup-websites.timer @@ -1,5 +1,5 @@ [Unit] -Description=Backup websites every 1st and 16th of each montih at 03:00 +Description=Backup website directories [Timer] # Every 1st and 16th of each month at 03:00 diff --git a/system/cleanup-backup.timer b/system/cleanup-backup.timer index 9879312..f83651b 100644 --- a/system/cleanup-backup.timer +++ b/system/cleanup-backup.timer @@ -1,5 +1,5 @@ [Unit] -Description=Cleanup backups every 3rd and 18th of each month at 05:00 +Description=Cleanup backups [Timer] # Every 3rd and 18th of each month at 5:00 -- cgit v1.2.3-54-g00ecf