update paths

diff --git a/bin/cleaning/rm_date_days.py b/bin/cleaning/rm_date_days.py
new file mode 100755 (executable)
index 0000000..3291433
--- /dev/null
+++ b/bin/cleaning/rm_date_days.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import os, sys, stat, datetime
+
+if len(sys.argv) <= 2:
+    exit('Usage : python rm_date.py DAYS PATH')
+    
+
+dir = sys.argv[-1]
+days = int(sys.argv[-2])
+today = datetime.datetime.today()
+
+for root, dirs, files in os.walk(dir):
+    for filename in files:
+        file  = root + os.sep + filename
+        file_date = datetime.datetime.fromtimestamp(os.path.getmtime(file))
+        diff = today - file_date
+       if diff.days >= days:
+           os.remove(file)
+           print 'removed : ', file_date, file
+           
+           

diff --git a/bin/messaging/mail_msg.py b/bin/messaging/mail_msg.py
new file mode 100755 (executable)
index 0000000..ecf2577
--- /dev/null
+++ b/bin/messaging/mail_msg.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+import time
+import socket
+import smtplib
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
+
+class ParissonMailLogger:
+
+    def __init__(self, emails, service, txt_file=None):
+        self.emails = emails
+        self.server = socket.gethostbyaddr(socket.gethostname())[0]
+        self.service = service
+        self.user = 'logger-no-reply'
+        self.user_email = self.user + '@' + self.server
+        self.smtp_server = smtplib.SMTP('localhost')
+        self.date = time.strftime("%a, %d %b %Y %H:%M:%S", time.localtime())
+        self.msg = self.date + ' : ' + self.service + ' has logged this information'
+        self.mime_msg = MIMEMultipart()
+        self.mime_msg['Subject'] = self.server + ' : ' + self.service
+        self.mime_msg['To'] = ', '.join(self.emails)
+        self.mime_msg['From'] = self.user_email
+        self.mime_txt = MIMEText(self.msg)
+        self.mime_msg.attach(self.mime_txt)
+        if txt_file:
+            self.txt_file = open(txt_file, 'r')
+            self.mime_txt = MIMEText(self.txt_file.read())
+            self.mime_msg.attach(self.mime_txt)
+            self.txt_file.close()
+
+    def send(self):
+        self.smtp_server.sendmail(self.user_email, self.emails, self.mime_msg.as_string())
+
+def main():
+    txt_file = sys.argv[-2]
+    service = sys.argv[-3]
+    emails = sys.argv[-1].split(',')
+
+    p = ParissonMailLogger(emails, service, txt_file)
+    p.send()
+    p.smtp_server.quit()
+
+if __name__ == '__main__':
+    main()
+

diff --git a/bin/publishing/telecaster_master-ae.sh b/bin/publishing/telecaster_master-ae.sh
index 3ccf8bce9e300e215e28841e6e687e70929ccf53..21ea65e8b026a531cf5e7b28f96754a5a1838381 100755 (executable)
--- a/bin/publishing/telecaster_master-ae.sh
+++ b/bin/publishing/telecaster_master-ae.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+telecaster_server=/srv/telecaster-server
 organization=Pre-Barreau
 department=AE
 year=`date '+%Y'`
@@ -20,16 +21,16 @@ subject="TeleCaster remux ($departement)"
 bwlimit=20000
 
 
-python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
+python $telecaster_server/bin/mastering/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
 
 cat $tmp_log >> $remux_log
 
-python ~/bin/py/transcode_nv.py $media_dir $transcode_log
+python $telecaster_server/bin/mastering/transcode_nv.py $media_dir $transcode_log
 
 rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**"  --include="$year2/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$server_media_dir
 
 ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $import_log"
 
-python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails
+python $telecaster_server/bin/messaging/mail_msg.py $subject $tmp_log $emails
 
 

diff --git a/bin/publishing/telecaster_master-crfpa-mp4-staging.sh b/bin/publishing/telecaster_master-crfpa-mp4-staging.sh
index 1668e9cddf86e9804bd0d709b4d1dea799e1d2a4..540d38c751547563a03b1d0a3e53c017c080fd68 100755 (executable)
--- a/bin/publishing/telecaster_master-crfpa-mp4-staging.sh
+++ b/bin/publishing/telecaster_master-crfpa-mp4-staging.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+telecaster_server=/srv/telecaster-server
 year=`date '+%Y'`
 media_dir=/home/telecaster/archives/Pre-Barreau/CRFPA/$year/
 backup_dir=/mnt/nile/Pre-Barreau/CRFPA/$year/
@@ -13,7 +14,7 @@ emails="webmaster@parisson.com,jeannot@parisson.com"
 subject="TeleCaster remux (CRFPA)"
 bwlimit=20000
 
-python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
+python $telecaster_server/bin/mastering/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
 
 cat $tmp_log >> $remux_log
 
@@ -21,7 +22,7 @@ cat $tmp_log >> $remux_log
 
 #echo `date` >> ~/log/transcode-crfpa.log
 
-python ~/bin/py/transcode_nv.py $media_dir $transcode_log
+python $telecaster_server/bin/mastering/transcode_nv.py $media_dir $transcode_log
 
 #find $backup_dir -type d -exec chmod 755 {} \;
 #find $backup_dir -type f -exec chmod 644 {} \;

diff --git a/bin/publishing/telecaster_master-crfpa-mp4.sh b/bin/publishing/telecaster_master-crfpa-mp4.sh
index 413ffc4a6f64a3f14a3974ef5ba59e4697e776ba..91f01440282d660dcd2e0aca52a5ac6ca848ffa5 100755 (executable)
--- a/bin/publishing/telecaster_master-crfpa-mp4.sh
+++ b/bin/publishing/telecaster_master-crfpa-mp4.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+telecaster_server=/srv/telecaster-server
 organization=Pre-Barreau
 department=CRFPA
 year=`date '+%Y'`
@@ -18,11 +19,11 @@ emails="webmaster@parisson.com,jeannot@parisson.com"
 subject="TeleCaster remux (CRFPA)"
 bwlimit=20000
 
-python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
+python $telecaster_server/bin/mastering/remux_fix_media.py $media_dir $tmp_dir > $tmp_log
 
 cat $tmp_log >> $remux_log
 
-python ~/bin/py/transcode_nv.py $media_dir $transcode_log
+python $telecaster_server/bin/mastering/transcode_nv.py $media_dir $transcode_log
 
 #find $backup_dir -type d -exec chmod 755 {} \;
 #find $backup_dir -type f -exec chmod 644 {} \;
@@ -31,6 +32,6 @@ rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*
 
 ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $import_log"
 
-python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails
+python $telecaster_server/bin/messaging/mail_msg.py $subject $tmp_log $emails
 
 

diff --git a/bin/publishing/telecaster_master-pro.sh b/bin/publishing/telecaster_master-pro.sh
index 8f3b26df9062f94f7110c1f59c4c1e5b09692707..99673cee5542b4d0dae8007a603d8c57cec572ef 100755 (executable)
--- a/bin/publishing/telecaster_master-pro.sh
+++ b/bin/publishing/telecaster_master-pro.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+telecaster_server=/srv/telecaster-server
+
 day=`date '+%Y-%m-%d_%H-%M-%S'`
 year=`date '+%Y'`
 #year=2020
@@ -21,8 +23,8 @@ for y in `seq $(($year)) $(($year+1))`; do
  #python ~/apps/Telemeta/scripts/transcode/remux_fix_media.py $archives_dir $tmp_dir >> $log_dir/remux-pro.log
  #python ~/apps/Telemeta/scripts/transcode/transcode.py $media_dir $log_dir/transcode-pro.log
 
- python ~/bin/py/remux_fix_media.py $archives_dir $tmp_dir >> $log_dir/remux-pro.log
- python ~/bin/py/transcode_nv-pro.py $media_dir $log_dir/transcode-pro.log
+ python $telecaster_server/bin/mastering/remux_fix_media.py $archives_dir $tmp_dir >> $log_dir/remux-pro.log
+ python $telecaster_server/bin/mastering/transcode_nv-pro.py $media_dir $log_dir/transcode-pro.log
 
  chmod -fR 664 $media_dir; chmod -fR +rX $media_dir
  rsync -aquLKP --bwlimit=15000 --delete --exclude="@eaDir" $media_dir $server:$server_media_dir

diff --git a/env/.fluxbox/autostart.sh b/env/.fluxbox/autostart.sh
deleted file mode 100755 (executable)
index 24e92a3..0000000
--- a/env/.fluxbox/autostart.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# ---------------------
-# Audio channel
-# ---------------------
-
-qjackctl &
-
-/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh &
-
-/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh &
-
-sleep 8
-
-#Audio monitor
-deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml &
-
-#Video monitor
-deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml &
-
-#sleep 3
-
-#Wathdog for trash
-#/home/telecaster/.fluxbox/scripts/monitor_check.py 10 /home/telecaster/trash/webm/ smtp.icp.fr informatique@icp.fr alerts@parisson.com &
-

diff --git a/etc/cron.d/telecaster b/etc/cron.d/telecaster
index 5e2c72d8dde23087e8328378c3bd2c75c67731fe..67e59cf94437e796b2a3bc3ff5bbc12f36a1dd71 100644 (file)
--- a/etc/cron.d/telecaster
+++ b/etc/cron.d/telecaster
@@ -1,8 +1,8 @@
 0 0 * * * root /etc/init.d/telecaster stop
 30 7 * * * root /etc/init.d/telecaster start
 
-0 7 * * * root python /srv/telecaster/scripts/cleanup/rm_date_days.py 7 /home/telecaster/trash/ >> /var/log/telecaster/cleanup.log
-15 7 * * * root python /srv/telecaster/scripts/cleanup/rm_date_days.py 7  /home/telecaster/archives/ >> /var/log/telecaster/cleanup.log
+0 7 * * * root python /srv/telecaster/telecaster-server/bin/cleaning/rm_date_days.py 7 /home/telecaster/trash/ >> /var/log/telecaster/cleanup.log
+15 7 * * * root python /srv/telecaster/telecaster-server/bin/cleaning/rm_date_days.py 7  /home/telecaster/archives/ >> /var/log/telecaster/cleanup.log
 
 0 */3 * * * telecaster /srv/telecaster/instance/env/bin/python /srv/telecaster/instance/manage.py teleforma-import-conferences Pre-Barreau /var/log/telecaster/import.log
 30 * * * * telecaster /srv/telecaster/instance/env/bin/python /srv/telecaster/instance/manage.py telecaster-rsync-archives