1
0
mirror of https://github.com/krislamo/puppet-rsnapshot synced 2024-11-10 00:00:35 +00:00
Commit Graph

90 Commits

Author SHA1 Message Date
Norbert Varzariu
d57d87532b add note about range notation to README 2016-01-22 10:28:10 +01:00
Norbert Varzariu
bc3a33e6f0 fix merge conflict 2016-01-22 10:01:39 +01:00
Norbert Varzariu
0f6a6ebe31 fix template 2016-01-22 10:00:49 +01:00
Norbert Varzariu
c80ba48d4c templates/rsnapshot.erb 2016-01-22 09:58:57 +01:00
Norbert Varzariu
e823fef87c fix templates (do not create include/exclude file entries if no in/excludes given) 2016-01-22 09:56:33 +01:00
Norbert Varzariu
638ec858b0 Merge branch 'develop'
- restart cron service after config generation
2016-01-22 09:32:02 +01:00
Norbert Varzariu
d71239645f restart cron service after config change 2016-01-22 09:31:51 +01:00
Norbert Varzariu
7318f9b2dc Merge branch 'release/0.5.1' into develop 2016-01-22 09:18:03 +01:00
Norbert Varzariu
bf55ad97b6 Merge branch 'release/0.5.1' 2016-01-22 09:17:51 +01:00
Norbert Varzariu
4dedb43a22 bump version to 0.5.1 2016-01-22 09:17:49 +01:00
Norbert Varzariu
81ef65edca quick fix trailing slash in params.pp snapshot_root 2016-01-22 09:17:15 +01:00
Norbert Varzariu
9ed7f44a28 Merge branch 'release/0.5.0' into develop 2016-01-22 09:13:13 +01:00
Norbert Varzariu
d786e0088e fix merge issue 2016-01-22 09:12:32 +01:00
Norbert Varzariu
e8a287c4f8 bump version to 0.5.0 2016-01-22 09:10:12 +01:00
Norbert Varzariu
a28b27c505 Merge branch 'feature/rewrite_to_use_deep_merge' into develop
- rewrite large parts of cron file generation
- now using deep_merge to merge possible overrides into the default hash
  (eliminates a lit of spaghetti code)
2016-01-22 09:08:28 +01:00
Norbert Varzariu
0235f202b4 rewrite cron file generation using deep_merge (why is this function undocumented?) 2016-01-22 09:08:12 +01:00
Norbert Varzariu
a5558bf329 Merge branch 'master' of gitlab.flx.bn:devops/puppet-rsnapshot 2016-01-21 16:13:35 +01:00
Norbert Varzariu
d4cd5282f7 quick fixes 2016-01-21 16:12:07 +01:00
Norbert Varzariu
0a489a4eb8 quick fixes 2016-01-21 16:11:56 +01:00
Norbert Varzariu
80d1756087 Merge branch 'release/0.4.2' into develop 2016-01-21 15:19:31 +01:00
Norbert Varzariu
8f7da1a1ee Merge branch 'release/0.4.2'
- add db backup template scripts
2016-01-21 15:19:06 +01:00
Norbert Varzariu
413ca69760 bump version to 0.4.2 2016-01-21 15:19:02 +01:00
Norbert Varzariu
c7756458f1 Merge branch 'feature/rewrite_to_use_deep_merge' 2016-01-21 15:15:12 +01:00
Norbert Varzariu
d5e4ebbb9c add backup script templates 2016-01-21 15:11:10 +01:00
Norbert Varzariu
d6ea0821c0 Merge branch 'release/0.4.1' into develop 2016-01-20 11:45:58 +01:00
Norbert Varzariu
2cccc86433 Merge branch 'release/0.4.1' 2016-01-20 11:45:41 +01:00
Norbert Varzariu
e39f638dfa bump version to 0.4.1 2016-01-20 11:45:31 +01:00
Norbert Varzariu
ab9ec44ced ensure in-/exclude file is absent if no in-/excludes given 2016-01-20 11:41:59 +01:00
Norbert Varzariu
941036d986 testing 2016-01-20 10:38:27 +01:00
Norbert Varzariu
396d71cb8e testing 2016-01-20 10:27:29 +01:00
Norbert Varzariu
d1008c99eb add warning to README about configuration change in 0.4.0 2016-01-19 17:39:46 +01:00
Norbert Varzariu
ed9de1e8cd Merge branch 'release/0.4.0' into develop 2016-01-19 17:38:14 +01:00
Norbert Varzariu
d5d7507fa9 Merge branch 'release/0.4.0' 2016-01-19 17:38:03 +01:00
Norbert Varzariu
e68374cf43 bump version and update README 2016-01-19 17:37:59 +01:00
Norbert Varzariu
53e34799f5 Merge branch 'feature/create_backup_scripts' into develop 2016-01-19 17:23:45 +01:00
Norbert Varzariu
455ba13572 add backup script feature, a lot of fixes 2016-01-19 17:23:40 +01:00
Norbert Varzariu
5fe01d46e1 add routine to create mysql, psql and misc scripts 2016-01-19 16:01:54 +01:00
Norbert Varzariu
5f65000606 Merge branch 'develop' 2016-01-18 20:53:46 +01:00
Norbert Varzariu
09b6b4431c add basic tests 2016-01-18 20:53:24 +01:00
Norbert Varzariu
fce58cf09a Merge branch 'develop' 2016-01-18 19:58:32 +01:00
Norbert Varzariu
03c73285ca fix metadata 2016-01-18 19:58:19 +01:00
Norbert Varzariu
549905f750 Merge branch 'release/0.3.2' into develop 2016-01-18 19:57:35 +01:00
Norbert Varzariu
5cccf8200d Merge branch 'release/0.3.2' 2016-01-18 19:56:18 +01:00
Norbert Varzariu
ff8962cf47 bump version to 0.3.2 2016-01-18 19:56:05 +01:00
Norbert Varzariu
0b21f0e751 remove class inheritance in install.pp 2016-01-18 19:54:53 +01:00
Norbert Varzariu
ae2083c6ee Merge branch 'develop' 2016-01-18 12:11:28 +01:00
Norbert Varzariu
abae53b1ad fix travis.yml 2016-01-18 12:10:53 +01:00
Norbert Varzariu
743cecfc2d Merge branch 'release/0.3.1' into develop 2016-01-18 11:23:41 +01:00
Norbert Varzariu
8e62ff526e Merge branch 'release/0.3.1' 2016-01-18 11:23:21 +01:00
Norbert Varzariu
2fc906d387 bump version to 0.3.1 2016-01-18 11:23:14 +01:00