From 71b5d30a8f41f50cea06ba625f9fa54b31c0fa76 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 16:28:55 -0700 Subject: [PATCH 01/78] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 89c8907..0e21681 100755 --- a/update.sh +++ b/update.sh @@ -3,7 +3,7 @@ PLEX_REPORT_LIB='/var/lib/plexReport' PLEX_REPORT_CONF='/etc/plexReport' -/bin/echo "Grabbing newest code from https://github.com/bstascavage/plexReport" +/bin/echo "Grabbing newest code from https://github.com/ninthwalker/plexReport" /usr/bin/git pull /bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" From 38942b81c7b800c67b1cb2af73423d45a6b23922 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 16:31:44 -0700 Subject: [PATCH 02/78] Update initial_setup.sh --- initial_setup.sh | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/initial_setup.sh b/initial_setup.sh index 366eb88..22e288e 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -6,41 +6,41 @@ PLEX_REPORT_LIB='/var/lib/plexReport' PLEX_REPORT_CONF='/etc/plexReport' -/bin/echo "Creating plexreport library at /var/lib/plexReport" +#/bin/echo "Creating plexreport library at /var/lib/plexReport" /bin/mkdir -p $PLEX_REPORT_LIB -/bin/echo "Creating plexreport conf directory at /etc/plexReport" +#/bin/echo "Creating plexreport conf directory at /etc/plexReport" /bin/mkdir -p $PLEX_REPORT_CONF -/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" +#/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" /bin/cp -r bin/* /usr/local/sbin -/bin/echo "Moving plexreport libraries to /var/lib/plexreport" +#/bin/echo "Moving plexreport libraries to /var/lib/plexreport" /bin/cp -r lib/* $PLEX_REPORT_LIB -/bin/echo "Moving email_body.erb to /etc/plexreport" +#/bin/echo "Moving email_body.erb to /etc/plexreport" /bin/cp -r etc/* $PLEX_REPORT_CONF -/bin/echo "Creating /etc/plexreport/config.yaml" +#/bin/echo "Creating /etc/plexreport/config.yaml" /usr/bin/touch /etc/plexReport/config.yaml -/bin/echo "Creating /var/log/plexReport.log" +#/bin/echo "Creating /var/log/plexReport.log" /usr/bin/touch /var/log/plexReport.log -/bin/echo "Installing ruby gem dependency" +#/bin/echo "Installing ruby gem dependency" /usr/bin/gem install bundler /usr/local/bin/bundle install -/bin/echo "Running /usr/local/sbin/plexreport-setup" -/usr/local/sbin/plexreport-setup +#/bin/echo "Running /usr/local/sbin/plexreport-setup" +#/usr/local/sbin/plexreport-setup -/bin/echo "What day do you want to run the script on? (Put 0 for Sunday, 1 for Monday, etc...)" -read CRON_DAY -/bin/echo "What hour should the script run? (00-23)" -read CRON_HOUR -/bin/echo "What minute in that hour should the script run? (00-59)" -read CRON_MINUTE +#/bin/echo "What day do you want to run the script on? (Put 0 for Sunday, 1 for Monday, etc...)" +#read CRON_DAY +#/bin/echo "What hour should the script run? (00-23)" +#read CRON_HOUR +#/bin/echo "What minute in that hour should the script run? (00-59)" +#read CRON_MINUTE -/bin/echo "Adding /usr/local/sbin/plexreport to crontab" -/usr/bin/crontab -l > mycron -/bin/echo "$CRON_MINUTE $CRON_HOUR * * $CRON_DAY /usr/local/sbin/plexreport" >> mycron -/usr/bin/crontab mycron -/bin/rm mycron +#/bin/echo "Adding /usr/local/sbin/plexreport to crontab" +#/usr/bin/crontab -l > mycron +#/bin/echo "$CRON_MINUTE $CRON_HOUR * * $CRON_DAY /usr/local/sbin/plexreport" >> mycron +#/usr/bin/crontab mycron +#/bin/rm mycron -/bin/echo "Setup complete!" +#/bin/echo "Setup complete!" From d96869ff3f35ac56d82b029da82742a47effc1cf Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 16:43:05 -0700 Subject: [PATCH 03/78] Create Dockerfile --- Dockerfile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cc7cb6c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,41 @@ +FROM phusion/baseimage:0.9.15 + +# Set correct environment variables +ENV HOME /root +ENV DEBIAN_FRONTEND noninteractive +ENV LC_ALL C.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 + +# Use baseimage-docker's init system +CMD ["/sbin/my_init"] + +# Configure user nobody to match unRAID's settings + RUN \ + usermod -u 99 nobody && \ + usermod -g 100 nobody && \ + usermod -d /home nobody && \ + chown -R nobody:users /home + +# Disable SSH +RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh + +RUN \ + add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ + add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ + apt-get update -q && \ + apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ + apt-get clean -y && \ + rm -rf /var/lib/apt/lists/* && \ + git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport && \ + cd /opt/plexReport/ && \ + gem install bundle && \ + bundle install && \ + + #Adding Custom files + COPY initial_setup.sh /etc/my_init.d/ + RUN chmod -v +x /etc/my_init.d/*.sh + ln -s /config/config.yaml /etc/plexReport/config.yaml && \ ln -s /config/email_body.erb /etc/plexReport/email_body.erb + +#Mappings and ports +VOLUME ["/config"] From b104e435575e06c50d03f3dad69997baa730ec19 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:04:45 -0700 Subject: [PATCH 04/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc7cb6c..c9fe1bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN \ bundle install && \ #Adding Custom files - COPY initial_setup.sh /etc/my_init.d/ + COPY /opt/plexReport/initial_setup.sh /etc/my_init.d/ RUN chmod -v +x /etc/my_init.d/*.sh ln -s /config/config.yaml /etc/plexReport/config.yaml && \ ln -s /config/email_body.erb /etc/plexReport/email_body.erb From 4468f57b08c811f0290e85db36f83537c647ace3 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:15:24 -0700 Subject: [PATCH 05/78] Update Dockerfile --- Dockerfile | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9fe1bd..a9fefe6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,22 +20,21 @@ CMD ["/sbin/my_init"] # Disable SSH RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh -RUN \ - add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ - add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ - apt-get update -q && \ - apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* && \ - git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport && \ - cd /opt/plexReport/ && \ - gem install bundle && \ - bundle install && \ +RUN add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" +RUN add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" +RUN apt-get update -q +RUN apt-get install -qy ruby ruby-dev git make gcc inotify-tools +RUN apt-get clean -y +RUN rm -rf /var/lib/apt/lists/* +RUN git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport +RUN cd /opt/plexReport/ +RUN gem install bundle +RUN bundle install - #Adding Custom files - COPY /opt/plexReport/initial_setup.sh /etc/my_init.d/ - RUN chmod -v +x /etc/my_init.d/*.sh - ln -s /config/config.yaml /etc/plexReport/config.yaml && \ ln -s /config/email_body.erb /etc/plexReport/email_body.erb +#Adding Custom files +COPY /opt/plexReport/initial_setup.sh /etc/my_init.d/ +RUN chmod -v +x /etc/my_init.d/*.sh +ln -s /config/config.yaml /etc/plexReport/config.yaml && \ ln -s /config/email_body.erb /etc/plexReport/email_body.erb #Mappings and ports VOLUME ["/config"] From 6ab427bdb69019276de1ff123b19f496eae33493 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:25:52 -0700 Subject: [PATCH 06/78] Update Dockerfile --- Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9fefe6..eeb73b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,16 +20,18 @@ CMD ["/sbin/my_init"] # Disable SSH RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh -RUN add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" -RUN add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" -RUN apt-get update -q -RUN apt-get install -qy ruby ruby-dev git make gcc inotify-tools -RUN apt-get clean -y -RUN rm -rf /var/lib/apt/lists/* -RUN git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport -RUN cd /opt/plexReport/ -RUN gem install bundle -RUN bundle install +RUN \ +add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ +add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ +apt-get update -q && \ +apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ +apt-get clean -y && \ +rm -rf /var/lib/apt/lists/* && \ +git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport && \ +cd /opt/plexReport/ && \ +gem install bundle && \ + +RUN bundle update #Adding Custom files COPY /opt/plexReport/initial_setup.sh /etc/my_init.d/ From 287c40d194f621d77662feaed7d96d6267e744ec Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:30:24 -0700 Subject: [PATCH 07/78] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eeb73b2..e4e095b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,9 +29,9 @@ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport && \ cd /opt/plexReport/ && \ -gem install bundle && \ +gem install bundle -RUN bundle update +# RUN bundle update #Adding Custom files COPY /opt/plexReport/initial_setup.sh /etc/my_init.d/ From 19c55365e69de287eebf901847862d1da82f6c1c Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:43:05 -0700 Subject: [PATCH 08/78] Create initial_setup.sh --- scripts/initial_setup.sh | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 scripts/initial_setup.sh diff --git a/scripts/initial_setup.sh b/scripts/initial_setup.sh new file mode 100644 index 0000000..22e288e --- /dev/null +++ b/scripts/initial_setup.sh @@ -0,0 +1,46 @@ +#!/bin/bash +# Bash script that copies plexreport files to various directories +# and walks the user through the initial setup +# + +PLEX_REPORT_LIB='/var/lib/plexReport' +PLEX_REPORT_CONF='/etc/plexReport' + +#/bin/echo "Creating plexreport library at /var/lib/plexReport" +/bin/mkdir -p $PLEX_REPORT_LIB +#/bin/echo "Creating plexreport conf directory at /etc/plexReport" +/bin/mkdir -p $PLEX_REPORT_CONF + +#/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" +/bin/cp -r bin/* /usr/local/sbin +#/bin/echo "Moving plexreport libraries to /var/lib/plexreport" +/bin/cp -r lib/* $PLEX_REPORT_LIB +#/bin/echo "Moving email_body.erb to /etc/plexreport" +/bin/cp -r etc/* $PLEX_REPORT_CONF + +#/bin/echo "Creating /etc/plexreport/config.yaml" +/usr/bin/touch /etc/plexReport/config.yaml +#/bin/echo "Creating /var/log/plexReport.log" +/usr/bin/touch /var/log/plexReport.log + +#/bin/echo "Installing ruby gem dependency" +/usr/bin/gem install bundler +/usr/local/bin/bundle install + +#/bin/echo "Running /usr/local/sbin/plexreport-setup" +#/usr/local/sbin/plexreport-setup + +#/bin/echo "What day do you want to run the script on? (Put 0 for Sunday, 1 for Monday, etc...)" +#read CRON_DAY +#/bin/echo "What hour should the script run? (00-23)" +#read CRON_HOUR +#/bin/echo "What minute in that hour should the script run? (00-59)" +#read CRON_MINUTE + +#/bin/echo "Adding /usr/local/sbin/plexreport to crontab" +#/usr/bin/crontab -l > mycron +#/bin/echo "$CRON_MINUTE $CRON_HOUR * * $CRON_DAY /usr/local/sbin/plexreport" >> mycron +#/usr/bin/crontab mycron +#/bin/rm mycron + +#/bin/echo "Setup complete!" From 763caba3b97af19b24d4e6e2032d9d48911e0add Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:45:22 -0700 Subject: [PATCH 09/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e4e095b..a72b6a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ gem install bundle # RUN bundle update #Adding Custom files -COPY /opt/plexReport/initial_setup.sh /etc/my_init.d/ +COPY scripts/ /etc/my_init.d/ RUN chmod -v +x /etc/my_init.d/*.sh ln -s /config/config.yaml /etc/plexReport/config.yaml && \ ln -s /config/email_body.erb /etc/plexReport/email_body.erb From 594037c4b9d8195e58d5a743b1c6b75f73633d7e Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:48:37 -0700 Subject: [PATCH 10/78] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a72b6a2..841cca7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,8 @@ gem install bundle #Adding Custom files COPY scripts/ /etc/my_init.d/ RUN chmod -v +x /etc/my_init.d/*.sh -ln -s /config/config.yaml /etc/plexReport/config.yaml && \ ln -s /config/email_body.erb /etc/plexReport/email_body.erb +RUN ln -s /config/config.yaml /etc/plexReport/config.yaml && \ +ln -s /config/email_body.erb /etc/plexReport/email_body.erb #Mappings and ports VOLUME ["/config"] From 35ebdbdbf9b3d0de04d4fc5c3ee5325b111416bb Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:55:10 -0700 Subject: [PATCH 11/78] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 841cca7..5ec7a90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,8 @@ gem install bundle #Adding Custom files COPY scripts/ /etc/my_init.d/ RUN chmod -v +x /etc/my_init.d/*.sh -RUN ln -s /config/config.yaml /etc/plexReport/config.yaml && \ -ln -s /config/email_body.erb /etc/plexReport/email_body.erb +RUN ln -s /etc/plexReport/config.yaml /config/config.yaml && \ +ln -s /etc/plexReport/email_body.erb /config/email_body.erb #Mappings and ports VOLUME ["/config"] From e06c2d64d295b3f5d78c8c966b1e3f809b6996f4 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 17:59:54 -0700 Subject: [PATCH 12/78] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ec7a90..0683b70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,8 @@ gem install bundle #Adding Custom files COPY scripts/ /etc/my_init.d/ RUN chmod -v +x /etc/my_init.d/*.sh -RUN ln -s /etc/plexReport/config.yaml /config/config.yaml && \ -ln -s /etc/plexReport/email_body.erb /config/email_body.erb +# RUN ln -s /etc/plexReport/config.yaml /config/config.yaml && \ +# ln -s /etc/plexReport/email_body.erb /config/email_body.erb #Mappings and ports VOLUME ["/config"] From 04969a492a38922cd2c6cfd43d44dc29cfa398bb Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:25:02 -0700 Subject: [PATCH 13/78] Update Dockerfile --- Dockerfile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0683b70..a15928d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,14 +24,20 @@ RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ apt-get update -q && \ -apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ +apt-get install -y curl patch gawk g++ gcc make libc6-dev patch libreadline6-dev zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev libncurses5-dev automake libtool bison pkg-config libffi-dev && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ -git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport && \ -cd /opt/plexReport/ && \ -gem install bundle +useradd -ms /bin/bash app -# RUN bundle update +USER app + +RUN \ +gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 && \ +/bin/bash -l -c "curl -L get.rvm.io | bash -s stable --rails" && \ +/bin/bash -l -c "rvm install 2.1" && \ +/bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" && \ +/bin/bash -l -c "gem install bundler --no-ri --no-rdoc" && \ +git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport #Adding Custom files COPY scripts/ /etc/my_init.d/ From f9a51fbb667369c96971db348f8b5a66dd19758d Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:31:00 -0700 Subject: [PATCH 14/78] Update Dockerfile --- Dockerfile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a15928d..69752c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,19 +24,9 @@ RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ apt-get update -q && \ -apt-get install -y curl patch gawk g++ gcc make libc6-dev patch libreadline6-dev zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev libncurses5-dev automake libtool bison pkg-config libffi-dev && \ +apt-get install -y ruby ruby-dev ruby-bundler && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ -useradd -ms /bin/bash app - -USER app - -RUN \ -gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 && \ -/bin/bash -l -c "curl -L get.rvm.io | bash -s stable --rails" && \ -/bin/bash -l -c "rvm install 2.1" && \ -/bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" && \ -/bin/bash -l -c "gem install bundler --no-ri --no-rdoc" && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport #Adding Custom files From 2fbeeba145b2a0ed7b580fefa3f6688f5d84eb6f Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:34:24 -0700 Subject: [PATCH 15/78] Update initial_setup.sh --- initial_setup.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/initial_setup.sh b/initial_setup.sh index 22e288e..6efe468 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -6,29 +6,29 @@ PLEX_REPORT_LIB='/var/lib/plexReport' PLEX_REPORT_CONF='/etc/plexReport' -#/bin/echo "Creating plexreport library at /var/lib/plexReport" +/bin/echo "Creating plexreport library at /var/lib/plexReport" /bin/mkdir -p $PLEX_REPORT_LIB -#/bin/echo "Creating plexreport conf directory at /etc/plexReport" +/bin/echo "Creating plexreport conf directory at /etc/plexReport" /bin/mkdir -p $PLEX_REPORT_CONF -#/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" +/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" /bin/cp -r bin/* /usr/local/sbin -#/bin/echo "Moving plexreport libraries to /var/lib/plexreport" +/bin/echo "Moving plexreport libraries to /var/lib/plexreport" /bin/cp -r lib/* $PLEX_REPORT_LIB -#/bin/echo "Moving email_body.erb to /etc/plexreport" +/bin/echo "Moving email_body.erb to /etc/plexreport" /bin/cp -r etc/* $PLEX_REPORT_CONF -#/bin/echo "Creating /etc/plexreport/config.yaml" +/bin/echo "Creating /etc/plexreport/config.yaml" /usr/bin/touch /etc/plexReport/config.yaml -#/bin/echo "Creating /var/log/plexReport.log" +/bin/echo "Creating /var/log/plexReport.log" /usr/bin/touch /var/log/plexReport.log -#/bin/echo "Installing ruby gem dependency" +/bin/echo "Installing ruby gem dependency" /usr/bin/gem install bundler /usr/local/bin/bundle install -#/bin/echo "Running /usr/local/sbin/plexreport-setup" -#/usr/local/sbin/plexreport-setup +/bin/echo "Running /usr/local/sbin/plexreport-setup" +/usr/local/sbin/plexreport-setup #/bin/echo "What day do you want to run the script on? (Put 0 for Sunday, 1 for Monday, etc...)" #read CRON_DAY @@ -43,4 +43,4 @@ PLEX_REPORT_CONF='/etc/plexReport' #/usr/bin/crontab mycron #/bin/rm mycron -#/bin/echo "Setup complete!" +/bin/echo "Setup complete! Please create a cronjob from withinunraid to call the plexReport" From 15ae36349798bb56d7e53560d42f1138afa42791 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:37:08 -0700 Subject: [PATCH 16/78] Update Dockerfile --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69752c5..fa240ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,16 +24,10 @@ RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ apt-get update -q && \ -apt-get install -y ruby ruby-dev ruby-bundler && \ +apt-get install -qy ruby ruby-dev ruby-bundler && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport - -#Adding Custom files -COPY scripts/ /etc/my_init.d/ -RUN chmod -v +x /etc/my_init.d/*.sh -# RUN ln -s /etc/plexReport/config.yaml /config/config.yaml && \ -# ln -s /etc/plexReport/email_body.erb /config/email_body.erb #Mappings and ports VOLUME ["/config"] From e76eab8afcd763eab493b207a2d8496660ed2571 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:37:49 -0700 Subject: [PATCH 17/78] Delete initial_setup.sh --- scripts/initial_setup.sh | 46 ---------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 scripts/initial_setup.sh diff --git a/scripts/initial_setup.sh b/scripts/initial_setup.sh deleted file mode 100644 index 22e288e..0000000 --- a/scripts/initial_setup.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Bash script that copies plexreport files to various directories -# and walks the user through the initial setup -# - -PLEX_REPORT_LIB='/var/lib/plexReport' -PLEX_REPORT_CONF='/etc/plexReport' - -#/bin/echo "Creating plexreport library at /var/lib/plexReport" -/bin/mkdir -p $PLEX_REPORT_LIB -#/bin/echo "Creating plexreport conf directory at /etc/plexReport" -/bin/mkdir -p $PLEX_REPORT_CONF - -#/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" -/bin/cp -r bin/* /usr/local/sbin -#/bin/echo "Moving plexreport libraries to /var/lib/plexreport" -/bin/cp -r lib/* $PLEX_REPORT_LIB -#/bin/echo "Moving email_body.erb to /etc/plexreport" -/bin/cp -r etc/* $PLEX_REPORT_CONF - -#/bin/echo "Creating /etc/plexreport/config.yaml" -/usr/bin/touch /etc/plexReport/config.yaml -#/bin/echo "Creating /var/log/plexReport.log" -/usr/bin/touch /var/log/plexReport.log - -#/bin/echo "Installing ruby gem dependency" -/usr/bin/gem install bundler -/usr/local/bin/bundle install - -#/bin/echo "Running /usr/local/sbin/plexreport-setup" -#/usr/local/sbin/plexreport-setup - -#/bin/echo "What day do you want to run the script on? (Put 0 for Sunday, 1 for Monday, etc...)" -#read CRON_DAY -#/bin/echo "What hour should the script run? (00-23)" -#read CRON_HOUR -#/bin/echo "What minute in that hour should the script run? (00-59)" -#read CRON_MINUTE - -#/bin/echo "Adding /usr/local/sbin/plexreport to crontab" -#/usr/bin/crontab -l > mycron -#/bin/echo "$CRON_MINUTE $CRON_HOUR * * $CRON_DAY /usr/local/sbin/plexreport" >> mycron -#/usr/bin/crontab mycron -#/bin/rm mycron - -#/bin/echo "Setup complete!" From 968aed5de40e5fb06a83cbd0e61e98ec68fd8363 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:38:34 -0700 Subject: [PATCH 18/78] Update initial_setup.sh --- initial_setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/initial_setup.sh b/initial_setup.sh index 6efe468..7756785 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -27,6 +27,9 @@ PLEX_REPORT_CONF='/etc/plexReport' /usr/bin/gem install bundler /usr/local/bin/bundle install +ln -s /etc/plexReport/config.yaml /config/config.yaml +ln -s /etc/plexReport/email_body.erb /config/email_body.erb + /bin/echo "Running /usr/local/sbin/plexreport-setup" /usr/local/sbin/plexreport-setup From 99b6df17ca8c21df58c1dd7a9f9bbf11c0021263 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:41:51 -0700 Subject: [PATCH 19/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa240ab..641e8aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ apt-get update -q && \ -apt-get install -qy ruby ruby-dev ruby-bundler && \ +apt-get install -qy ruby ruby-dev && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport From e3b16acf5f7fda0a47d8e00b12194c64be29ace7 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 18:46:52 -0700 Subject: [PATCH 20/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 641e8aa..b1c35f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ apt-get update -q && \ -apt-get install -qy ruby ruby-dev && \ +apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport From c8150121cb6c2f6b45bf57ae760c5b89a329e6bd Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 21:16:32 -0700 Subject: [PATCH 21/78] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1c35f3..dc3b85d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM phusion/baseimage:0.9.15 +MAINTAINER: ninthwalker@gmail.com # Set correct environment variables ENV HOME /root @@ -30,4 +31,4 @@ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport #Mappings and ports -VOLUME ["/config"] +VOLUME /config From 56a36f35c17d29a355b0a4cc20385556d25929ee Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 21:28:43 -0700 Subject: [PATCH 22/78] Update initial_setup.sh --- initial_setup.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/initial_setup.sh b/initial_setup.sh index 7756785..65c08ab 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -27,9 +27,6 @@ PLEX_REPORT_CONF='/etc/plexReport' /usr/bin/gem install bundler /usr/local/bin/bundle install -ln -s /etc/plexReport/config.yaml /config/config.yaml -ln -s /etc/plexReport/email_body.erb /config/email_body.erb - /bin/echo "Running /usr/local/sbin/plexreport-setup" /usr/local/sbin/plexreport-setup @@ -46,4 +43,4 @@ ln -s /etc/plexReport/email_body.erb /config/email_body.erb #/usr/bin/crontab mycron #/bin/rm mycron -/bin/echo "Setup complete! Please create a cronjob from withinunraid to call the plexReport" +/bin/echo "Setup complete! Please create a cronjob from within unraid to call the plexReport on a schedule." From bb4556a45527632007c51cc17ecb003d66356a00 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 21:46:54 -0700 Subject: [PATCH 23/78] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index dc3b85d..c1be340 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,9 @@ apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport +ln -s /config/config.yaml /opt/plexReport/etc/config.yaml && \ +ln -s /opt/plexReport/plexReport.log /config/plexReport.log && \ +ln -s /config/email_body.erb /opt/plexReport/etc/email_body.erb #Mappings and ports VOLUME /config From 2654e2d072d2ab2606bc597957fff7a53c2945ef Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 21:50:42 -0700 Subject: [PATCH 24/78] Create firstrun.sh --- firstrun.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 firstrun.sh diff --git a/firstrun.sh b/firstrun.sh new file mode 100644 index 0000000..5094b6d --- /dev/null +++ b/firstrun.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Check if config exists. If not, copy in the sample config +if [ -f /config/config.yaml ]; then + echo "Using existing config file." +else + echo "Creating config from template." + mv /opt/plexReport/etc/config.yaml.example /config/config.yaml + chown nobody:users /config/config.yaml +fi + +# Check if email_body.erb exists. If not, copy the original +if [ -f /config/email_body.erb ]; then + echo "Using existing email_body file." +else + echo "Creating email_body from template." + cp /opt/plexReport/etc/email_body.erb /config/email_body.erb + chown nobody:users /config/email_body.erb +fi From e92cd6ef399f560d0285146114b466af6f2c3aa0 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 21:52:03 -0700 Subject: [PATCH 25/78] Update Dockerfile --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index c1be340..dd3d90c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,3 +35,8 @@ ln -s /config/email_body.erb /opt/plexReport/etc/email_body.erb #Mappings and ports VOLUME /config + + +# Add firstrun.sh to execute during container startup +ADD firstrun.sh /etc/my_init.d/firstrun.sh +RUN chmod +x /etc/my_init.d/firstrun.sh From 4500793c7cf84d4f74d2ef95a9143cc70d23f6eb Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 21:53:13 -0700 Subject: [PATCH 26/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd3d90c..009598a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM phusion/baseimage:0.9.15 -MAINTAINER: ninthwalker@gmail.com +MAINTAINER ninthwalker # Set correct environment variables ENV HOME /root From f750f73fdf8d998716937284580daec4357629d7 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 22:03:47 -0700 Subject: [PATCH 27/78] Update Dockerfile --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 009598a..69e64f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,9 +29,6 @@ apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport -ln -s /config/config.yaml /opt/plexReport/etc/config.yaml && \ -ln -s /opt/plexReport/plexReport.log /config/plexReport.log && \ -ln -s /config/email_body.erb /opt/plexReport/etc/email_body.erb #Mappings and ports VOLUME /config From 641b6a0bff4f3e9080c6429147aae7a8992688d1 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 22:12:51 -0700 Subject: [PATCH 28/78] Update firstrun.sh --- firstrun.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/firstrun.sh b/firstrun.sh index 5094b6d..50069ec 100644 --- a/firstrun.sh +++ b/firstrun.sh @@ -1,19 +1,26 @@ #!/bin/bash +# link log +ln -s /opt/plexReport/plexReport.log /config/plexReport.log # Check if config exists. If not, copy in the sample config if [ -f /config/config.yaml ]; then echo "Using existing config file." + ln -s /config/config.yaml /etc/plexReport/config.yaml else echo "Creating config from template." mv /opt/plexReport/etc/config.yaml.example /config/config.yaml chown nobody:users /config/config.yaml + ln -s /config/config.yaml /etc/plexReport/config.yaml fi # Check if email_body.erb exists. If not, copy the original if [ -f /config/email_body.erb ]; then echo "Using existing email_body file." + ln -s /config/email_body.erb /etc/plexReport/email_body.erb else echo "Creating email_body from template." cp /opt/plexReport/etc/email_body.erb /config/email_body.erb chown nobody:users /config/email_body.erb + ln -s /config/email_body.erb /etc/plexReport/email_body.erb fi + From b49b28cd90bfe5be7a219a22e0136b130f7d961e Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 22:50:46 -0700 Subject: [PATCH 29/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 69e64f6..fde1acf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport #Mappings and ports -VOLUME /config +VOLUME /etc/plexReport # Add firstrun.sh to execute during container startup From 0d3b10a702eea6119b811a8d12c1e900a2b9b4e0 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 22:52:01 -0700 Subject: [PATCH 30/78] Delete firstrun.sh --- firstrun.sh | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 firstrun.sh diff --git a/firstrun.sh b/firstrun.sh deleted file mode 100644 index 50069ec..0000000 --- a/firstrun.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# link log -ln -s /opt/plexReport/plexReport.log /config/plexReport.log -# Check if config exists. If not, copy in the sample config -if [ -f /config/config.yaml ]; then - echo "Using existing config file." - ln -s /config/config.yaml /etc/plexReport/config.yaml -else - echo "Creating config from template." - mv /opt/plexReport/etc/config.yaml.example /config/config.yaml - chown nobody:users /config/config.yaml - ln -s /config/config.yaml /etc/plexReport/config.yaml -fi - -# Check if email_body.erb exists. If not, copy the original -if [ -f /config/email_body.erb ]; then - echo "Using existing email_body file." - ln -s /config/email_body.erb /etc/plexReport/email_body.erb -else - echo "Creating email_body from template." - cp /opt/plexReport/etc/email_body.erb /config/email_body.erb - chown nobody:users /config/email_body.erb - ln -s /config/email_body.erb /etc/plexReport/email_body.erb -fi - From 681b08125004f58f44789bc29d022b038918b566 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 22:52:34 -0700 Subject: [PATCH 31/78] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fde1acf..f2366e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,5 +35,5 @@ VOLUME /etc/plexReport # Add firstrun.sh to execute during container startup -ADD firstrun.sh /etc/my_init.d/firstrun.sh -RUN chmod +x /etc/my_init.d/firstrun.sh +# ADD firstrun.sh /etc/my_init.d/firstrun.sh +# RUN chmod +x /etc/my_init.d/firstrun.sh From 719bbcd4fe835c5eff117d0540cf5e52d77f7c6c Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 23:16:48 -0700 Subject: [PATCH 32/78] Update Dockerfile --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2366e3..45e3ab1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,9 +31,4 @@ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport #Mappings and ports -VOLUME /etc/plexReport - - -# Add firstrun.sh to execute during container startup -# ADD firstrun.sh /etc/my_init.d/firstrun.sh -# RUN chmod +x /etc/my_init.d/firstrun.sh +VOLUME /config From cab18d0dddb916d6cc3a98fc6c4ecc734f7c02e8 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 23:33:11 -0700 Subject: [PATCH 33/78] Update initial_setup.sh --- initial_setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/initial_setup.sh b/initial_setup.sh index 65c08ab..036ad02 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -23,6 +23,9 @@ PLEX_REPORT_CONF='/etc/plexReport' /bin/echo "Creating /var/log/plexReport.log" /usr/bin/touch /var/log/plexReport.log +ln -s /etc/plexReport/config.yaml /config/config.yaml +ln -s /etc/plexReport/email_body.erb /config/email_body.erb + /bin/echo "Installing ruby gem dependency" /usr/bin/gem install bundler /usr/local/bin/bundle install From 98f3524a999f42fda714dbb95084ea3c6c15947a Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 19 Apr 2016 23:33:38 -0700 Subject: [PATCH 34/78] Update Dockerfile --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45e3ab1..a7914d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,3 @@ apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport - -#Mappings and ports -VOLUME /config From 91d043cd41ef1865405d09600519849c777e0f0c Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 00:17:31 -0700 Subject: [PATCH 35/78] Create firstrun.sh --- firstrun.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 firstrun.sh diff --git a/firstrun.sh b/firstrun.sh new file mode 100644 index 0000000..201f6cb --- /dev/null +++ b/firstrun.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Check if config exists. If not, copy in the sample config +if [ -f /config/config.yaml ]; then + echo "Using existing config file." + ln -s /config/config.yaml /etc/plexReport/config.yaml +else + echo "Creating config from template." + mv /opt/plexReport/etc/config.yaml.example /config/config.yaml + chown nobody:users /config/config.yaml + ln -s /config/config.yaml /etc/plexReport/config.yaml +fi + +# Check if email_body.erb exists. If not, copy the original +if [ -f /config/email_body.erb ]; then + echo "Using existing email_body file." + ln -s /config/email_body.erb /etc/plexReport/email_body.erb +else + echo "Creating email_body from template." + cp /opt/plexReport/etc/email_body.erb /config/email_body.erb + chown nobody:users /config/email_body.erb + ln -s /config/email_body.erb /etc/plexReport/email_body.erb +fi From 8fe549d191850b1f591b7068e1ab59d693c75eae Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 00:19:15 -0700 Subject: [PATCH 36/78] Update Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index a7914d4..2dc6297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,3 +29,7 @@ apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport + +# Add firstrun.sh to execute during container startup +ADD firstrun.sh /etc/my_init.d/firstrun.sh +RUN chmod +x /etc/my_init.d/firstrun.sh From 55ed0ebc7edee6369ade0e1ce3a7a1432bd18c9f Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 00:37:03 -0700 Subject: [PATCH 37/78] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2dc6297..3dbed12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,5 +31,5 @@ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport # Add firstrun.sh to execute during container startup -ADD firstrun.sh /etc/my_init.d/firstrun.sh -RUN chmod +x /etc/my_init.d/firstrun.sh +# ADD firstrun.sh /etc/my_init.d/firstrun.sh +# RUN chmod +x /etc/my_init.d/firstrun.sh From 293df9c1a61011b3c8ca784e474a3f31288f571e Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 00:39:07 -0700 Subject: [PATCH 38/78] Update initial_setup.sh --- initial_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initial_setup.sh b/initial_setup.sh index 036ad02..6e23aae 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -23,8 +23,8 @@ PLEX_REPORT_CONF='/etc/plexReport' /bin/echo "Creating /var/log/plexReport.log" /usr/bin/touch /var/log/plexReport.log -ln -s /etc/plexReport/config.yaml /config/config.yaml -ln -s /etc/plexReport/email_body.erb /config/email_body.erb +ln -s /config/config.yaml /etc/plexReport/config.yaml +ln -s /config/email_body.erb /etc/plexReport/email_body.erb /bin/echo "Installing ruby gem dependency" /usr/bin/gem install bundler From 66999c39343f2c2a005629135198cae9ae83f4e6 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 01:11:28 -0700 Subject: [PATCH 39/78] Update initial_setup.sh --- initial_setup.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/initial_setup.sh b/initial_setup.sh index 6e23aae..8a46f19 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -5,6 +5,7 @@ PLEX_REPORT_LIB='/var/lib/plexReport' PLEX_REPORT_CONF='/etc/plexReport' +PLEX_REPORT_EDIT='/config' /bin/echo "Creating plexreport library at /var/lib/plexReport" /bin/mkdir -p $PLEX_REPORT_LIB @@ -15,17 +16,15 @@ PLEX_REPORT_CONF='/etc/plexReport' /bin/cp -r bin/* /usr/local/sbin /bin/echo "Moving plexreport libraries to /var/lib/plexreport" /bin/cp -r lib/* $PLEX_REPORT_LIB -/bin/echo "Moving email_body.erb to /etc/plexreport" +/bin/echo "Moving email_body.erb to /etc/plexreport & /config" /bin/cp -r etc/* $PLEX_REPORT_CONF +/bin/cp -r etc/* $PLEX_REPORT_EDIT /bin/echo "Creating /etc/plexreport/config.yaml" /usr/bin/touch /etc/plexReport/config.yaml /bin/echo "Creating /var/log/plexReport.log" /usr/bin/touch /var/log/plexReport.log -ln -s /config/config.yaml /etc/plexReport/config.yaml -ln -s /config/email_body.erb /etc/plexReport/email_body.erb - /bin/echo "Installing ruby gem dependency" /usr/bin/gem install bundler /usr/local/bin/bundle install From f85a0ec15197200248f5a933095f204f5a076e69 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 01:15:33 -0700 Subject: [PATCH 40/78] Update plexreport --- bin/plexreport | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/plexreport b/bin/plexreport index 6aae5da..ab4abfe 100755 --- a/bin/plexreport +++ b/bin/plexreport @@ -62,13 +62,13 @@ class PlexReport def initialize begin - $config = YAML.load_file('/etc/plexReport/config.yaml') + $config = YAML.load_file('/config/config.yaml') rescue Errno::ENOENT => e abort('Configuration file not found. Exiting...') end begin - $logger = Logger.new('/var/log/plexReport.log') + $logger = Logger.new('/config/plexReport.log') if $options[:verbose] $logger.level = Logger::DEBUG @@ -369,8 +369,8 @@ def main new_seasons = new_episodes[:seasons] new_episodes = new_episodes[:new] - YAML.load_file('/etc/plexReport/config.yaml') - template = ERB.new File.new("/etc/plexReport/email_body.erb").read, nil, "%" + YAML.load_file('/config/config.yaml') + template = ERB.new File.new("/config/email_body.erb").read, nil, "%" mail = MailReport.new($config, $options) if (movies.empty? && new_seasons.empty? && new_episodes.empty?) From a4a208d870df4531add97166d72608cae975210f Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 01:18:17 -0700 Subject: [PATCH 41/78] Update initial_setup.sh --- initial_setup.sh | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/initial_setup.sh b/initial_setup.sh index 8a46f19..24916b1 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -4,26 +4,22 @@ # PLEX_REPORT_LIB='/var/lib/plexReport' -PLEX_REPORT_CONF='/etc/plexReport' -PLEX_REPORT_EDIT='/config' +PLEX_REPORT_CONF='/config' /bin/echo "Creating plexreport library at /var/lib/plexReport" /bin/mkdir -p $PLEX_REPORT_LIB -/bin/echo "Creating plexreport conf directory at /etc/plexReport" -/bin/mkdir -p $PLEX_REPORT_CONF /bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" /bin/cp -r bin/* /usr/local/sbin /bin/echo "Moving plexreport libraries to /var/lib/plexreport" /bin/cp -r lib/* $PLEX_REPORT_LIB -/bin/echo "Moving email_body.erb to /etc/plexreport & /config" +/bin/echo "Moving email_body.erb to /config" /bin/cp -r etc/* $PLEX_REPORT_CONF -/bin/cp -r etc/* $PLEX_REPORT_EDIT -/bin/echo "Creating /etc/plexreport/config.yaml" -/usr/bin/touch /etc/plexReport/config.yaml -/bin/echo "Creating /var/log/plexReport.log" -/usr/bin/touch /var/log/plexReport.log +/bin/echo "Creating /config/config.yaml" +/usr/bin/touch /configt/config.yaml +/bin/echo "Creating /config/plexReport.log" +/usr/bin/touch /config/plexReport.log /bin/echo "Installing ruby gem dependency" /usr/bin/gem install bundler @@ -32,17 +28,4 @@ PLEX_REPORT_EDIT='/config' /bin/echo "Running /usr/local/sbin/plexreport-setup" /usr/local/sbin/plexreport-setup -#/bin/echo "What day do you want to run the script on? (Put 0 for Sunday, 1 for Monday, etc...)" -#read CRON_DAY -#/bin/echo "What hour should the script run? (00-23)" -#read CRON_HOUR -#/bin/echo "What minute in that hour should the script run? (00-59)" -#read CRON_MINUTE - -#/bin/echo "Adding /usr/local/sbin/plexreport to crontab" -#/usr/bin/crontab -l > mycron -#/bin/echo "$CRON_MINUTE $CRON_HOUR * * $CRON_DAY /usr/local/sbin/plexreport" >> mycron -#/usr/bin/crontab mycron -#/bin/rm mycron - -/bin/echo "Setup complete! Please create a cronjob from within unraid to call the plexReport on a schedule." +/bin/echo "Setup complete! Please create a cronjob from within unRAID to call the plexReport on a schedule." From b91c37af43ba2299cf814a89c224116fd55a5963 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 01:39:02 -0700 Subject: [PATCH 42/78] Update initial_setup.sh --- initial_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initial_setup.sh b/initial_setup.sh index 24916b1..5ea1f23 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -17,7 +17,7 @@ PLEX_REPORT_CONF='/config' /bin/cp -r etc/* $PLEX_REPORT_CONF /bin/echo "Creating /config/config.yaml" -/usr/bin/touch /configt/config.yaml +/usr/bin/touch /config/config.yaml /bin/echo "Creating /config/plexReport.log" /usr/bin/touch /config/plexReport.log From db7c34d9d75ee2687d3b91e81e9e1883fbb27237 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 01:42:59 -0700 Subject: [PATCH 43/78] Update plexreport-setup --- bin/plexreport-setup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/plexreport-setup b/bin/plexreport-setup index 814cbdd..90a5470 100755 --- a/bin/plexreport-setup +++ b/bin/plexreport-setup @@ -17,7 +17,7 @@ class Setup def initialize begin $config = Hash.new -# $config = YAML.load_file(File.join(File.expand_path(File.dirname(__FILE__)), '../etc/config.yaml') ) +# $config = YAML.load_file(File.join(File.expand_path(File.dirname(__FILE__)), '/config/config.yaml') ) rescue Errno::ENOENT => e abort('Configuration file not found. Exiting...') end @@ -78,7 +78,7 @@ class Setup end $config['mail']['username'] = ask("Enter your SMTP username/email address (For Gmail, use email address)") { |q| q.echo = true } - $config['mail']['password'] = ask("Enter your email password (This will only be saved in etc/config.yaml)") { |q| q.echo = "*" } + $config['mail']['password'] = ask("Enter your email password (This will only be saved in config.yaml)") { |q| q.echo = "*" } $config['mail']['from'] = ask("Display name of the sender (default: Plex Server)") { |q| q.echo = true } if $config['mail']['from'].empty? @@ -101,8 +101,8 @@ class Setup self.setPlexApiKey self.setEmail - File.open('/etc/plexReport/config.yaml', 'w') {|f| f.write $config.to_yaml } - puts "Writing information to /etc/plexReport/config.yaml" + File.open('/config/config.yaml', 'w') {|f| f.write $config.to_yaml } + puts "Writing information to /config/config.yaml" end end From 69e83fc7fdf17ec68bede5c289c96c79903fd5b8 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 20 Apr 2016 02:13:13 -0700 Subject: [PATCH 44/78] Update initial_setup.sh --- initial_setup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/initial_setup.sh b/initial_setup.sh index 5ea1f23..4374a96 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -3,6 +3,10 @@ # and walks the user through the initial setup # +read -p "This script will delete any plexReport config that you may already have. Are you sure you want to run this? [Y/N] " -n 1 -r +echo # (optional) move to a new line +if [[ $REPLY =~ ^[Yy]$ ]] +then PLEX_REPORT_LIB='/var/lib/plexReport' PLEX_REPORT_CONF='/config' @@ -15,6 +19,7 @@ PLEX_REPORT_CONF='/config' /bin/cp -r lib/* $PLEX_REPORT_LIB /bin/echo "Moving email_body.erb to /config" /bin/cp -r etc/* $PLEX_REPORT_CONF +chmod +666 $PLEX_REPORT_CONF/email_body.erb /bin/echo "Creating /config/config.yaml" /usr/bin/touch /config/config.yaml @@ -29,3 +34,4 @@ PLEX_REPORT_CONF='/config' /usr/local/sbin/plexreport-setup /bin/echo "Setup complete! Please create a cronjob from within unRAID to call the plexReport on a schedule." +fi From dc35a7f88644618341dd2d740e5854a0183a59ff Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Thu, 21 Apr 2016 22:55:11 -0700 Subject: [PATCH 45/78] Update README.md --- README.md | 120 +++++++++++++----------------------------------------- 1 file changed, 29 insertions(+), 91 deletions(-) diff --git a/README.md b/README.md index 551b60f..dd7dee7 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,16 @@ -plexWeeklyReport +plexReport ================ -Scripts to generate a weekly email of new additions to Plex. +A dockerized version of bstascavage's original plexReport (https://github.com/bstascavage/plexReport) ## Introduction -This script is meant to send out a summary of all new Plex entries to your server to all of your server's users. +This docker generates an email summary of new additions to Plex to send to your ursers ## Supported Platforms -* Debian -* Ubuntu 14.04 LTS -* Mac OSX +unRAID ## Supported Email Clients * Gmail -* Mozilla Thunderbird ## Supported Plex Agents * themoviedb @@ -22,105 +19,48 @@ This script is meant to send out a summary of all new Plex entries to your serve ## Prerequisites -The following are needed to run this script: +The following are needed to run this docker: -1. Ruby installed (at least version 1.9.3) and ruby-dev. -2. For OSX: make sure you have Ruby installed using RVM (This is needed to create a wrapper to weekly run the script through crontab) (see http://railsapps.github.io/installrubyonrails-mac.html. Follow the steps from "Prepare your computer" until "Rails installation options"). -3. themoviedb set as your Agent for your Movie section on your Plex server. +1. Plex. +2. themoviedb set as your Agent for your Movie section on your Plex server. 3. thetvdb.org set as your Agent for your TV section on your Plex server. -4. (Optional) A Gmail account to forward the email (Gmail is the only supported provider, so if you use another, YMMV). +4. A Gmail account to forward the email (Gmail is the only supported provider, so if you use another, YMMV). -## Installation (Linux) +## Installation (unRAID) -1. Clone this repo on your server: +Prefered installation method: From the Community Applications 'APPS' section in unRAID. +You can also install by adding the following template repository to unraid: +https://github.com/ninthwalker/docker-templates/ - `git clone https://github.com/bstascavage/plexReport.git` -2. Change to the plexReport directory -3. Run the initial_setup script: +After installing, run the following commands from the command line: - `./initial_setup.sh` +`docker exec -it plexReport bash` +`cd /opt/plexReport` +`./initial_setup.sh` -4. If you want to run your script with different commandline parameters, you'll need to edit the crontab. See here for reference: http://www.adminschoice.com/crontab-quick-reference - -## Installation (OS X) -Part 1: Install plexReport - -1. Clone this repo on your server: - - `git clone https://github.com/bstascavage/plexReport.git` -2. Change to the plexReport directory -3. Install the blunder gem (http://bundler.io/) +Follow Prompts - `gem install bundler` -4. Install the gem dependecies: +plexReport can be run with the following command from unraid: - `bundle install` -5. Setup the config file in `etc/config.yaml`. See `etc/config.yaml.example` and below for details -6. Run `bin/plexreport` to execute the script -It should work correctly - +`docker exec plexReport plexreport [-options]` -Part 2: Create Ruby Wrapper +You can now edit the `config.yaml` (and optionally `email_body.erb`) with your own settings in your appdata dir. +See `/config/config.yaml.example` and below for details. -Now to have the script run once a week through crontab, you have to create an RVM alias by doing the following steps: -(Note: You need an RVM alias because launchd, cron, and other process schedulers operate in discrete bash shell environments. Simply calling ruby from inside your launchd or cron script will not work; that will invoke the non-RVM ruby that OS X shipped with. Instead, you need an RVM alias, which will run your file through RVM's ruby, from inside launchd.) +To schedule the report to occur regulary setup a cron from within unraid: +Enter the following command in the unRAID shell. Replace the day/time with what you want: -1. Determine your ruby version by entering +`crontab -l | { cat; echo "30 11 * * 5 docker exec plexReport plexreport -n -d"; } | crontab -` - `which ruby` - this should results in: - `/Users/you/.rvm/rubies/ruby-2.2.0/bin/ruby` - ruby-2.2.0 is your ruby version - -2. Create a wrapper by entering +To keep the cronjob after a reboot, also add the line to your \boot\config\go file. - `rvm alias create plexReport ruby-2.2.0@plexReport` - Note: Replace ruby-2.2.0 with the version that you have determined in step 1 - -3. Test the wrapper by entering - - `$rvm_path/wrappers/plexReport/ruby /bin/plexReport.rb -t` - Note: Replace with the path leading to your plexReport directory - - It should run and exit properly (be patient it might take a few minutes). - -4. Next determine the absolute path to your wrapper. Just run - - `echo $rvm_path` - it should result in something like this /users/esw1187/.rvm/ - - Substitute '$rvm_path' in the wrapper call with the absolute rvm path obtaine above and run it again by entering - - `/users/ersw1187/.rvm/wrappers/plexReport/ruby /path_to/plexReport/bin/plexReport.rb` - -5. Create bash script to run the Rub code by doing the following: - - Create a file on your desktop named 'plexReport.sh' and open it with TextEdit +## email_body.erb - - Copy the following two lines in the file - `export LC_ALL=en_US.UTF-8` - `export LANG=en_US.UTF-8` - - - Add the wrapper call you just tested in step 4 to the file that you have just tested. E.g. - `/users/ersw1187/.rvm/wrappers/plexReport/ruby /path_to/plexReport/bin/plexReport` +This can be edited with CSS/HTML if you want to modify the look of the email. -6. Copy plexReport.sh to /user/local/bin directory - -7. Go to the /usr/local/bin directory and set the correct permissions by entering - `chmod u+x plexReport.sh` - -8. Add the following line to your crontab (sudo crontab -e) - - `15 11 * * 5 /usr/local/bin/plexReport.sh` - (This will run it every Friday at 11:15. To change the time, see crontab documentation: - http://www.adminschoice.com/crontab-quick-reference - -## Upgrading - -To upgrade your code, cd to your plexReport directory and run `./update.sh` - ## Config file -By default, the config file is located in `/etc/plexReport/config.yaml`. If you need to change any information for the program, or to add more optional config parameters, see below for the config file format: +By default, the config file is located in `/config/config.yaml`. If you need to change any information for the program, or to add more optional config parameters, see below for the config file format: ###### email `title` - Banner title for the email body. Required. @@ -153,7 +93,7 @@ By default, the config file is located in `/etc/plexReport/config.yaml`. If you ## Command-line Options -Once installed, you can run the script by simply running `plexreport`. If you need to reinstall or reconfigure the program, run `plexreport-setup`. All commandline options can be seen by running `plexReport --help` +Once installed, you can run the script by simply running `plexreport` from within the docker image container. If you need to reinstall or reconfigure the program, run `plexreport-setup`. All commandline options can be seen by running `plexreport --help` ##### Options: `-n, --no-plex-email` - Do not send emails to Plex friends. Can be used with the `recipients_email` and `recipients` config file option to customize email recipients. @@ -169,11 +109,9 @@ Once installed, you can run the script by simply running `plexreport`. If you n New Episodes: ![alt tag](http://i.imgur.com/hWzHl2x.png) - New Seasons: ![alt tag](http://i.imgur.com/sBy62Ty.png) - New Movies: ![alt tag](http://i.imgur.com/E3Q85uU.png) From a0ef143627af1f2710e05044d4d5e9e3707041ce Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Thu, 21 Apr 2016 22:58:28 -0700 Subject: [PATCH 46/78] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dd7dee7..f0c81ce 100644 --- a/README.md +++ b/README.md @@ -53,15 +53,15 @@ Enter the following command in the unRAID shell. Replace the day/time with what `crontab -l | { cat; echo "30 11 * * 5 docker exec plexReport plexreport -n -d"; } | crontab -` To keep the cronjob after a reboot, also add the line to your \boot\config\go file. - -## email_body.erb - -This can be edited with CSS/HTML if you want to modify the look of the email. -## Config file +## Config By default, the config file is located in `/config/config.yaml`. If you need to change any information for the program, or to add more optional config parameters, see below for the config file format: +##### email_body.erb + +This file can be edited with CSS/HTML if you want to modify the look of the email. + ###### email `title` - Banner title for the email body. Required. From 372e7e60b279786939b253bd6c7d490f11bd7679 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Thu, 21 Apr 2016 23:00:01 -0700 Subject: [PATCH 47/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f0c81ce..1c21002 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ To keep the cronjob after a reboot, also add the line to your \boot\config\go fi By default, the config file is located in `/config/config.yaml`. If you need to change any information for the program, or to add more optional config parameters, see below for the config file format: -##### email_body.erb +###### email_body.erb This file can be edited with CSS/HTML if you want to modify the look of the email. From 1aee415c75b0558b817c112d22eb47935a70dd6b Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Thu, 21 Apr 2016 23:01:50 -0700 Subject: [PATCH 48/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c21002..c4eb680 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A dockerized version of bstascavage's original plexReport (https://github.com/bs This docker generates an email summary of new additions to Plex to send to your ursers ## Supported Platforms -unRAID +* unRAID ## Supported Email Clients * Gmail From 98cedcaef0b34dea7308792e07f9bdc1547fb7f6 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Thu, 21 Apr 2016 23:12:36 -0700 Subject: [PATCH 49/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4eb680..2d849d9 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ The following are needed to run this docker: ## Installation (unRAID) -Prefered installation method: From the Community Applications 'APPS' section in unRAID. +Preferred installation method: From the Community Applications 'APPS' section in unRAID. You can also install by adding the following template repository to unraid: https://github.com/ninthwalker/docker-templates/ From 3e65c4288becfaeca49dd9d2ee48d82f4edf67aa Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Thu, 9 Jun 2016 20:59:04 -0700 Subject: [PATCH 50/78] Bug Fixes & Email Layout changes --- README.md | 11 ++++++++++- etc/email_body.erb | 8 ++++---- etc/email_schedule.cron | 2 ++ images/plex.png | Bin 20195 -> 4309 bytes initial_setup.sh | 30 +++++++++++++++++++----------- 5 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 etc/email_schedule.cron diff --git a/README.md b/README.md index 2d849d9..2be78ac 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,16 @@ plexReport can be run with the following command from unraid: You can now edit the `config.yaml` (and optionally `email_body.erb`) with your own settings in your appdata dir. See `/config/config.yaml.example` and below for details. -To schedule the report to occur regulary setup a cron from within unraid: +To schedule the report to occur regulary please use the new cron system for unRAID 6.x: + +Modify the "plexreport_schedule.cron" with the schedule that you would prefer. +This file is located in your docker appdata /config location. + +Then copy the "plexreport_schedule.cron" to /boot/config/plugins/dynamix. +Each time unraid is started it will load your plexreport_schedule. + +Optionally you can setup the cron the old way: + Enter the following command in the unRAID shell. Replace the day/time with what you want: `crontab -l | { cat; echo "30 11 * * 5 docker exec plexReport plexreport -n -d"; } | crontab -` diff --git a/etc/email_body.erb b/etc/email_body.erb index a9ff6a4..a5029b8 100644 --- a/etc/email_body.erb +++ b/etc/email_body.erb @@ -339,7 +339,7 @@ background: #CC0000 !important;
+

@@ -365,7 +365,7 @@ background: #CC0000 !important; <% new_episodes.each do |episode| %>
-

+
-
@@ -389,7 +389,7 @@ background: #CC0000 !important; <% new_seasons.each do |season| %>
+
-
@@ -413,7 +413,7 @@ background: #CC0000 !important; <% movies.each do |movie| %>
+
-
diff --git a/etc/email_schedule.cron b/etc/email_schedule.cron new file mode 100644 index 0000000..ec7b5f4 --- /dev/null +++ b/etc/email_schedule.cron @@ -0,0 +1,2 @@ +# Sends a weekly Plex Report email on Friday's at 10:30hrs +30 10 * * 5 docker exec plexReport plexreport -n -d &> /dev/null \ No newline at end of file diff --git a/images/plex.png b/images/plex.png index 4bc48f73fcf75631b9f843e8e7918b6b1aa9d446..61213e487706af83521a41115954e3d82f505bb7 100644 GIT binary patch literal 4309 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 DEHq?X literal 20195 zcmV(+K;6HIP)X+uL$Nkc;* zP;zf(X>4Tx07wm;mUmQB*%pV-y*Itk5+Wca^cs2zAksTX6$DXM^`x7XQc?|s+0 z08spb1j2M!0f022SQPH-!CVp(%f$Br7!UytSOLJ{W@ZFO_(THK{JlMynW#v{v-a*T zfMmPdEWc1DbJqWVks>!kBnAKqMb$PuekK>?0+ds;#ThdH1j_W4DKdsJG8Ul;qO2n0 z#IJ1jr{*iW$(WZWsE0n`c;fQ!l&-AnmjxZO1uWyz`0VP>&nP`#itsL#`S=Q!g`M=rU9)45( zJ;-|dRq-b5&z?byo>|{)?5r=n76A4nTALlSzLiw~v~31J<>9PP?;rs31pu_(obw)r zY+jPY;tVGXi|p)da{-@gE-UCa`=5eu%D;v=_nFJ?`&K)q7e9d`Nfk3?MdhZarb|T3 z%nS~f&t(1g5dY)AIcd$w!z`Siz!&j_=v7hZlnI21XuE|xfmo0(WD10T)!}~_HYW!e zew}L+XmwuzeT6wtxJd`dZ#@7*BLgIEKY9Xv>st^p3dp{^Xswa2bB{85{^$B13tWnB z;Y>jyQ|9&zk7RNsqAVGs--K+z0uqo1bf5|}fi5rtEMN^BfHQCd-XH*kfJhJnmIE$G z0%<@5vOzxB0181d*a3EfYH$G5fqKvcPJ%XY23!PJzzuK<41h;K3WmW;Fah3yX$XSw z5EY_9s*o0>51B&N5F1(uc|$=^I1~fLLy3?Ol0f;;Ca4%HgQ}rJP(Ab`bQ-z{U4#0d z2hboi2K@njgb|nm(_szR0JebHusa+GN5aeCM0gdP2N%HG;Yzp`J`T6S7vUT504#-H z!jlL<$Or?`Mpy_N@kBz9SR?@vA#0H$qyni$nvf2p8@Y{0k#Xb$28W?xm>3qu8RLgp zjNxKdVb)?wFx8l2m{v>|<~C*!GlBVnrDD~wrdTJeKXwT=5u1%I#8zOBU|X=4u>;s) z>^mF|$G{ol9B_WP7+f-LHLe7=57&&lfa}8z;U@8Tyei%l?}87(bMRt(A-)QK9Dg3) zj~~XrCy)tR1Z#p1A(kK{Y$Q|=8VKhI{e%(1G*N-5Pjn)N5P8I0VkxnX*g?EW941ba z6iJ387g8iCnY4jaNopcpCOsy-A(P2EWJhusSwLP-t|XrzUnLKcKTwn?CKOLf97RIe zPB}`sKzTrUL#0v;sBY9)s+hW+T2H-1eM)^VN0T#`^Oxhvt&^*fYnAJldnHel*Ozyf zUoM{~Um<@={-*r60#U(0!Bc^wuvVc);k3d%g-J!4qLpHZVwz%!VuRu}#Ze`^l7W)9 z5>Kf>>9Eozr6C$Z)1`URxU@~QI@)F0FdauXr2Es8>BaOP=)Lp_WhG@>R;lZ?BJkMlIuMhw8ApiF&yDYW2hFJ?fJhni{?u z85&g@mo&yT8JcdI$(rSw=QPK(Xj%)k1X|@<=e1rim6`6$RAwc!i#egKuI;BS(LSWz zt39n_sIypSqfWEV6J3%nTQ@-4i zi$R;gsG*9XzhRzXqv2yCs*$VFDx+GXJH|L;wsDH_KI2;^u!)^Xl1YupO;gy^-c(?^ z&$Q1BYvyPsG^;hc$D**@Sy`+`)}T4VJji^bd7Jqw3q6Zii=7tT7GEswEK@D(EFW1Z zSp`^awCb?>!`j4}Yh7b~$A)U-W3$et-R8BesV(1jzwLcHnq9En7Q0Tn&-M=XBKs!$ zF$X<|c!#|X_tWYh)GZit z(Q)Cp9CDE^WG;+fcyOWARoj*0TI>4EP1lX*cEoMO-Pk?Z{kZ!p4@(b`M~lalr<3Oz z&kJ6Nm#vN_+kA5{dW4@^Vjg_`q%qU1ULk& z3Fr!>1V#i_2R;ij2@(Z$1jE4r!MlPVFVbHmT+|iPIq0wy5aS{>yK?9ZAjVh%SOwMWgFjair&;wpi!{CU}&@N=Eg#~ zLQ&zpEzVmGY{hI9Z0+4-0xS$$Xe-OToc?Y*V;rTcf_ zb_jRe-RZjXSeas3UfIyD;9afd%<`i0x4T#DzE)vdabOQ=k7SRuGN`h>O0Q~1)u-yD z>VX=Mn&!Rgd$;YK+Q-}1zu#?t(*cbG#Ronf6db&N$oEidtwC+YVcg-Y!_VuY>bk#Y ze_ww@?MU&F&qswvrN_dLb=5o6*Egs)ls3YRlE$&)amR1{;Ppd$6RYV^Go!iq1UMl% z@#4q$AMc(FJlT1QeX8jv{h#)>&{~RGq1N2iiMFIRX?sk2-|2wUogK~{EkB$8eDsX= znVPf8XG_nK&J~=SIiGia@9y}|z3FhX{g&gcj=lwb=lWgyFW&aLedUh- zof`v-2Kw$UzI*>(+&$@i-u=-BsSjR1%z8NeX#HdC`Hh-Z(6xI-`hmHDqv!v)W&&nrf>M(RhcN6(D;jNN*%^u_SYjF;2ng}*8Ow)d6M ztDk;%`@Lsk$;9w$(d(H%O5UixIr`T2ZRcd@Y9rG@BTjq=81vXMAI?P^8c@7@170l)YR;*&(3k|?mIdj7&ITQ z4-Zs3M~{iAI9!ig>8(I%wWEEQYMOCPxJDfa##UM@Fr91vsHqsA?1%{}Hq9pb2=w4j zdegwsctq^)W~bFQM#xIl73BR3&LhS#?*y0wjqU9AXIEQDzLcFkA{|wNOioV5z`#H( zU%os#J88;N34BKh&#rZ@_e~vUpRxn~&0+-G9vK;ly?gh@*w|Qj?=?H$;hLP7n24oI zm&T$+i-38O>~$#GO47EmiBS5vd-v|xzI}Uuhqg?|KA5mBTOJD*E`rc1tZncTtb--Q z4swA!1Ff_QX(fX6`DwqOJ?BkXcauS{8S1Pm?~Q9N1|hm8_Qvi_n*zc}#uzbifUA?M z0eSXJTYI8k!vxc1-9)Y+uzhdDD1PVcOf~Zyd~tcwNhig?q9rhM!CF>lLj>BZHe90p z#nC^yWgvF$gci1Jobwn7l(xP{O3PEUi@n>j=tVPpb};! z&Xg#0q=R0x$2+TepV9$;wljSO3zH%1(&w+Uqcipm?TdfC@n7TPAOCpVeDlq%Do#1& zl$_yZ+(XUq*0*BCin#y&`{U9}FO8=@^{FY5D(tmF@2#i1t2_HKI5-&J{N^{~vdb=u zlR@%*_ubd(Z!Pmc`@*_%<;ra9EpK^CJmnXDAx1}rfhVUikpm26Y8IW{Jzc=u6W!gN zi7Vkz!p}x(!F-(+&6Supkgkr5IaKc4s8=cMLg6$ws-iMDOt+i6$sq`}GY$#7!6_WEn%Rj+dM~yO4ikyGm`KhMZcx8m@JGc%`-rJo2VAM;eUj{F4TR%0u710(j&9)x#bB~CN zF1jcg^;_TiR($3&pNSh87~SgC%n+M59g;~@4|Qjrd1gH3F^`F%p`ra?5w`B`ZU((4 z>rxfl3?g(gi~TzkteNqsf2Oi6t2y`F^Wq6ld{PV#%ODL7(OVjHMyJf&?InYBN0*FI zvQ_V>p_xksMFor)@9ro2NPPCzskr#b5vQ);wq5BEw#o?Y;R7{-Mtk0Zh&Mhl;@ww8 zEbEKdxNq)K#IahkcoED|Ey}akW@6EiUsQJ|;gN%=tX<+Bh zojD78FVWUnTcYu*#Gm&JQI#fE*2?4T2Xee`clBQ1&goiZ82H}a-dqDI2_*7oKJ%IJ z^{;<}nc+VrbF5vvHZ~zf4@Shot5e#zrf^MD>(2y!DudXT1g8@*x;i1`%`yGyXw7m% z!$YjQ_OxJ~-E2xb7(|8^-pz??ZfBE0zp-iy*Si{#^3yelPC!SmvpP<5^3oubp5|R^nv)`2R;y|oql@U zb?2QeS|``EvqFieUhVg#v9|QC>3j}ky;@}eV81fdUDM59(}h5$l&I?>U6to0FZs>5 z^2#gY;)`Dq_uO+&szH{i3^onv zRV_{Je&%I5nVgu6@rm*DYduvenO4i#(VCudOe@A&&&bGVsvhT|hWzgD{%*Ya&2LU7 zQRh6ItM%&Fu=Usb>I;kEbS;D)uJ#8oUHF>DD@-%|mcFuon>FA5DGz*13r7%^>x7QN zFY(q-Mce~rcPuJPkEA9kYAzQf{Q6@fZrvWSW-)agW-PQ&E?A5x!~NOi zABt6|;KM`1ExJ-A%(Vq$?zoG_7N!&Dg)X{~%6pKGfA;qOnsuFo_A=X0l?;-z4_R6a z(o~#8+k{0@`~B>&L~We;CSZ~rK*18Awkv@L1GT(dYzOL9e$F_+rmF}%P@Tsr&i3uUSH(+htHP*XkmKyy#?Vd11I5)k zj^20bEp$=p(x?)#38Fq@S;Y4@Mtu6mKnH_#A_)p6OU}9cDv>6KBNn4-{W};$hY}IJ zGp6klUw@^ub&UUpyY7fL{QFn4?s!xhIVKzWOFEoA2|E!sc&>P@(0=g?SHvej`@iF? zv(AdU?z*eBtf=iJC}j}J03>0x6EuTT2O-m%`x+LYcIK$@vwhpBaWYU1OBk(i8xb34 z8O7l+RvuNdSHALsIug>(^k@h}Rcxt`gx3^!zmYwgQ*7lCZuWbs)g!sf4 zkYp0VwJ+_y;e*|0KbrKKZ~i_YwAE4iCtMZUrpMf(nZ|})XjiC2mwqDRdaczTyoYgG35CL#LJDF#k^)=Gt_S4jVt%l%+Ow@J#1bF#JKE0(~0&xC5$zVe50eIxmf+J-}<w}?S6azGv1kx{9ZcK+nupBtv!DJVcMAWx8Lm1 zhAP+Poee1OxeDV55~PE*$&?hO;F-%sUb9V6Sr?1+-_!^N)7=g8EkccJYmNl+B60=> zF@51Kd)ptz8E2jq`*!aFC+zmKhOM}3r^EKJc$$RHI^l39-M?m0u3Now5%<%UtBh=Z zl0ig_PG91&(s8f0Ms2(fR0YHt&%6_gur^7MKxKS8&|1d4mx&4^%?7@7pfFpjEjtBx zB61k3k2~cTzvAMAci-N9$uxP>VDmtA)VS$78-~t4W$6?5(-41!ZMNSoRcczr|CG$) zb%;9b7|HuxIppHZ#Plix^N#3D%(S|wZEjlL4%QzlA?OcZ9q|<`TY=h@12tDk;-JbT zQXz}~v#9Hnzd;zc6h7!|K=NLA7A+XeiSa3qTouoH?(>qKG|9T&O`2`2ui~fBC3Hr) zyeBU42A%d`#r&s#{Cd3o?Qf5z%U0&r0xj6gel8iL#tK9gN2$|s?;vD+68y9}Wn(0= z;sBem7ahA4@G##iNtA6dAs)%qXNgnpFhvuSP zGpQ#4bd|}?-_F=oYFMA;^U7J7`m8f|wx-KhTpSM{aLS-HeQ&`>LJlVJI^+4_zZqoV zZo8atro2d>eOb>GQ}pa>lDKkB*ICBAOkUZ(ZBkw)ZMil&a=|{;Y!trvGZA;79(AyG zc0!wz1Zk5pxnSQJ@vL(qUjFk)5f<#LU=q8Y4jB3us>hN3hIho`#Y!RTaa0Z$gtcqA;ANsgziA; zSJUF?=mZ?SAH!Oj2qszuNKp`}=dh!x%Tflm@-n*+<7l6A{*3Fk8y_o5W#k zlQuCimi0XO$xn`VzVn@}{fwF~2i8GN!YJ4+Wy@ZNu%`r@(3jAf5vT((-SjaJwG%b; z-RipVdfBJi4}DKK^z`;H9^lD5iI)b<20z{zUw#bWj7SQc-O0>3BWu=cU1lxGF^Hb8 zOFTAl-n(Gm%A)#InBooy`lH{Cc=Io^$Ywur3XLT}GUFVa)mlac>NQV_xE!@@Z?j+@ zK|@)E*?-f$8{*Y3{f&6YLm!be$Kd7k*2Nf#A8F7_ym>j+1X_4>VjdeEkB|M`<#E&h zxhc*#d4e)8%R^ zx-JMTMCbHp{A{9`&U>swwhW5V!5KspdI{e?J7ZV8i;En5&ZlkRD9x?6-9j0qa~q`! zXmeZGW)|e6nQU9Lol&)>^v#=f0~0BZ^N)UTeHI%T9RZe^mAGKv#3FkImaMmaKH@3o zMm%W^+3#;Eo|!%CIp~iwGIc#>b;LW_gnaX-BTid76`M!;WAnz%p<(xzE_^l%dki;2 zd(lLClU63dUDp(%fVQ0Q+z4!EmQFe@Gj|OP#y?+kP5i;zF3a;<8hgxlC^tib)WOKT zie`{3Y`j+u=O99e4xC)6bHTiu1=BRTGrILt>(*BlyZ-v?@-oAl-t?w;!3$o%d6+>| zsIf9Yw#h)*R+i=70rY+hDY9hA;yCA=v$KAWnW%c{%v&$vE0mE*sq$r7lP}Gzi|yXMj*OvQ?dC3rsc#;8}XU0tMyrzOy!B)cfIRfoTl9#uXx4FV*qikfxvwAYSl@= zb&VwD0l)R@*T%y5}?b@<|D123dw3j!WWexGYA!^tEC zM~UlHa7CfL<&OzV)1>Zm{fs{9pVB(jv;vM-XAJGz%i+EIa{OmEqGs4l z{vMd&0v73?xGCcKT)+M(%0lRXJ}+m}GS-^q5r6z^5zl>3Z*17SB_8{8XT~F+cp<9Q z5a59=h+BLle#B98$uLvR>VAy4?rtVY=n_=N6<1sl|9H)JW9_>2m~}TCmN^8xV7%#q zja1^2h$LbOOIHD?MAwCw%f%aIbe2;^s`)eWFhBR+dvBhEGuFg25~`}3)*G` z?cecs)xuJ6?XZjMf^W6!4xT1TxCBl38W8W;cwh8SaE1#U952_7%l06*JnBpiW1VLlGC?}cYg#-+coB>v)C!|}pj{mnG-4#TWn9NwJhLaH`n zDQu3nlBB9ulcXoJFp>AMpug!yH^%E=dAksdgJ}?|6n|dozb;x*APECgV{tvCE~P}K`fr7aw zB0yQdBAfGru>(!}imM`C_iuRC!v#B%WIm9Z*L7L{#FBW$lQ+k`CtVb$oPIu%%*P(E zhJr7dp-zT|>zH>TExMoyRey~!eXOCjZQmImy!>)%#WJ?ABktcaHe>S4goFI#6k7?Y zow$?^0#F;Se&zwd${e-qLFzwjw1X^@ELplNHg4R2x^x!@&zu=mg-ZMFa5?J>i>gV< zSBR&=p;;6BvkunIc3d> zb`=8l27`_7ycR&&{Ya5Bh`9dCTz8Nl_ef<@{X8zS#=h=&C=34IdETnngESrGv4BxF z^hTLHr5V?qnslpgc#K1f>0`(l=jvcv;p<<$B0loBAIURYTT$f?CJk+Jwo3-7k;sM| zh%!iJP+9}lMtBZv8C-4YD0jH_0j%}S)t5 zvCVVN!EAyPDZ0uWrg^oOZ4Xz1JQ}#O!6W#o#FZ)*_)A>UH{sJ&*bAQRhYYP>8cX6S z!4vi?CyN=0BZOTO-*U@s@fUyjUMl3A7yD-O9q$`FC;qt+(g4fZG!D zRZF`qP`OIAr4XS6Rm`zf_cxDut1e$GLfSB<2acPgc4Kr{I8wz>wdg2j&swoWpZfqH zSR8jZc5I1DmqbTc#8p@`fuGt}>vw^dGjzik4{R@Li-++W!k1x7Zwmav>7{+&amc@v zBBef32%I=MV(T)7mm7PYWspgv>mCr<4>RSi4>h;X0U8*#%8JPh?q+>_z3 z3wHY@6IE$Kc&d}hj%}{TF8qhMY1hfIXLw2U^>BiBf|CV3Xan778j~!_!CNL797Fd*s$Ou$coqeo+g;hT%jZEPOP(3+P>#5NXv|nLquUD)pIjYof-JxnFqYMC7 zKLMqOCw=Y8!nF|S=7^i`iTJto#BCvC85#n!oL!fWrOFzHQ99f?9A6x(I`57rEcrov zanln}@xYmQVB*N}WX#=VoIdqKgdT#WH2jazq zaJ;zBhuz72r_#TA8FQMJMBBJ$w>BP?ddX(8)Lh>`(k+CuK2*8|6aW36W7JkB@1H5?%}N4{4UDjf%FYK zwRIygI^ZB_m^F3Q+aq(pC>)ZAUO2?#?30-hKHF;Ay8v2xe!yVF{ zF{V$u%u#ML-hMZEvL23j@Z8A=he21aK8v*LcnhMd45`_1D9%wgEZt&A$~A}TRX5VX zSNbTtc;j_0)>E>OQOPn1lWb+#xQ=sL`L3T@ks#K~iVau4G6{Z1ClyRAiq(sE$1k6D zLwxW@7sMGfxO>-*xbjPXZy#BSZdew@2`B%fCl+Bw40Z+RX`2_h~VB1pWGCw-)Sj+;OH>(a}-bhJsIrXN#nm-_H0 zc#F*V7#ngU<#a$mau;9Kmt^9&~XSOdztBW*t13YsQ$)E>#3Hsv)PE=;Ci5gUm!@^$7rd1}cdi8SfD?hslrrr&aCV$4S|1_w=$Nn4Mk zG!7GZ=o%8r<0hJe$C+36vf^KCWyQ`?s-Pxvp3 zMF$PUHw>aWkb}zr`&_lNq0(wEi>ch}u+!A(z$GCNb|LL3IIB5yl8+BCcJiLfn{T-_ zCPugB`>}j0yY1>MZ`i?CeG%Tu;BFLFi_iqk)wC>l0)FgOffK5-uK;e}t4qe=rmUUD zlQ9gpCJiV~oR+;JCNK$*KgTYsqX8L6R~g5!ZR$##6JVK?3gb8_iR(sUm#i~>g|tFh zY8P_q1*Zz|4BLj?!q4{9#~8aB?nJ`y-VQp)Wr21#``)w~mjkR7U=7#y_~D&B@zbf7 z#e$VziS4^KC2dsvv{!kg;bf3np@@-y+mlM7tAu!%wnk%EAs7x zWejkM&@Fa{k;>7|`L>0@FSfw0Ojcqx|PN;@!o2dh5!We6hg|TzbP`vez-kyEd zT2Ti&BN7O}rxLGfY4a(w&U}W&MY__(CX0HLN@G<_W_$~`{?f6PEkx=?<^R@q# zNsOzKq~b+MB15PG%Lq;=;#5}|LO;jMoa&{s(n!pf%~QtBad!MO>wZ5*lbUpGqEIK% z%NWuv5zck#8^;9?V^o15xSA)lV~|DqpcP?{X}Q{_@mVpxarH7IuuZ{<9T*OF?7S&H z{m;*dMa!1Pg%>nO&ENrS}eu>Qy0N)D#cV zF?)4DW#jCJh*(VQ~x!UM1Xe39b0+;+hg~_?fQ}8x~3Y={W+%H*uzwF<~6UarWD(45wkF zi7|dQM!bjC^URf2TD2pW8hyZ==3J~;y=c0*Nr?KS=@*M}GDm7f6t<3T3NO-5jFyz# zhL;H@ddVPwm%acQZlwXE6-?b8SO1?!#I;+O$3s@_jb*2w9gleUBjSc1-hc@iCSejz zBBbcixETzhZZ1(3F|ODxOp&t-#O^x8$3R>6GC(spojEx6hW@}nmSriO1LJ_mTsgaS zAStNFvs}5LW}T2rkM>@`3{G~95iR{5>Rht)l(_mk*Tt zq@CO(gmhhR=vrmCHMjGP&LJ{?5*y>A%cL46gRFw`n{}ro$y}v~CA7}E?;&I8XBfio zUI`;;#gcOxssh~PL7|f79aF&1qwqaS4p;j+fiTm7F4J{Z03%MZiP_P!H#XeQdx38} zH`Xudr`QDa&=(gx;c>|zLoi1VVyhjGS;rClWLK)lS9`O1^yC%4@b z|LG4d%Wn3t3*`$RY%}4{*$_N7lEKpeX1`wva9@BCx~9$yIz8 zHLx&p5((|+B!VwaatsJ-Ih@3ns!HX@bbOrD_1}U8{rS1NUg8~}oP_Ly%*MYziF@u# z_cGFi%v0`~JhYK{!Q;R{KhIlm*2@D`X3cRe^eaOsMOrf}6?2fb&@WphV{lHc@5q>K zDm5Srht$Qo=d^sSC|mTU5MIJ6=~#eqNhd=X*D!{0*5NCE(9+|IA6^(+##Y4X3q2{& z&;H5?>(Nu<`M>(&_}phd8G{&YcI|Sru&vKlGEdj)r{xNRl+(Pj{$xY&eks~PtxS*u zA=1rL7lGvMXqd@9npfSpF7Um#!@j@B!LN0xW@H+5WgB40`)(Mgb80jeaFA#D%GL4X zn>WPU-|=ot!Q1i}!R&7e76JgDNVLoh%XZ#d2g#*UlI=QkfzK=(?FaE|d979Nc?yV~4 zFsgAK;C;pu2E|2bO#qgAQ>d7Ml!LS2eepo zOi>;br>U1}FpQAaTGT~s^Kqqxte-E@Qugydej0loeeC#? zfJM`TuD&-+TrOPHA3y)J=ffcHj4|jo>9CEyscl{^8Kjm-!h+=`uIzLoPzZ|}BM}z$ zNrq8^ptgX05v}Gbhf9b`jgEY%N5VIc`C5V;e%186bm@h>SU5I(}$uUVL+MS6|LkMLfsnLQ_Vk8(HxybSe+u^aIR}G zx~KRs4G>hiwTOi8r4t?{#U%S0@7(@`xMAC>IBTg5m2XY@sDqPtmrQ~3k_27roQFSyL0o_MW<&QulB!aIC@G30Nhy-DSTnEGE`iGc+%qL~aqkmdF4DW1 zhVsj-+#4sC7b!$B-ZWNB!#w>(C*2oOP4H7=-Mxcx@8+%Xg|B@nKKAL)#nw%H3xuO2 zzSZwg2hb|f`N(cQpUgX>#$Xm_6`kpmyhKdqsHWdSoQ{kcig#Rp0WCK(6}3zvg5YGL zLZ~b2qlP$vKh+}QdoXnmaDvso6=o_DISaM@OcV8iJ2#y^U5Ms!PJWYlCT?7*Hl5sJ z46&+2k#u&Tkqs`t1WDp&!N0cfa(l*cfb*N+T^px@3@8_&=wlgFA&veSdd{1oH zyF5OB`$J+aix?%HFG4TtGG2(z&8(%oO$(AHF8$tnrIe?T3nLckIvPwRGKS;}2;n4x<$VHk$zmEw$t@yM;#Ef(gf zS{;aAt$cR8_gvD7hfBY9+Y@3p3!PIIpgwX~RpwA~bW30OelFY7-5!-XdCkf3+rRy? zc-!0lh<%b3v1QXnCi5!ysCSNTh6IsVtXw9MXHr<$BM8kjnL%Bb9{^%E9pe5e4=ml! z13dja$>j`}KqoT*I2`WlA&qmOl{Q+hoW-rr^IKoP`k!ND*OvXj^&9D?%N)sk`{kG! zQ3-tlm?R+8#k6A8*_rkdnZS}#1g1|(0)ZZHS79xZtl6xD7-fKbZ6;v}qnvvK{Sb#` zYB>f1kf&9#;|agaAXB8|Xnf;5)(D80R|%k23G+UNbpZ44+3Qm~3T!S1mL3$D!5q|6 z7F13ly?mHwDE@Wl!{XbU&yCf*e9M#Eg(=Dc-BaPIV!0N9L0qtp^NP|3Kj^{nq8Gd{ zKJ}STbG+%K*fQ$_oi=+oH_ag6T*esTl{=~^c2+g05T}EuE{qQsI_vduFl;X`5x(ww z-;2$g?mb*PhfE(F=*#-;w6lN`!0(qkgUy9Gth^GBM`f}P_!E4#I9(Ey(nM(`<2Y-V z`?|ZF9WJ?#+wZg$tBC*H@PnZx|FlE_zLG;XgFy~XW|{X`{Ro%LAae+nt04Ko_#`9( z(v9b=e4+JjRR4!Rg+)EgqGV}F4+|W~Q6?+4(r%c8x07_RJ->_mU*+MbzMg*6CFqca zx!Oscd{aa5UbVi_UL4;6=<0dTe_nhA2Jz&$=k@k*xb{$*$ZW7$4C3rxUis7L=m4vo zUIJBe=&aaTuA9Yq0#CFHXBlJ>jk`EbvD^@34Of7wpR)y>mSAmj%%d&1QEb^$D5h~!Dvw!o z#YtrjG2N07tw{-F!yIW00mZqg==6MooiwXLEF>N^aVx^Gdm>K!z924GcSseFe_VNA z??D&lNPyy{h96!%5cM7r33 zncy8-Pk-7|;`(bI7hnFycVju{wzltNgV~8^4$l6jtAsf=&f~7CArO-@ygSkoe!j^L z-Cj%A7&E3Rj=^}y4v#{P1w3C(T%|vX~k;bw;vK>CBQr&n45|8 z4at==vyGns;CqQQoU@b!&s$k&9+&;}@a5!SSA68F!S@8OiRDvG^W^dX#*t1Ja4hL%uYMyy;JR3^%maNb1}UW(Fd1TOIHgIx0~MwyuXQYpGS23d zOykL1XW%kdSXvC6I9C}YtysWZ)*FS%E3>EHVh)+#1#*G=L_wclmvXNr_iJQ=_RH~@ zW|;c!tU{hA4%gC`jDetNF~=SdID%PgD-5yXAv`nA<(F%7VXiot&m~zc?uhT+y)WK+ zYKmPD7 z|1q}l5uMd*)`Qow?xUqcx;6$WBr=YwG_DnhnK&(4aGni-%QK%m{g9s2NhQFS9kM`n<42^>J`&&EB*ve zLbc-(jm)8G#`TEdy+o>J-NN;Zr}Oe^l=mqT60efh9IsTZV6>eu)O)YAwDJiP@2CD8 z{EWw<#YW?~G;3m*-@Zl^^1# z#UKrxs+ z+!AFn41EK0B2QQQU+#|2uWfo2YnHH1t6G(zktYevbRKR`Fv^9<^@dg~nM5s$&j`jf zSg$U8YQz&yBcdKgoQLEP7r8WGljSQv;q%hh^Zk((6YPdBjjL{p_`yG4i!o>k)+rZYI)u$>wiPrBkMbgrQ%+tLuYKKX0gineB+gtW_ZEX>DSjsS za_t!3U~r}#<#5~(pCa&(+{o}~?yR~P_pJRGTl#fou4PZ8UuR_*J5MCT1QotYZ2HM4 z_~WQF7 zO;#33Jsfo185cbMf_TkqU!UJwcN1EAIFw5(R(l557^7pna#B++^MqEEjxmphl(18- zhRBHtIM79IH5Ij2astAYK~jaH(++0tKoizpp3DJLbg)4kE&^N5)`~zhz;*8J_U8?xwwL=Z6U5G_G2b911tO{%`>_!NLEIE_dAv z2UY?-EGCX|hCC_*(TkY+q+N$rBF=~9VMTm53bDh1V5YrhkLRwt?motlO;^8g;i9}r z;)LiWd>K+$3=6wXBZxDg_#c;g`FEBc-n=2xkM~di!i6#FMq2})Agw|jx(nub=2;QX zeh?7Vg?Yn(bB0ldg1P>Mu3h$J-rz{RJJ_-?T6}ETx-CvRd2M|Bb6<%k{o*gjBOdig zHX^q{pOUb9CWRS1pOqFYaA`R&nI*>=T<&IqTEA{hyzfJQ6Bl3n+kE$MA?N(|=45ps zSX&H|i44-X>kq!f!$g}5;%g{n4p;qomIXa;oP&Vl<1h%!QmsG-s{DAyRRO^cKJfLAv}^}oGO4v zPW))hn$ymRH^1?Bn6)Qj@!|y>?OwneW%?8DVzm(>r4ev7FbNUC#6^LpG@W5^qU>-_ zAn)-#4y4Ny*c28QQ_Q?q{QalnfBfC&WBHOryk)WMM*A#C{f_9R&*r=p)HH?ku>Cx$ zu0IE7pF3cPt@!WyMk(Ou-0oxEXizF3G0d|-x_7CgD+MnXyW|_%OXZy=I*0 z5IFhDspSry!S0RW@&5S9Ew{oT*9umuIjS-6gTEBw!chZh9yvjJVCFSO>s&9-Ks=V+ zw|>l=3wa)7;i3V~z+vu8^_TW)pM_N*vL?a}g9upuC4lCULCj{J>9CPqq{%A_fV+$D zZQOj@tr0ND0N=8gK_u#>C>k4)7?-di_~fj&gz##wd!-&s)KjL&$ zwmZ;7ZNED6>|-6gk~39zY}ydtx#lXK9((~~y%}Cq+W~&Zj6z=aZHAg<1@;@2Y>1cd ztwf5y;nFuHgQ!-PQ`EJ!X@3TTB(_*@>{TsCDvfi5a*XxJFcs!OLpnZ*xuTax9LHr4 zHVvJff0mpK;3cDoAPL3$R9!%thXLJu8{?eT1P?OYw`FT=-?0@bS=LxRu4MUl1~*Pu ziC?743`uxqV;~B16ecWrOPe_>!(cvC*2nSwl}o|b!0LRC-h8?;J5H}bp6 zVw5z$YtLSe)Gy`5RSOpbHzzD~s;N5OpApz{(!KKOoO@CoVspfn=j_PrP_XPtd^+ZVMP$51JsQ_&cV*XQ62YT2IBKCx+p&JiOMqS+;RC@SA2zC4#PBjb0Pa=dM(+DBSfshVn1p6w%`-EeeS&>4f zB{4a>gKX+m!8Wgm^ivR)mx!kaf-Iz)C!ZCE`9@LJ{Q}br>;jvNQD8UG`y%Zs-m?Vt z_%1SqS9zDO)2>YIo6dy;qOj&{v%p&zyI~06w%z=-FO;2D2Me4O&3=?z;>2=^QjsGmoKHxW(0Vy&PfUV;w^(XVtLf%UR**DuQZR7)QS*F0%-WOp_ zD<5rG=QJJx0#ItZXp6D0QLQe0EML1t;!Z*j%qeAIF4527a*w$~hQNROrzvAG;2h;T zoO8nS&HlRgzwf=Vn`h=1VPSKg%1O+L%t<3Bj5-0}%fb8$s$@IG;(q7$t?Z3FF5dbF ze}IK+dmd-WikqK#Fi5FbAohZwNeFBTf@oo`z19;LW@za=gX{&y3vmIj*cT}cLkMCa zBnhJAGp(jeJcjjM^w)5W&-ZJ|5Tw=gTDHOJX@+0QD9H=_ zwH-4FyKT(4h;wb2Cj|f^B|sAWbpI+G`ZYY=sE|oXrX|$CUfdu$$1e6Le&@o7r<_V0 z3-j!UOkt)uT=paF5twy9e>cZS?uj^!@croabCp8-FgLG0WlenJTi3*uU;bh&S+z-`0R3p zuq3XMCc_qqA|(}Pn(>a7b!6t6mJ!WOCJ75=bLulcm$=7IFp^4}N?Mhbe3e175wlpI zd`{Uq z2K#tmPxr>(drSQEmfK^+ij}PS_*z*ST#Doe`c6#-~2{ z32K|*h3co|xLfy}7^I3SUvr7}ov)tM*fYhk4maE6dJ+D!;53IO(E*Hpi->aso$VwH z&C_M1WdNOf6}gzDA0ov*DJ@mST^bvgVW=_F$nT3P!~-Xwqi^UBvF zQGUV$lpNuyE>%Bna_u64=d@Y~-ZlzMrmHfPeU|bT7{eG8Xv4ZSM`wEwhE}*ftX!I` zd(elxdWqBT_G)1ANJ$UGWF7U&S1u8+VZnU%t?unqJl(l5;%{CS@nD~lV(rnA7!Lm& zF3E&-bPV-IdN}_3PGU{*Qj-!>CL>EZ7$oTxhbVzryd8 zeWF900cZqL_t(sU3_ayi%a`%P}aXQ5O-uHbVp8LFu;)%S(dV(YEK5bp*Y$qJ> zlSnL+k8PFqxTjGKF~d9xxpKu|T=Kft#fLxq;kfJ0JK2m~d~gQw0GP}hEsovV=Ri`@(0qG$jPkqi)RN_nqk$9~~B6W7}WW%i|_6$$O5C=c2 zvmG~IyE^(P<1-A-^qN#DdpZnzaB`PtkLKlQDreX&JazcT z-z`Pi+R2wd6iDY)U1qkA^+T@j_>;@xV;}!iticStk3+Ue{@EADv-Bz3v8&wkljGy$ zqqOw-_s2Z`@$upRb$Pt>WiN-`{oM8}r{w6S(Ir>~`uh5L|Lb53EF9!1EdhQF}utlEy>ZEar_%MV_cQeguYF~W@7*oTCL>C^3>>tq1j`LDXG0l;GQz1Zlllxcqr;=b z)Pr@#1AM+ZHYWz_;F3Od8Rw0XG^w@_Po@!9GV*ddrs2JOVtHg_8?R!zH=ab&qNQVT z7pBVX*V)f_F^JkN#s!EhygDlvVK zYM-AEe*m1)!^b=h${@9k$|y5fAi2*RE_r|UT%9%N0$KKJM&}M(>VR2NOjj(_9Acz~ zOVB%KN#=g`Sc>^rye6YCum`dywbf7nY9eOFm%AK=nF*y#+wcC#P0Xx>_FM6&gz7*d z4RH=?6sbHwM?7+WqzXf#42j6Q7>-VIwDrxP_*B9!S-c2i$S4MywsAOMSB-4)5cDo# iL&WXotXZyIiTJ<2j Date: Fri, 10 Jun 2016 11:12:36 -0700 Subject: [PATCH 51/78] File name change --- etc/{email_schedule.cron => plexreport_schedule.cron} | 2 +- initial_setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename etc/{email_schedule.cron => plexreport_schedule.cron} (99%) diff --git a/etc/email_schedule.cron b/etc/plexreport_schedule.cron similarity index 99% rename from etc/email_schedule.cron rename to etc/plexreport_schedule.cron index ec7b5f4..f1a6553 100644 --- a/etc/email_schedule.cron +++ b/etc/plexreport_schedule.cron @@ -1,2 +1,2 @@ # Sends a weekly Plex Report email on Friday's at 10:30hrs -30 10 * * 5 docker exec plexReport plexreport -n -d &> /dev/null \ No newline at end of file +30 10 * * 5 docker exec plexReport plexreport -n -d &> /dev/null diff --git a/initial_setup.sh b/initial_setup.sh index 0b4b4a8..f16f262 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -26,7 +26,7 @@ PLEX_REPORT_CONF='/config' #/bin/echo "Moving email_body.erb to /config" /bin/cp -r etc/* $PLEX_REPORT_CONF chmod +666 $PLEX_REPORT_CONF/email_body.erb -chmod +666 $PLEX_REPORT_CONF/email_schedule.cron +chmod +666 $PLEX_REPORT_CONF/plexreport_schedule.cron # /bin/echo "Creating /config/config.yaml" /usr/bin/touch /config/config.yaml From 32832516b81925add92ca58529edb745ffce1ae5 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Sat, 11 Jun 2016 22:55:51 -0700 Subject: [PATCH 52/78] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3dbed12..57ffb9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport +# . # Add firstrun.sh to execute during container startup # ADD firstrun.sh /etc/my_init.d/firstrun.sh # RUN chmod +x /etc/my_init.d/firstrun.sh From a385d814e98ab40fa2582cb8b9d6c7f702ba795c Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Sat, 11 Jun 2016 23:46:53 -0700 Subject: [PATCH 53/78] Downgrade Bundler version --- Dockerfile | 1 + initial_setup.sh | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3dbed12..57ffb9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport +# . # Add firstrun.sh to execute during container startup # ADD firstrun.sh /etc/my_init.d/firstrun.sh # RUN chmod +x /etc/my_init.d/firstrun.sh diff --git a/initial_setup.sh b/initial_setup.sh index f16f262..9ca78f2 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -34,12 +34,11 @@ chmod +666 $PLEX_REPORT_CONF/plexreport_schedule.cron /usr/bin/touch /config/plexReport.log # /bin/echo "Installing ruby gem dependency" -/usr/bin/gem install bundler # fix world-writable bundle error -chmod +t -R ~/.bundle/cache +/usr/bin/gem install bundler -v 1.12.3 /usr/local/bin/bundle install # /bin/echo "Running /usr/local/sbin/plexreport-setup" /usr/local/sbin/plexreport-setup -/bin/echo "Setup complete! Please create a cronjob from within unRAID to call the plexReport on a schedule." +/bin/echo "Setup complete! Please see directions for running this on a schedule." fi From d2130705d84fd4286ddba239445fdc65352724b7 Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Mon, 13 Jun 2016 12:05:49 -0700 Subject: [PATCH 54/78] Updates and fixes --- Dockerfile | 7 +------ etc/email_body.erb | 2 +- etc/plexreport_schedule.cron | 3 ++- firstrun.sh | 23 ----------------------- initial_setup.sh | 2 +- update.sh | 20 -------------------- 6 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 firstrun.sh delete mode 100755 update.sh diff --git a/Dockerfile b/Dockerfile index 57ffb9d..29f9c0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:0.9.15 +FROM phusion/baseimage:0.9.18 MAINTAINER ninthwalker # Set correct environment variables @@ -29,8 +29,3 @@ apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport - -# . -# Add firstrun.sh to execute during container startup -# ADD firstrun.sh /etc/my_init.d/firstrun.sh -# RUN chmod +x /etc/my_init.d/firstrun.sh diff --git a/etc/email_body.erb b/etc/email_body.erb index a5029b8..01a221b 100644 --- a/etc/email_body.erb +++ b/etc/email_body.erb @@ -389,7 +389,7 @@ background: #CC0000 !important; <% new_seasons.each do |season| %>
+
-
diff --git a/etc/plexreport_schedule.cron b/etc/plexreport_schedule.cron index f1a6553..eb7ba07 100644 --- a/etc/plexreport_schedule.cron +++ b/etc/plexreport_schedule.cron @@ -1,2 +1,3 @@ -# Sends a weekly Plex Report email on Friday's at 10:30hrs +# Sends a weekly Plex Report email on Friday's at 10:30hrs. See http://www.adminschoice.com/crontab-quick-reference for cron help. 30 10 * * 5 docker exec plexReport plexreport -n -d &> /dev/null + diff --git a/firstrun.sh b/firstrun.sh deleted file mode 100644 index 201f6cb..0000000 --- a/firstrun.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Check if config exists. If not, copy in the sample config -if [ -f /config/config.yaml ]; then - echo "Using existing config file." - ln -s /config/config.yaml /etc/plexReport/config.yaml -else - echo "Creating config from template." - mv /opt/plexReport/etc/config.yaml.example /config/config.yaml - chown nobody:users /config/config.yaml - ln -s /config/config.yaml /etc/plexReport/config.yaml -fi - -# Check if email_body.erb exists. If not, copy the original -if [ -f /config/email_body.erb ]; then - echo "Using existing email_body file." - ln -s /config/email_body.erb /etc/plexReport/email_body.erb -else - echo "Creating email_body from template." - cp /opt/plexReport/etc/email_body.erb /config/email_body.erb - chown nobody:users /config/email_body.erb - ln -s /config/email_body.erb /etc/plexReport/email_body.erb -fi diff --git a/initial_setup.sh b/initial_setup.sh index 9ca78f2..5da0435 100755 --- a/initial_setup.sh +++ b/initial_setup.sh @@ -40,5 +40,5 @@ chmod +666 $PLEX_REPORT_CONF/plexreport_schedule.cron # /bin/echo "Running /usr/local/sbin/plexreport-setup" /usr/local/sbin/plexreport-setup -/bin/echo "Setup complete! Please see directions for running this on a schedule." +/bin/echo "Setup complete! Please read directions for running this on a schedule." fi diff --git a/update.sh b/update.sh deleted file mode 100755 index 0e21681..0000000 --- a/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Bash script to pull the newest code from Github and copy it to the correct locations -PLEX_REPORT_LIB='/var/lib/plexReport' -PLEX_REPORT_CONF='/etc/plexReport' - -/bin/echo "Grabbing newest code from https://github.com/ninthwalker/plexReport" -/usr/bin/git pull - -/bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" -/bin/cp -r bin/* /usr/local/sbin -/bin/echo "Moving plexreport libraries to /var/lib/plexReport" -/bin/cp -r lib/* $PLEX_REPORT_LIB -/bin/echo "Moving email_body.erb to /etc/plexReport" -/bin/cp -r etc/* $PLEX_REPORT_CONF - -/bin/echo "Installing ruby gem dependency" -/usr/bin/gem install bundler -/usr/local/bin/bundle install - -/bin/echo "Upgrade complete" From 1d10f1156238a8026cb18c5b1c91949f6e5e53a9 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Mon, 13 Jun 2016 13:55:37 -0700 Subject: [PATCH 55/78] Update README.md --- README.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2be78ac..37bc4f0 100644 --- a/README.md +++ b/README.md @@ -49,19 +49,12 @@ See `/config/config.yaml.example` and below for details. To schedule the report to occur regulary please use the new cron system for unRAID 6.x: -Modify the "plexreport_schedule.cron" with the schedule that you would prefer. -This file is located in your docker appdata /config location. +Edit the "plexreport_schedule.cron" file found in the plexreport appdata folder with your own time/date. +Copy that file to the following location. Each time unraid is started it will load your plexreport_schedule. +`/boot/config/plugins/dynamix/` -Then copy the "plexreport_schedule.cron" to /boot/config/plugins/dynamix. -Each time unraid is started it will load your plexreport_schedule. - -Optionally you can setup the cron the old way: - -Enter the following command in the unRAID shell. Replace the day/time with what you want: - -`crontab -l | { cat; echo "30 11 * * 5 docker exec plexReport plexreport -n -d"; } | crontab -` - -To keep the cronjob after a reboot, also add the line to your \boot\config\go file. +To have it added immediately without restarting unRAID, at the command prompt type `update_cron` +See this page for help creating a time/date in cron: http://abunchofutils.com/u/computing/cron-format-helper/ ## Config From 696f0e164778452b5c3c832014d9da5d87269399 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Mon, 13 Jun 2016 13:57:05 -0700 Subject: [PATCH 56/78] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 37bc4f0..18dd13b 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,11 @@ To schedule the report to occur regulary please use the new cron system for unRA Edit the "plexreport_schedule.cron" file found in the plexreport appdata folder with your own time/date. Copy that file to the following location. Each time unraid is started it will load your plexreport_schedule. + `/boot/config/plugins/dynamix/` -To have it added immediately without restarting unRAID, at the command prompt type `update_cron` +To have it added immediately without restarting unRAID, at the command prompt type `update_cron`. + See this page for help creating a time/date in cron: http://abunchofutils.com/u/computing/cron-format-helper/ ## Config From 606c9ba62ec453d16fd8f48e2d43fe5f140fc4bd Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Fri, 4 Nov 2016 13:13:01 -0700 Subject: [PATCH 57/78] Code Refinements --- .gitignore | 3 - Dockerfile | 15 +++-- README.md | 17 +++-- initial_setup.sh | 44 ------------- root/initial_setup.sh | 14 ++++ root/opt/config/config.yaml | 1 + {etc => root/opt/config}/config.yaml.example | 0 {etc => root/opt/config}/email_body.erb | 64 ++++++++++--------- root/opt/config/plexReport.log | 1 + .../opt/config}/plexreport_schedule.cron | 2 +- Gemfile => root/opt/gem/Gemfile | 0 Gemfile.lock => root/opt/gem/Gemfile.lock | 0 {bin => root/usr/local/sbin}/plexreport | 0 {bin => root/usr/local/sbin}/plexreport-setup | 0 .../var/lib/plexReport}/locales/de.yml | 2 +- .../var/lib/plexReport}/locales/en.yml | 2 +- .../var/lib/plexReport}/locales/fr.yml | 2 +- .../var/lib/plexReport}/mailReport.rb | 0 {lib => root/var/lib/plexReport}/omdb.rb | 0 {lib => root/var/lib/plexReport}/plex.rb | 0 {lib => root/var/lib/plexReport}/plexTv.rb | 0 .../var/lib/plexReport}/themoviedb.rb | 0 {lib => root/var/lib/plexReport}/thetvdb.rb | 0 23 files changed, 71 insertions(+), 96 deletions(-) delete mode 100644 .gitignore delete mode 100755 initial_setup.sh create mode 100644 root/initial_setup.sh create mode 100644 root/opt/config/config.yaml rename {etc => root/opt/config}/config.yaml.example (100%) rename {etc => root/opt/config}/email_body.erb (99%) create mode 100644 root/opt/config/plexReport.log rename {etc => root/opt/config}/plexreport_schedule.cron (67%) rename Gemfile => root/opt/gem/Gemfile (100%) rename Gemfile.lock => root/opt/gem/Gemfile.lock (100%) rename {bin => root/usr/local/sbin}/plexreport (100%) mode change 100755 => 100644 rename {bin => root/usr/local/sbin}/plexreport-setup (100%) mode change 100755 => 100644 rename {lib => root/var/lib/plexReport}/locales/de.yml (95%) rename {lib => root/var/lib/plexReport}/locales/en.yml (97%) rename {lib => root/var/lib/plexReport}/locales/fr.yml (96%) rename {lib => root/var/lib/plexReport}/mailReport.rb (100%) mode change 100755 => 100644 rename {lib => root/var/lib/plexReport}/omdb.rb (100%) mode change 100755 => 100644 rename {lib => root/var/lib/plexReport}/plex.rb (100%) mode change 100755 => 100644 rename {lib => root/var/lib/plexReport}/plexTv.rb (100%) mode change 100755 => 100644 rename {lib => root/var/lib/plexReport}/themoviedb.rb (100%) mode change 100755 => 100644 rename {lib => root/var/lib/plexReport}/thetvdb.rb (100%) mode change 100755 => 100644 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cae2026..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -etc/config.yaml -cron/ -plexReport.log diff --git a/Dockerfile b/Dockerfile index 29f9c0e..687f165 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:0.9.18 +FROM phusion/baseimage:0.9.19 MAINTAINER ninthwalker # Set correct environment variables @@ -11,15 +11,15 @@ ENV LANGUAGE en_US.UTF-8 # Use baseimage-docker's init system CMD ["/sbin/my_init"] +#copy plexReport files +COPY root/ / + # Configure user nobody to match unRAID's settings RUN \ usermod -u 99 nobody && \ usermod -g 100 nobody && \ usermod -d /home nobody && \ chown -R nobody:users /home - -# Disable SSH -RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ @@ -28,4 +28,9 @@ apt-get update -q && \ apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ -git clone https://github.com/ninthwalker/plexReport.git /opt/plexReport +cd /opt/gem && \ +gem install bundler -v 1.12.3 && \ +bundle install + +VOLUME /config + diff --git a/README.md b/README.md index 18dd13b..8277ee8 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A dockerized version of bstascavage's original plexReport (https://github.com/bs This docker generates an email summary of new additions to Plex to send to your ursers ## Supported Platforms -* unRAID +* unRAID, Other Linux ## Supported Email Clients * Gmail @@ -33,12 +33,9 @@ You can also install by adding the following template repository to unraid: https://github.com/ninthwalker/docker-templates/ After installing, run the following commands from the command line: - -`docker exec -it plexReport bash` -`cd /opt/plexReport` -`./initial_setup.sh` - -Follow Prompts +(This initial_setup only has to be done once. Reinstalls of the docker do not require it) +`docker exec -it plexReport ./initial_setup.sh` +Follow Prompts. plexReport can be run with the following command from unraid: @@ -47,7 +44,7 @@ plexReport can be run with the following command from unraid: You can now edit the `config.yaml` (and optionally `email_body.erb`) with your own settings in your appdata dir. See `/config/config.yaml.example` and below for details. -To schedule the report to occur regulary please use the new cron system for unRAID 6.x: +To schedule the report to occur regulary please use the new cron system for unRAID 6: Edit the "plexreport_schedule.cron" file found in the plexreport appdata folder with your own time/date. Copy that file to the following location. Each time unraid is started it will load your plexreport_schedule. @@ -97,7 +94,9 @@ This file can be edited with CSS/HTML if you want to modify the look of the emai ## Command-line Options -Once installed, you can run the script by simply running `plexreport` from within the docker image container. If you need to reinstall or reconfigure the program, run `plexreport-setup`. All commandline options can be seen by running `plexreport --help` +Once installed, you can run the script by simply running `plexreport` from within the docker image container. + +If you need to reconfigure the program configs, first delete the existing config files and rerun '. /initial_setup.sh`. All commandline options can be seen by running `plexreport --help` ##### Options: `-n, --no-plex-email` - Do not send emails to Plex friends. Can be used with the `recipients_email` and `recipients` config file option to customize email recipients. diff --git a/initial_setup.sh b/initial_setup.sh deleted file mode 100755 index 5da0435..0000000 --- a/initial_setup.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# Bash script that copies plexreport files to various directories -# and walks the user through the initial setup -# - -/bin/echo "This script will create a backup if a config exists, and then delete any plexReport config that you may already have" -read -p "Are you sure you want to run this? [Y/N] " -n 1 -r -echo # move to a new line -if [[ $REPLY =~ ^[Yy]$ ]] -then -# create backups -/bin/mkdir /config/backup -/bin/cp /config/* /config/backup/ -/bin/echo "Backup complete. Find at /config/backup" - -PLEX_REPORT_LIB='/var/lib/plexReport' -PLEX_REPORT_CONF='/config' - -# /bin/echo "Creating plexreport library at /var/lib/plexReport" -/bin/mkdir -p $PLEX_REPORT_LIB - -# /bin/echo "Moving plexreport and plexreport-setup to /usr/local/sbin" -/bin/cp -r bin/* /usr/local/sbin -#/bin/echo "Moving plexreport libraries to /var/lib/plexreport" -/bin/cp -r lib/* $PLEX_REPORT_LIB -#/bin/echo "Moving email_body.erb to /config" -/bin/cp -r etc/* $PLEX_REPORT_CONF -chmod +666 $PLEX_REPORT_CONF/email_body.erb -chmod +666 $PLEX_REPORT_CONF/plexreport_schedule.cron - -# /bin/echo "Creating /config/config.yaml" -/usr/bin/touch /config/config.yaml -# /bin/echo "Creating /config/plexReport.log" -/usr/bin/touch /config/plexReport.log - -# /bin/echo "Installing ruby gem dependency" -/usr/bin/gem install bundler -v 1.12.3 -/usr/local/bin/bundle install - -# /bin/echo "Running /usr/local/sbin/plexreport-setup" -/usr/local/sbin/plexreport-setup - -/bin/echo "Setup complete! Please read directions for running this on a schedule." -fi diff --git a/root/initial_setup.sh b/root/initial_setup.sh new file mode 100644 index 0000000..e5aacda --- /dev/null +++ b/root/initial_setup.sh @@ -0,0 +1,14 @@ +#!/bin/bash +#walks the user through the initial setup +echo + +if [ -f /config/config.yaml ]; then + echo "Config files detected. Using existing config" + echo # move to a new line +else + # begin initial setup + cp /opt/config/* /config/ + chmod -R 666 /config/* + /usr/local/sbin/plexreport-setup + echo "Setup complete! Please read directions for running this on a schedule." +fi diff --git a/root/opt/config/config.yaml b/root/opt/config/config.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/root/opt/config/config.yaml @@ -0,0 +1 @@ + diff --git a/etc/config.yaml.example b/root/opt/config/config.yaml.example similarity index 100% rename from etc/config.yaml.example rename to root/opt/config/config.yaml.example diff --git a/etc/email_body.erb b/root/opt/config/email_body.erb similarity index 99% rename from etc/email_body.erb rename to root/opt/config/email_body.erb index 01a221b..bdccf2a 100644 --- a/etc/email_body.erb +++ b/root/opt/config/email_body.erb @@ -355,6 +355,38 @@ background: #CC0000 !important;

<%= $config['email']['title'] %>

<%= I18n.l Time.now.to_date, format: :long %>


+ + <% if movies != [] %> +

<%= I18n.t :new_movies %>:

+ + <% movies.each do |movie| %> +
+ +
+ + +
+
+ + + +
+
<%= movie[:title] %> (<%= movie[:date] %>)
+

<%= movie[:tagline] %>

+ <% if $options[:detail_email] %> +

<%= I18n.t :genre %>: <%= movie[:genre] %>
<%= I18n.t :director %>: <%= movie[:director] %>

<%= I18n.t :cast %>: <%= movie[:actors] %>

+ <% end %> +

<%= movie[:synopsis] %>

+ <% if $options[:detail_email] %> +

<%= I18n.t :runtime %>: <%= movie[:runtime] %> <%= I18n.t :minutes %>
<%= I18n.t :release_date %>: <%= movie[:released] %>

<%= I18n.t :rating %>: <%= movie[:rating] %>

<%= I18n.t :imdb_rating %>: <%= movie[:imdb_rating] %>/10 <%= I18n.t :from %> <%= movie[:imdb_votes] %> <%= I18n.t :users %>

+ <% else %> +

<%= I18n.t :runtime %>: <%= movie[:runtime] %> <%= I18n.t :minutes %>

+ <% end %> +
@@ -383,7 +415,7 @@ background: #CC0000 !important; <% end %> <% end %> -
+

<% if new_seasons != [] %>

<%= I18n.t :new_seasons %>:

<% new_seasons.each do |season| %> @@ -407,36 +439,6 @@ background: #CC0000 !important; <% end %>
- <% if movies != [] %> -

<%= I18n.t :new_movies %>:

- - <% movies.each do |movie| %> -
+ <% end %> + <% end %> + +

<% if new_episodes != [] %>

<%= I18n.t :new_episodes %>:
- -
- - -
-
- - - -
-
<%= movie[:title] %> (<%= movie[:date] %>)
-

<%= movie[:tagline] %>

- <% if $options[:detail_email] %> -

<%= I18n.t :genre %>: <%= movie[:genre] %>
<%= I18n.t :director %>: <%= movie[:director] %>

<%= I18n.t :cast %>: <%= movie[:actors] %>

- <% end %> -

<%= movie[:synopsis] %>

- <% if $options[:detail_email] %> -

<%= I18n.t :runtime %>: <%= movie[:runtime] %> <%= I18n.t :minutes %>
<%= I18n.t :release_date %>: <%= movie[:released] %>

<%= I18n.t :rating %>: <%= movie[:rating] %>

<%= I18n.t :imdb_rating %>: <%= movie[:imdb_rating] %>/10 <%= I18n.t :from %> <%= movie[:imdb_votes] %> <%= I18n.t :users %>

- <% else %> -

<%= I18n.t :runtime %>: <%= movie[:runtime] %> <%= I18n.t :minutes %>

- <% end %> -
- <% end %> - <% end %> -

<%= I18n.t :thanks_sentence %>

diff --git a/root/opt/config/plexReport.log b/root/opt/config/plexReport.log new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/root/opt/config/plexReport.log @@ -0,0 +1 @@ + diff --git a/etc/plexreport_schedule.cron b/root/opt/config/plexreport_schedule.cron similarity index 67% rename from etc/plexreport_schedule.cron rename to root/opt/config/plexreport_schedule.cron index eb7ba07..598dde0 100644 --- a/etc/plexreport_schedule.cron +++ b/root/opt/config/plexreport_schedule.cron @@ -1,3 +1,3 @@ # Sends a weekly Plex Report email on Friday's at 10:30hrs. See http://www.adminschoice.com/crontab-quick-reference for cron help. -30 10 * * 5 docker exec plexReport plexreport -n -d &> /dev/null +30 10 * * 5 docker exec plexReport plexreport &> /dev/null diff --git a/Gemfile b/root/opt/gem/Gemfile similarity index 100% rename from Gemfile rename to root/opt/gem/Gemfile diff --git a/Gemfile.lock b/root/opt/gem/Gemfile.lock similarity index 100% rename from Gemfile.lock rename to root/opt/gem/Gemfile.lock diff --git a/bin/plexreport b/root/usr/local/sbin/plexreport old mode 100755 new mode 100644 similarity index 100% rename from bin/plexreport rename to root/usr/local/sbin/plexreport diff --git a/bin/plexreport-setup b/root/usr/local/sbin/plexreport-setup old mode 100755 new mode 100644 similarity index 100% rename from bin/plexreport-setup rename to root/usr/local/sbin/plexreport-setup diff --git a/lib/locales/de.yml b/root/var/lib/plexReport/locales/de.yml similarity index 95% rename from lib/locales/de.yml rename to root/var/lib/plexReport/locales/de.yml index 752564d..9e55b0a 100644 --- a/lib/locales/de.yml +++ b/root/var/lib/plexReport/locales/de.yml @@ -58,7 +58,7 @@ de: director: "Regie" from: "für" genre: "Genre" - help_page_sentence: "Ein Problem? Diese Seite gefällt Ihnen? Sie möchten helfen? Dann schauen Sie doch einmal auf meiner github-Seite vorbei!" + help_page_sentence: "Ein Problem? Diese Seite gefällt Ihnen? Sie möchten helfen? Dann schauen Sie doch einmal auf meiner github-Seite vorbei!" imdb_rating: "IMDB-Rating" minutes: "Minuten" network: "Sender" diff --git a/lib/locales/en.yml b/root/var/lib/plexReport/locales/en.yml similarity index 97% rename from lib/locales/en.yml rename to root/var/lib/plexReport/locales/en.yml index 42561fe..08fe657 100644 --- a/lib/locales/en.yml +++ b/root/var/lib/plexReport/locales/en.yml @@ -58,7 +58,7 @@ en: director: "Director" from: "from" genre: "Genre" - help_page_sentence: "Have an issue? Like what you see? Want to help? Then please check out my github page" + help_page_sentence: "Have an issue? Like what you see? Want to help? Then please check out my github page" imdb_rating: "IMDB Rating" minutes: "minutes" network: "Network" diff --git a/lib/locales/fr.yml b/root/var/lib/plexReport/locales/fr.yml similarity index 96% rename from lib/locales/fr.yml rename to root/var/lib/plexReport/locales/fr.yml index 226ecfd..00e1db7 100644 --- a/lib/locales/fr.yml +++ b/root/var/lib/plexReport/locales/fr.yml @@ -58,7 +58,7 @@ fr: director: "Réalisateur" from: "pour" genre: "Genre" - help_page_sentence: "Vous avez un problème ? Vous aimez ? Vous voulez aider ? Venez visiter la page github du projet" + help_page_sentence: "Vous avez un problème ? Vous aimez ? Vous voulez aider ? Venez visiter la page github du projet" imdb_rating: "Note IMDB" minutes: "minutes" network: "Chaine" diff --git a/lib/mailReport.rb b/root/var/lib/plexReport/mailReport.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/mailReport.rb rename to root/var/lib/plexReport/mailReport.rb diff --git a/lib/omdb.rb b/root/var/lib/plexReport/omdb.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/omdb.rb rename to root/var/lib/plexReport/omdb.rb diff --git a/lib/plex.rb b/root/var/lib/plexReport/plex.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/plex.rb rename to root/var/lib/plexReport/plex.rb diff --git a/lib/plexTv.rb b/root/var/lib/plexReport/plexTv.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/plexTv.rb rename to root/var/lib/plexReport/plexTv.rb diff --git a/lib/themoviedb.rb b/root/var/lib/plexReport/themoviedb.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/themoviedb.rb rename to root/var/lib/plexReport/themoviedb.rb diff --git a/lib/thetvdb.rb b/root/var/lib/plexReport/thetvdb.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/thetvdb.rb rename to root/var/lib/plexReport/thetvdb.rb From 4e656d35be5b15e6a2ff69186490de04e6160210 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Fri, 4 Nov 2016 13:51:52 -0700 Subject: [PATCH 58/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 687f165..247e150 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:0.9.19 +FROM phusion/baseimage:0.9.18 MAINTAINER ninthwalker # Set correct environment variables From 3068542a3295968532b1c3cc302e5a23a5cd9a8d Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Fri, 4 Nov 2016 14:20:28 -0700 Subject: [PATCH 59/78] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8277ee8..cb47a11 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,9 @@ https://github.com/ninthwalker/docker-templates/ After installing, run the following commands from the command line: (This initial_setup only has to be done once. Reinstalls of the docker do not require it) -`docker exec -it plexReport ./initial_setup.sh` + +`docker exec -it plexReport ./initial_setup.sh' + Follow Prompts. plexReport can be run with the following command from unraid: From 563555f29f554cc6fafef2e0501f010831425ca1 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Fri, 4 Nov 2016 14:21:01 -0700 Subject: [PATCH 60/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb47a11..5128ff2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ https://github.com/ninthwalker/docker-templates/ After installing, run the following commands from the command line: (This initial_setup only has to be done once. Reinstalls of the docker do not require it) -`docker exec -it plexReport ./initial_setup.sh' +`docker exec -it plexReport ./initial_setup.sh` Follow Prompts. From 7b5d4ede869a8dcea7e6ef86033877f2afb8603b Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Fri, 4 Nov 2016 14:25:23 -0700 Subject: [PATCH 61/78] Fix Executable --- root/initial_setup.sh | 0 root/usr/local/sbin/plexreport-setup | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/initial_setup.sh mode change 100644 => 100755 root/usr/local/sbin/plexreport-setup diff --git a/root/initial_setup.sh b/root/initial_setup.sh old mode 100644 new mode 100755 diff --git a/root/usr/local/sbin/plexreport-setup b/root/usr/local/sbin/plexreport-setup old mode 100644 new mode 100755 From a8efbaa1e1a136348ff8781ebedb9bc18b50a570 Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Fri, 4 Nov 2016 14:38:03 -0700 Subject: [PATCH 62/78] Fix Executable --- root/usr/local/sbin/plexreport | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/usr/local/sbin/plexreport diff --git a/root/usr/local/sbin/plexreport b/root/usr/local/sbin/plexreport old mode 100644 new mode 100755 From bbd39d666e723830b6add6e05174af65416e27b7 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Fri, 4 Nov 2016 14:41:26 -0700 Subject: [PATCH 63/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5128ff2..f275b0c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ plexReport A dockerized version of bstascavage's original plexReport (https://github.com/bstascavage/plexReport) ## Introduction -This docker generates an email summary of new additions to Plex to send to your ursers +This docker generates an email summary of new additions to Plex to send to your users ## Supported Platforms * unRAID, Other Linux From a1ef9171dfabee8a5413ca12cab17cfb64af0582 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Tue, 7 Mar 2017 18:36:19 -0800 Subject: [PATCH 64/78] Update plexreport --- root/usr/local/sbin/plexreport | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/root/usr/local/sbin/plexreport b/root/usr/local/sbin/plexreport index ab4abfe..4c3ae2e 100755 --- a/root/usr/local/sbin/plexreport +++ b/root/usr/local/sbin/plexreport @@ -380,6 +380,10 @@ def main mail.sendMail(template.result(binding)) + output = File.new("/config/plexreport.html","w") + output << template.result(binding) + output.close + $logger.info("Script complete. Ran in #{Time.now - startTime} seconds") end main() From 564bb92ef01b4ff15a4834e4372bca717f6c833f Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 11:09:53 -0800 Subject: [PATCH 65/78] Update plexreport --- root/usr/local/sbin/plexreport | 1 + 1 file changed, 1 insertion(+) diff --git a/root/usr/local/sbin/plexreport b/root/usr/local/sbin/plexreport index 4c3ae2e..1122489 100755 --- a/root/usr/local/sbin/plexreport +++ b/root/usr/local/sbin/plexreport @@ -380,6 +380,7 @@ def main mail.sendMail(template.result(binding)) + rm -f "/config/plexreport.html" output = File.new("/config/plexreport.html","w") output << template.result(binding) output.close From fd838deb63640a80861bee9ad95f537f3d6f11d9 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 11:30:35 -0800 Subject: [PATCH 66/78] Update plexreport --- root/usr/local/sbin/plexreport | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/usr/local/sbin/plexreport b/root/usr/local/sbin/plexreport index 1122489..e75e684 100755 --- a/root/usr/local/sbin/plexreport +++ b/root/usr/local/sbin/plexreport @@ -371,6 +371,7 @@ def main YAML.load_file('/config/config.yaml') template = ERB.new File.new("/config/email_body.erb").read, nil, "%" + webtemplate = ERB.new File.new("/config/web_email_body.erb").read, nil, "%" mail = MailReport.new($config, $options) if (movies.empty? && new_seasons.empty? && new_episodes.empty?) @@ -380,9 +381,8 @@ def main mail.sendMail(template.result(binding)) - rm -f "/config/plexreport.html" output = File.new("/config/plexreport.html","w") - output << template.result(binding) + output << webtemplate.result(binding) output.close $logger.info("Script complete. Ran in #{Time.now - startTime} seconds") From 6fa3fd640bab8c719cfa530255986a3edec49732 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 11:31:38 -0800 Subject: [PATCH 67/78] Create web_email_body.erb --- root/opt/config/web_email_body.erb | 458 +++++++++++++++++++++++++++++ 1 file changed, 458 insertions(+) create mode 100644 root/opt/config/web_email_body.erb diff --git a/root/opt/config/web_email_body.erb b/root/opt/config/web_email_body.erb new file mode 100644 index 0000000..bdccf2a --- /dev/null +++ b/root/opt/config/web_email_body.erb @@ -0,0 +1,458 @@ + + + + + + + + + +
+
+ + +
+
+ + +
+ + + + +
+

+ +
+
+
+ + + + + <% new_episodes.each do |episode| %> +
+ +
+

<%= $config['email']['title'] %>

+

<%= I18n.l Time.now.to_date, format: :long %>

+
+ + <% if movies != [] %> +

<%= I18n.t :new_movies %>:

+ + <% movies.each do |movie| %> +
+ +
+ + +
+
+ + + +
+
<%= movie[:title] %> (<%= movie[:date] %>)
+

<%= movie[:tagline] %>

+ <% if $options[:detail_email] %> +

<%= I18n.t :genre %>: <%= movie[:genre] %>
<%= I18n.t :director %>: <%= movie[:director] %>

<%= I18n.t :cast %>: <%= movie[:actors] %>

+ <% end %> +

<%= movie[:synopsis] %>

+ <% if $options[:detail_email] %> +

<%= I18n.t :runtime %>: <%= movie[:runtime] %> <%= I18n.t :minutes %>
<%= I18n.t :release_date %>: <%= movie[:released] %>

<%= I18n.t :rating %>: <%= movie[:rating] %>

<%= I18n.t :imdb_rating %>: <%= movie[:imdb_rating] %>/10 <%= I18n.t :from %> <%= movie[:imdb_votes] %> <%= I18n.t :users %>

+ <% else %> +

<%= I18n.t :runtime %>: <%= movie[:runtime] %> <%= I18n.t :minutes %>

+ <% end %> +
+ +
+ <% end %> + <% end %> + +

+ <% if new_episodes != [] %> +

<%= I18n.t :new_episodes %>:

+
+ +
+ + +
+
+ + + +
+
<%= episode[:series_name] %>
+

<%= episode[:episode_number] %> - <%= episode[:title] %>

+

<%= episode[:synopsis] %>

+

<%= I18n.t :network %>: <%= episode[:network] %>

+

<%= I18n.t :air_date %>: <%= episode[:airdate] %>

+
+ <% end %> + <% end %> + +

+ <% if new_seasons != [] %> +

<%= I18n.t :new_seasons %>:

+ <% new_seasons.each do |season| %> +
+ +
+ + +
+
+ + + +
+
<%= season[:series_name] %>
+

<%= I18n.t :seasons, count: season[:season].length %><%= season[:season].min %>-<%= season[:season].max %>

+

<%= season[:synopsis] %>

+

<%= I18n.t :network %>: <%= season[:network] %>

+
+
+ <% end %> + <% end %> + +
+ + +
+
+

<%= I18n.t :thanks_sentence %>

+
+
+
+ + + From 642d3250bc6e1a2439722795bc84900cb6f75122 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 11:34:03 -0800 Subject: [PATCH 68/78] Update plexreport-setup --- root/usr/local/sbin/plexreport-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/usr/local/sbin/plexreport-setup b/root/usr/local/sbin/plexreport-setup index 90a5470..e196ec3 100755 --- a/root/usr/local/sbin/plexreport-setup +++ b/root/usr/local/sbin/plexreport-setup @@ -102,7 +102,7 @@ class Setup self.setEmail File.open('/config/config.yaml', 'w') {|f| f.write $config.to_yaml } - puts "Writing information to /config/config.yaml" + puts "Writing information to config.yaml" end end From 974159d6379b270d5bc886b824f65232158b3c15 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 12:22:58 -0800 Subject: [PATCH 69/78] Create add_new_file.sh --- root/add_new_file.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 root/add_new_file.sh diff --git a/root/add_new_file.sh b/root/add_new_file.sh new file mode 100644 index 0000000..a26ecf5 --- /dev/null +++ b/root/add_new_file.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Added to check if new web_email_body.erb file exists, if not, add. +if [ -f /config/web_email_body.erb ]; then + echo # new line, do nothing +else + # copy new file + cp /opt/config/web_email_body.erb /config/ + chmod -R 666 /config/web_email_body.erb +fi From d30b3f92cfd1582aa79dab5b258201ba82fee006 Mon Sep 17 00:00:00 2001 From: Brent Allen Date: Wed, 8 Mar 2017 12:42:08 -0800 Subject: [PATCH 70/78] Add new web file --- root/add_new_file.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/add_new_file.sh diff --git a/root/add_new_file.sh b/root/add_new_file.sh old mode 100644 new mode 100755 From d70ca69095ccb384412ee43c077d5fbbb272ce5d Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 12:44:10 -0800 Subject: [PATCH 71/78] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 247e150..945afc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,8 @@ COPY root/ / usermod -u 99 nobody && \ usermod -g 100 nobody && \ usermod -d /home nobody && \ - chown -R nobody:users /home + chown -R nobody:users /home \ + /add_new_file.sh RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ From 4089d1f7ba8f79d5dadc33c9b5d9ebbd87e7f6c2 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 13:03:57 -0800 Subject: [PATCH 72/78] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 945afc6..70d97cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,18 +20,18 @@ COPY root/ / usermod -g 100 nobody && \ usermod -d /home nobody && \ chown -R nobody:users /home \ - /add_new_file.sh RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty-updates universe multiverse" && \ apt-get update -q && \ -apt-get install -qy ruby ruby-dev git make gcc inotify-tools && \ +apt-get install -qy ruby ruby-dev git make gcc && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ cd /opt/gem && \ gem install bundler -v 1.12.3 && \ -bundle install +bundle install \ +bash -c "/add_new_file.sh" VOLUME /config From d53752d4e3fecdf4eefda2348f38e6cd0da17e3c Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 13:48:18 -0800 Subject: [PATCH 73/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 70d97cb..f8f5889 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ cd /opt/gem && \ gem install bundler -v 1.12.3 && \ -bundle install \ +bundle install && \ bash -c "/add_new_file.sh" VOLUME /config From 291594f7bdd7bfb4ef53d15512799c9e0d0cfb70 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 14:01:40 -0800 Subject: [PATCH 74/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f8f5889..a7f2820 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ COPY root/ / usermod -u 99 nobody && \ usermod -g 100 nobody && \ usermod -d /home nobody && \ - chown -R nobody:users /home \ + chown -R nobody:users /home RUN \ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ trusty universe multiverse" && \ From 66ead9a03b8c180d3a805eb79d59eb7b7f0610cc Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 16:40:33 -0800 Subject: [PATCH 75/78] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7f2820..a13a714 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,9 @@ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ cd /opt/gem && \ gem install bundler -v 1.12.3 && \ -bundle install && \ -bash -c "/add_new_file.sh" +bundle install + +RUN /add_new_file.sh VOLUME /config From c2b0c7acc44efc4e1d70ec88ac62c04afc16632a Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 17:05:26 -0800 Subject: [PATCH 76/78] Update Dockerfile --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a13a714..65a29b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 # Use baseimage-docker's init system -CMD ["/sbin/my_init"] +CMD ["/sbin/my_init", "/add_new_file.sh"] #copy plexReport files COPY root/ / @@ -32,7 +32,5 @@ cd /opt/gem && \ gem install bundler -v 1.12.3 && \ bundle install -RUN /add_new_file.sh - VOLUME /config From f71be3defb67957c6095653a52cd475f6a2b92bc Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 17:44:25 -0800 Subject: [PATCH 77/78] Update Dockerfile --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65a29b4..8aa7733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,15 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 # Use baseimage-docker's init system -CMD ["/sbin/my_init", "/add_new_file.sh"] +CMD ["/sbin/my_init"] #copy plexReport files COPY root/ / +#add new web_email_body.erb +RUN mkdir -p /etc/my_init.d +ADD add_new_file.sh /etc/my_init.d/add_new_file.sh + # Configure user nobody to match unRAID's settings RUN \ usermod -u 99 nobody && \ From b128b0a3048499b4157345a4fff8127aec1b8587 Mon Sep 17 00:00:00 2001 From: ninthwalker Date: Wed, 8 Mar 2017 18:58:11 -0800 Subject: [PATCH 78/78] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8aa7733..9c98c9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ COPY root/ / #add new web_email_body.erb RUN mkdir -p /etc/my_init.d -ADD add_new_file.sh /etc/my_init.d/add_new_file.sh +ADD /root/add_new_file.sh /etc/my_init.d/add_new_file.sh # Configure user nobody to match unRAID's settings RUN \