ui / pas / ouroborus

update index page for PAS ( used symlink now ) update ouroborus.yml ( var/run/docker.sock:/var/run/docker.sock ) update PAS config for faster read
MHA-Team · Jan 11, 2020 · aefc96f · aefc96f
1 parent a7886ec
commit aefc96f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/menu/functions/ouroboros.yml b/menu/functions/ouroboros.yml
@@ -14,7 +14,7 @@
  - name: 'Setting {{pgrole}} Volumes'
  set_fact:
  pg_volumes:
- - 'unix://var/run/docker.sock:unix://var/run/docker.sock'
+ - '/var/run/docker.sock:/var/run/docker.sock'
  - '/etc/localtime:/etc/localtime:ro'
 
  - name: 'Setting {{pgrole}} ENV'

diff --git a/menu/pgui/pgui.yml b/menu/pgui/pgui.yml
@@ -51,7 +51,6 @@
  - '/opt/appdata/{{pgrole}}/:/var/www/html/'
  - '/var/plexguide:/plexguide'
  - '/opt/appdata/plexguide:/log'
- - '/opt:/opt'
 
  - name: 'Setting {{pgrole}} ENV'
  set_fact:

diff --git a/menu/pgui/templates/autoscan-index.php b/menu/pgui/templates/autoscan-index.php
@@ -1,8 +1,10 @@
 <!doctype html>
 <html>
 <head>
-<meta http-equiv="cache-control" content="no-cache" http-equiv="refresh" content="25" charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-<meta name="robots" content="noindex, nofollow, noarchive" /> 
+<meta http-equiv="refresh" content="25" charset="UTF-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+ <meta name="robots" content="noindex, nofollow, noarchive" />
+ <meta http-equiv="cache-control" content="no-cache" /> 
 <title>Com-UI</title>
 <link rel="icon" type="image/png" href="https://i.imgur.com/T7OQsZz.png" sizes="32x32">
 <style type="text/css">
@@ -142,7 +144,7 @@
  <td width="876" align="center">
  <h1>
  <strong style="color: #000000; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: xx-large; font-weight: bolder;">Community UI<br>
- <span style="color: #053F00; font-size: small">Auto-Refreshes Every 10 Seconds</span> 
+ <span style="color: #053F00; font-size: small">Auto-Refreshes Every 25 Seconds</span> 
  <br>
  </strong>
  </h1>
@@ -186,7 +188,7 @@
  <tr>
  <td colspan="6" bgcolor="#000000" style="color: #F7F6F6; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-weight: bold; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <div class="autologs"><?php $output = shell_exec('tail -n 50 /plexguide/logs/rclone-*.log'); echo "<pre>$output</pre>";?></div>
+ <div class="autologs"><?php $output = shell_exec('tail -n 100 /plexguide/logs/rclone-*.log'); echo "<pre>$output</pre>";?></div>
  </span></td>
  </tr>
  </tbody>
@@ -203,7 +205,7 @@
  <tr>
  <td colspan="6" bgcolor="#000000" style="color: #F7F6F6; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-weight: bold; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <div class="autopas"><?php $output = shell_exec('tail -n 50 /opt/plex_autoscan/plex_*.log'); echo "<pre>$output</pre>";?></div>
+ <div class="autopas"><?php $output = shell_exec('tail -n 100 /plexguide/logs/plex_*.log'); echo "<pre>$output</pre>";?></div>
  </span>
  </td>
  </tr>
@@ -237,18 +239,17 @@
  <td width="15%" bgcolor="#000000" style="font-size: medium"><span style="color: #F7F6F6; font-weight: bold; font-size: medium;"><strong><strong>&nbsp;&nbsp;Union - RClone | Mount</strong></span></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif;"><span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <?php $output = shell_exec('tail -n 1 /plexguide/pg.union');echo "<pre>$output</pre>";?></span></td>
-
  <td width="15%" height="21" bgcolor="#000000" style="color: #F7F6F6; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-weight: bold; font-size: medium;"><strong>&nbsp;&nbsp; Blitz | Move</strong></span></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif;"><span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <?php $output = shell_exec('tail -n 1 /plexguide/pg.blitz');echo "<pre>$output</pre>";?></span></td>
  </tr>
  <tr>
  <td width="15%" bgcolor="#000000" style="font-size: medium"><span style="color: #F7F6F6; font-weight: bold; font-size: medium;"><strong>&nbsp;&nbsp;/mnt/downloads</strong></span></td><td width="18%" height="21" style="font-size: medium"><span class="test" style="color: #FFFFFF;">
- <?php $output = shell_exec('tail -n 1 /plexguide/spaceused.log');echo "<pre>$output</pre>";?></span>
+ <?php $output = shell_exec('tail -n1 /plexguide/spaceused.log');echo "<pre>$output</pre>";?></span>
  </td>
  <td width="15%" height="21" bgcolor="#000000" style="font-size: medium"><span style="color: #F7F6F6; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-weight: bold; font-size: medium; "><span style="color: #F7F6F6; font-weight: bold; font-size: medium;"><strong>&nbsp;&nbsp;/mnt/move</strong></span></span></td>
  <td width="18%" height="21" style="font-size: medium"><span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('head -n 1 /plexguide/spaceused.log');echo "<pre>$output</pre>";?></span></td>
+ <?php $output = shell_exec('head -n1 /plexguide/spaceused.log');echo "<pre>$output</pre>";?></span></td>
  </tr>
  <tr>
  <td width="15%" bgcolor="#000000" style="font-size: medium"><span style="color: #F7F6F6; font-weight: bold; font-size: medium;"><strong>&nbsp;&nbsp; mergerfs </strong></span></td><td width="18%" height="21" style="font-size: medium"><span class="test" style="color: #FFFFFF;">
@@ -362,13 +363,13 @@
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong>&nbsp;&nbsp;GDrive /wo Encryption</strong></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 1 /plexguide/gduncrypt.log');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n1 /plexguide/gduncrypt.log');echo "<pre>$output</pre>";?>
  </span>
  </td>
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong>&nbsp;&nbsp;GDrive /w Encyption</strong></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 1 /plexguide/gdcrypt.log');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n1 /plexguide/gdcrypt.log');echo "<pre>$output</pre>";?>
  </span>
  </td>
  </tr> 
@@ -380,13 +381,13 @@
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong>&nbsp;&nbsp;GDrive /wo Encryption files/folder</strong></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 2 /plexguide/gduncrypt.log | head -1');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n2 /plexguide/gduncrypt.log | head -1');echo "<pre>$output</pre>";?>
  </span>
  </td>
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong>&nbsp;&nbsp;GDrive /w Encyption file/folders</strong></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 2 /plexguide/gdcrypt.log | head -1');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n2 /plexguide/gdcrypt.log | head -1');echo "<pre>$output</pre>";?>
  </span>
  </td>
  </tr>
@@ -417,13 +418,13 @@
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong> &nbsp;&nbsp;TDrive /wo Encryption</strong></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 1 /plexguide/tduncrypt.log');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n1 /plexguide/tduncrypt.log');echo "<pre>$output</pre>";?>
  </span>
  </td>
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong> &nbsp;&nbsp;TDrive /w Encryption</strong></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 1 /plexguide/tdcrypt.log');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n1 /plexguide/tdcrypt.log');echo "<pre>$output</pre>";?>
  </span>
  </td>
  </tr>
@@ -435,13 +436,13 @@
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong> &nbsp;&nbsp;TDrive /wo Encryption files/folders</strong></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 2 /plexguide/tduncrypt.log | head -1');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n2 /plexguide/tduncrypt.log | head -1');echo "<pre>$output</pre>";?>
  </span>
  </td>
  <td width="15%" bgcolor="#000000" style="font-size: medium"><strong> &nbsp;&nbsp;TDrive /w Encryption files/folders</strong></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <?php $output = shell_exec('tail -n 2 /plexguide/tdcrypt.log | head -1');echo "<pre>$output</pre>";?>
+ <?php $output = shell_exec('tail -n2 /plexguide/tdcrypt.log | head -1');echo "<pre>$output</pre>";?>
  </span>
  </td>
  </tr>

diff --git a/menu/pgui/templates/test-index.php b/menu/pgui/templates/test-index.php
@@ -205,7 +205,7 @@
  <tr>
  <td colspan="6" bgcolor="#000000" style="color: #F7F6F6; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-weight: bold; font-size: medium;">
  <span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
- <div class="autopas"><?php $output = shell_exec('tail -n 100 /opt/plex_autoscan/plex_*.log'); echo "<pre>$output</pre>";?></div>
+ <div class="autopas"><?php $output = shell_exec('tail -n 100 /plexguide/logs/plex_*.log'); echo "<pre>$output</pre>";?></div>
  </span>
  </td>
  </tr>
@@ -239,7 +239,6 @@
  <td width="15%" bgcolor="#000000" style="font-size: medium"><span style="color: #F7F6F6; font-weight: bold; font-size: medium;"><strong><strong>&nbsp;&nbsp;Union - RClone | Mount</strong></span></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif;"><span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <?php $output = shell_exec('tail -n 1 /plexguide/pg.union');echo "<pre>$output</pre>";?></span></td>
-
  <td width="15%" height="21" bgcolor="#000000" style="color: #F7F6F6; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-weight: bold; font-size: medium;"><strong>&nbsp;&nbsp; Blitz | Move</strong></span></span></td>
  <td width="18%" height="21" class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif;"><span class="test" style="color: #FFFFFF; font-family: Segoe, 'Segoe UI', 'DejaVu Sans', 'Trebuchet MS', Verdana, sans-serif; font-size: medium;">
  <?php $output = shell_exec('tail -n 1 /plexguide/pg.blitz');echo "<pre>$output</pre>";?></span></td>

diff --git a/menu/roles/plex_autoscan/templates/config.json.j2 b/menu/roles/plex_autoscan/templates/config.json.j2
@@ -66,8 +66,8 @@
  "RUN_COMMAND_BEFORE_SCAN":"",
  "RUN_COMMAND_AFTER_SCAN": "",
  "SERVER_ALLOW_MANUAL_SCAN":true,
- "SERVER_FILE_CHECK_DELAY":60,
- "SERVER_MAX_FILE_CHECKS":10,
+ "SERVER_FILE_CHECK_DELAY":15,
+ "SERVER_MAX_FILE_CHECKS":5,
  "SERVER_FILE_EXIST_PATH_MAPPINGS":{
  "/mnt/":[
  "/mnt/"
@@ -84,7 +84,7 @@
  ]
  },
  "SERVER_PORT":3468,
- "SERVER_SCAN_DELAY":60,
+ "SERVER_SCAN_DELAY":15,
  "SERVER_SCAN_FOLDER_ON_FILE_EXISTS_EXHAUSTION":true,
  "SERVER_SCAN_PRIORITIES":{
  },