merge cron rules

diff --git a/conf/etc/cron.d/telecaster b/conf/etc/cron.d/telecaster
new file mode 100644 (file)
index 0000000..b7bf48f
--- /dev/null
+++ b/conf/etc/cron.d/telecaster
@@ -0,0 +1,16 @@
+# Cleanup
+0 */3 * * * telecaster python /home/telecaster/apps/tools/cleanup/rm_date_days.py 10 /home/telecaster/trash/ >> /var/log/telecaster/cleanup.log
+30 */3 * * * telecaster python /home/telecaster/apps/tools/cleanup/rm_date_days.py 10 /home/telecaster/archives/ >> /var/log/telecaster/cleanup.log
+
+# Local import
+0,30 * * * * telecaster /usr/local/lib/telecaster/instance/manage.py teleforma-import-conferences Pre-Barreau /var/log/telecaster/import.log
+
+# Stop
+0 0 * * * root /etc/init.d/telecaster stop
+
+# Start
+0 0 * * * root /etc/init.d/telecaster start
+
+# Sync
+15 12,15 * * * telecaster /usr/local/lib/telecaster/instance/manage.py telecaster-rsync-archives
+0  21 * * * telecaster /usr/local/lib/telecaster/instance/manage.py telecaster-rsync-archives

diff --git a/conf/etc/cron.d/telecaster_cleanup b/conf/etc/cron.d/telecaster_cleanup
deleted file mode 100644 (file)
index f27d7f5..0000000
--- a/conf/etc/cron.d/telecaster_cleanup
+++ /dev/null
@@ -1 +0,0 @@
-0 12 * * * telecaster python /home/telecaster/apps/tools/cleanup/rm_date_days.py 10 /home/telecaster/trash/ >> /var/log/telecaster/cleanup.log

diff --git a/conf/etc/cron.d/telecaster_import b/conf/etc/cron.d/telecaster_import
deleted file mode 100644 (file)
index f1364dc..0000000
--- a/conf/etc/cron.d/telecaster_import
+++ /dev/null
@@ -1 +0,0 @@
-0 * * * * telecaster /usr/local/lib/telecaster/instance/manage.py teleforma-import-conferences Pre-Barreau /var/log/telecaster/import.log

diff --git a/conf/etc/cron.d/telecaster_restart b/conf/etc/cron.d/telecaster_restart
deleted file mode 100644 (file)
index 4e65d54..0000000
--- a/conf/etc/cron.d/telecaster_restart
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 * * * root /usr/local/bin/telecaster-restart
-

diff --git a/conf/etc/cron.d/telecaster_rsync b/conf/etc/cron.d/telecaster_rsync
deleted file mode 100644 (file)
index 220c700..0000000
--- a/conf/etc/cron.d/telecaster_rsync
+++ /dev/null
@@ -1,3 +0,0 @@
-15 12 * * * telecaster /usr/local/lib/telecaster/instance/manage.py telecaster-rsync-archives
-15 15 * * * telecaster /usr/local/lib/telecaster/instance/manage.py telecaster-rsync-archives
-0  21 * * * telecaster /usr/local/lib/telecaster/instance/manage.py telecaster-rsync-archives