Made template variable the configuration file

11 files changed, 81 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fea260d1008..4c2a199718e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,25 @@
 pkgbase = rsnapshot-systemd
 	pkgdesc = Contains systemd services and timers for rsnapshot
-	pkgver = 1.0
-	pkgrel = 0
+	pkgver = 1.1
+	pkgrel = 1
 	arch = any
 	depends = rsnapshot
-	source = rsnapshot@.service
-	source = rsnapshot-hourly.timer
-	source = rsnapshot-daily.timer
-	source = rsnapshot-weekly.timer
-	source = rsnapshot-monthly.timer
-	sha512sums = d482746e910af55b2fb5d2d2ad8e36ee58f1150f340223b580eb05c26ef11b1a91c348fb80ac45590d48c3153104817f9f856f0dd333f90c542bbe559b60ef9b
-	sha512sums = f25a9fcd5c6e434a5d774a6fbc32eb189c4f4e8ce556ebee01ae65b32ae4af92490a3df7acdabba5390d18dd4fa3eb75eb9339cf2d32041cb1df6790ec876fc1
-	sha512sums = 7fa1e9331da9decc0f4ab3b66b30ceff90edccf7461bcad02772c578c98b7717ac45a9dbc08ec25da70c4732d654c39aecde41f4397676fcc2617867da622e03
-	sha512sums = c95ff77c0d6cb54eabfea1577c22a14b2e31f84380b846b34bf732e0de5df0ebac2cb2490acc112520365ff51ca18b260f9f04930c73e327d4d4ce25ccb99f64
-	sha512sums = d04db84e572b1de9edf7a3b3a2c57b27bdea7da1d635a5527b0b7637458b1c8b86c86636666ad0f95cd12df7282fb68b50e906efbdc1ad1e76cf9b9074cb0382
+	source = rsnapshot-hourly@.timer
+	source = rsnapshot-daily@.timer
+	source = rsnapshot-weekly@.timer
+	source = rsnapshot-monthly@.timer
+	source = rsnapshot-hourly@.service
+	source = rsnapshot-daily@.service
+	source = rsnapshot-weekly@.service
+	source = rsnapshot-monthly@.service
+	sha512sums = c4b9a6e1a3fafa125c4fa49e70776941f058ba5262f943e1049b0bd1f5e51252db82c35a3339862b2a06596909c6d4add1f0ac24971a4054b1285bf40e9b7ea1
+	sha512sums = 33cbb604a0d8ac1e16bc2fcf45c3518e39b0ddd2aaad18919cdcfa86273a6df6138094b8110513a4bdbb4da90b25eef3b248eb3f22a22f102a0278d695f26d60
+	sha512sums = d73124b7a6d2ab19de922eb85caf678ea9e0b59be4369fb59f4c4b814c1bd05888c8ba66d09dc44bd44d0667c59517193b97323841b561795c78320d44d0f3bc
+	sha512sums = 9b552fb302c9af58fb7d23054616e18d2cfae21f1f45a73f0837084acdbfb2d37a5c43c22b62d19f0ee703e5275d01cc92c22d01504a738162f8fa6b1a72ac79
+	sha512sums = 95b394881f439831ca4827952b61da15fa3cdeb69992e9daeb0e4adc2afc9b4462c6e410982d8499bcf4aa7a4dbbe4d9e1f0ff1882c49f04ce09a2828ca92839
+	sha512sums = edfe32c5829a5c05b5da34f5b27b5ba5fa5e28335448984bf58c770a68df37bf8440348987a49aa41d06fa9f2c181190981d7688a49ea51fa221013dbb89e15a
+	sha512sums = c21917011e1000557ab787a4345119fa601ee478e623f2aaff52bd624572de2299c068cf150465dbfeae2bdadbe2de1433c3c3666e0eb703137109e65033ccc5
+	sha512sums = b3d4c537d2ed52a15d73bd7c372c9299ee95200db091b8060f0a2740fea40661dbfa0d4d6b300d194ac9a89a3c12e9010f45ecb304d678221e59063047cf7f1c
 
 pkgname = rsnapshot-systemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c62a7b7d31e..42dae9f8bad2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,36 @@
 # Maintainer: S. D. Cloudt < stefan dot cloudt at outlook dot com >
 pkgname=rsnapshot-systemd
-pkgver=1.0
-pkgrel=0
+pkgver=1.1
+pkgrel=1
 pkgdesc="Contains systemd services and timers for rsnapshot"
 arch=('any')
 depends=('rsnapshot')
-source=('rsnapshot@.service'
-		'rsnapshot-hourly.timer'
-		'rsnapshot-daily.timer'
-		'rsnapshot-weekly.timer'
-		'rsnapshot-monthly.timer')
+source=('rsnapshot-hourly@.timer'
+		'rsnapshot-daily@.timer'
+		'rsnapshot-weekly@.timer'
+		'rsnapshot-monthly@.timer'
+		'rsnapshot-hourly@.service'
+		'rsnapshot-daily@.service'
+		'rsnapshot-weekly@.service'
+		'rsnapshot-monthly@.service')
 
 package() {
 	install -dm755 "${pkgdir}/etc/systemd/system"
-	install -m644 "${srcdir}/rsnapshot@.service" "${pkgdir}/etc/systemd/system"
-	install -m644 "${srcdir}/rsnapshot-hourly.timer" "${pkgdir}/etc/systemd/system"
-	install -m644 "${srcdir}/rsnapshot-daily.timer" "${pkgdir}/etc/systemd/system"
-	install -m644 "${srcdir}/rsnapshot-weekly.timer" "${pkgdir}/etc/systemd/system"
-	install -m644 "${srcdir}/rsnapshot-monthly.timer" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-hourly@.timer" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-daily@.timer" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-weekly@.timer" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-monthly@.timer" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-hourly@.service" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-daily@.service" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-weekly@.service" "${pkgdir}/etc/systemd/system"
+	install -m644 "${srcdir}/rsnapshot-monthly@.service" "${pkgdir}/etc/systemd/system"
 }
-sha512sums=(
-  'd482746e910af55b2fb5d2d2ad8e36ee58f1150f340223b580eb05c26ef11b1a91c348fb80ac45590d48c3153104817f9f856f0dd333f90c542bbe559b60ef9b'
-  'f25a9fcd5c6e434a5d774a6fbc32eb189c4f4e8ce556ebee01ae65b32ae4af92490a3df7acdabba5390d18dd4fa3eb75eb9339cf2d32041cb1df6790ec876fc1'
-  '7fa1e9331da9decc0f4ab3b66b30ceff90edccf7461bcad02772c578c98b7717ac45a9dbc08ec25da70c4732d654c39aecde41f4397676fcc2617867da622e03'
-  'c95ff77c0d6cb54eabfea1577c22a14b2e31f84380b846b34bf732e0de5df0ebac2cb2490acc112520365ff51ca18b260f9f04930c73e327d4d4ce25ccb99f64'
-  'd04db84e572b1de9edf7a3b3a2c57b27bdea7da1d635a5527b0b7637458b1c8b86c86636666ad0f95cd12df7282fb68b50e906efbdc1ad1e76cf9b9074cb0382'
-)
+
+sha512sums=('c4b9a6e1a3fafa125c4fa49e70776941f058ba5262f943e1049b0bd1f5e51252db82c35a3339862b2a06596909c6d4add1f0ac24971a4054b1285bf40e9b7ea1'
+            '33cbb604a0d8ac1e16bc2fcf45c3518e39b0ddd2aaad18919cdcfa86273a6df6138094b8110513a4bdbb4da90b25eef3b248eb3f22a22f102a0278d695f26d60'
+            'd73124b7a6d2ab19de922eb85caf678ea9e0b59be4369fb59f4c4b814c1bd05888c8ba66d09dc44bd44d0667c59517193b97323841b561795c78320d44d0f3bc'
+            '9b552fb302c9af58fb7d23054616e18d2cfae21f1f45a73f0837084acdbfb2d37a5c43c22b62d19f0ee703e5275d01cc92c22d01504a738162f8fa6b1a72ac79'
+            '95b394881f439831ca4827952b61da15fa3cdeb69992e9daeb0e4adc2afc9b4462c6e410982d8499bcf4aa7a4dbbe4d9e1f0ff1882c49f04ce09a2828ca92839'
+            'edfe32c5829a5c05b5da34f5b27b5ba5fa5e28335448984bf58c770a68df37bf8440348987a49aa41d06fa9f2c181190981d7688a49ea51fa221013dbb89e15a'
+            'c21917011e1000557ab787a4345119fa601ee478e623f2aaff52bd624572de2299c068cf150465dbfeae2bdadbe2de1433c3c3666e0eb703137109e65033ccc5'
+            'b3d4c537d2ed52a15d73bd7c372c9299ee95200db091b8060f0a2740fea40661dbfa0d4d6b300d194ac9a89a3c12e9010f45ecb304d678221e59063047cf7f1c')
diff --git a/rsnapshot-daily@.service b/rsnapshot-daily@.service
new file mode 100644
index 000000000000..0da4341a74c3
--- /dev/null
+++ b/rsnapshot-daily@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=rsnapshot daily backup (%I)
+
+[Service]
+Type=oneshot
+Nice=19
+IOSchedulingClass=idle
+ExecStart=/usr/bin/rsnapshot -c %I daily
diff --git a/rsnapshot-daily.timer b/rsnapshot-daily@.timer
index e8851bebf255..a81df7f88ab6 100644
--- a/rsnapshot-daily.timer
+++ b/rsnapshot-daily@.timer
@@ -4,7 +4,7 @@ Description=rsnapshot daily timer
 [Timer]
 OnCalendar=*-*-* 5:30
 Persistent=true
-Unit=rsnapshot@daily.service
+Unit=rsnapshot-daily@%i.service
 
 [Install]
 WantedBy=timers.target
diff --git a/rsnapshot-hourly@.service b/rsnapshot-hourly@.service
new file mode 100644
index 000000000000..5278b1ad1eff
--- /dev/null
+++ b/rsnapshot-hourly@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=rsnapshot hourly backup (%I)
+
+[Service]
+Type=oneshot
+Nice=19
+IOSchedulingClass=idle
+ExecStart=/usr/bin/rsnapshot -c %I hourly
diff --git a/rsnapshot-hourly.timer b/rsnapshot-hourly@.timer
index d25f11b119c8..b4de4b6e8726 100644
--- a/rsnapshot-hourly.timer
+++ b/rsnapshot-hourly@.timer
@@ -4,7 +4,7 @@ Description=rsnapshot hourly timer
 [Timer]
 OnCalendar=*-*-* *:00
 Persistent=true
-Unit=rsnapshot@hourly.service
+Unit=rsnapshot-hourly@%i.service
 
 [Install]
 WantedBy=timers.target
diff --git a/rsnapshot-monthly@.service b/rsnapshot-monthly@.service
new file mode 100644
index 000000000000..754590b7ccc7
--- /dev/null
+++ b/rsnapshot-monthly@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=rsnapshot monthly backup (%I)
+
+[Service]
+Type=oneshot
+Nice=19
+IOSchedulingClass=idle
+ExecStart=/usr/bin/rsnapshot -c %I monthly
diff --git a/rsnapshot-monthly.timer b/rsnapshot-monthly@.timer
index 998bc4d16bc0..87a6b001b58e 100644
--- a/rsnapshot-monthly.timer
+++ b/rsnapshot-monthly@.timer
@@ -4,7 +4,7 @@ Description=rsnapshot monthly timer
 [Timer]
 OnCalendar=*-*-1 4:30
 Persistent=true
-Unit=rsnapshot@monthly.service
+Unit=rsnapshot-monthly@%i.service
 
 [Install]
 WantedBy=timers.target
diff --git a/rsnapshot-weekly@.service b/rsnapshot-weekly@.service
new file mode 100644
index 000000000000..d5186921ba9f
--- /dev/null
+++ b/rsnapshot-weekly@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=rsnapshot weekly backup (%I)
+
+[Service]
+Type=oneshot
+Nice=19
+IOSchedulingClass=idle
+ExecStart=/usr/bin/rsnapshot -c %I weekly
diff --git a/rsnapshot-weekly.timer b/rsnapshot-weekly@.timer
index e48c96260f1e..8ba3b03c626c 100644
--- a/rsnapshot-weekly.timer
+++ b/rsnapshot-weekly@.timer
@@ -4,7 +4,7 @@ Description=rsnapshot weekly timer
 [Timer]
 OnCalendar=Monday *-*-* 4:30
 Persistent=true
-Unit=rsnapshot@weekly.service
+Unit=rsnapshot-weekly@%i.service
 
 [Install]
 WantedBy=timers.target
diff --git a/rsnapshot@.service b/rsnapshot@.service
deleted file mode 100644
index fadb9d6993e8..000000000000
--- a/rsnapshot@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=rsnapshot (%I) backup
-
-[Service]
-Type=oneshot
-Nice=19
-IOSchedulingClass=idle
-ExecStart=/usr/bin/rsnapshot %I