Skip to content

Commit

Permalink
some updates
Browse files Browse the repository at this point in the history
  • Loading branch information
MrDoobPG authored and MrDoobPG committed Aug 31, 2019
1 parent 103d5e8 commit 040f90b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
13 changes: 10 additions & 3 deletions menu/functions/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -428,10 +428,17 @@ pythonstart() {
}

dockerinstall() {
ospgversion=$(cat /var/plexguide/os.version)
if [ "$ospgversion" == "debian" ]; then

fullrel=$(lsb_release -sd)
osname=$(lsb_release -si)
relno=$(lsb_release -sr)
relno=$(printf "%.0f\n" "$relno")
hostname=$(hostname -I | awk '{print $1}')
# add repo

if [ $osname == "Debian" 2>&1 >> /dev/null ] ; then
ansible-playbook /opt/plexguide/menu/pg.yml --tags dockerdeb
else
elif [ $osname == "Ubuntu" 2>&1 >> /dev/null ]; then
ansible-playbook /opt/plexguide/menu/pg.yml --tags docker
# If Docker FAILED, Emergency Install
file="/usr/bin/docker"
Expand Down
1 change: 1 addition & 0 deletions menu/motd/20-sysinfo
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ PROCESS_USER=$(echo "$PROCESS" | grep -v root | awk {'print $2'} | awk '{ SUM +=
PROCESSOR_NAME=$(grep "model name" /proc/cpuinfo | cut -d ' ' -f3- | awk {'print $0'} | head -1)
PROCESSOR_COUNT=$(grep -ioP 'processor\t:' /proc/cpuinfo | wc -l)
IP_ADDRESS=$(ip a | grep glo | awk '{print $2}' | head -1 | cut -f1 -d/)

W="\e[0;39m"
G="\e[1;32m"

Expand Down
3 changes: 0 additions & 3 deletions menu/motd/motd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
- name: Disable existing MOTD
shell: chmod -x /etc/update-motd.d/*

# - name: Enable update messages
# shell: chmod +x /etc/update-motd.d/9*

- name: Deploy Dynamic MOTD
file:
path: /etc/update-motd.d
Expand Down
2 changes: 1 addition & 1 deletion menu/roles/dockerdeb/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

- name: Official Repo
apt_repository:
repo: 'deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} edge'
repo: 'deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable'
register: apt_docker_repositories
when: switch == "on"

Expand Down

0 comments on commit 040f90b

Please sign in to comment.