Merge pull request Cloudbox#230 from Cloudbox/develop

Develop

Author: desimaniac

.gitignore

@@ -6,10 +6,14 @@
 /rclone.conf
 /backup_config.yml
 /backup_excludes_list.txt
-/backup.lock
-/cloudbox.retry
 /*.log
 
+# Ansible
+/backup.lock
+/cloudbox.retry
 
 # MacOS
 .DS_Store
+
+# Python
+*.pyc

CHANGELOG.md

@@ -1,8 +1,9 @@
 ## Contributing
 
 1. Fork it.
-1. Clone your forked project: `git clone http://github.com/<your_name>/cloudbox`
-1. Create a feature branch off of the develop branch: `git checkout -b my-new-feature develop`
+1. Clone your forked project on your devbox: `git clone http://github.com/<your_name>/cloudbox`
+1. Create a feature branch off of the develop branch: `git checkout -b 'feature/my-new-feature' develop`
+1. Keep up to date with latest develop branch changes: `git pull --rebase upstream develop`. <--- Do this often, especially before commiting changes and submitting a PR.
 1. Commit your changes: `git commit -am 'Added some feature'`
-1. Push to the branch: `git push origin my-new-feature`
-1. Submit a pull request to develop branch.
+1. Push to the branch: `git push origin feature/my-new-feature`
+1. Submit a pull request (PR) to the develop branch.

CONTRIBUTING.md

@@ -3,19 +3,21 @@
 ### Developers
 
 * [l3uddz](https://github.com/l3uddz) - Creator of Cloudbox, Plex Autoscan, Cloudplow, Traktarr, Plex Dupefinder, Plex Patrol, Arrpush, and others.
-* [Desimaniac](https://github.com/Desimaniac) - Cloudbox; Cloudbox Wiki; Documentation for Plex Autoscan, Cloudplow, and Traktarr.
+* [desimaniac](https://github.com/desimaniac) - Cloudbox; Cloudbox Wiki; Documentation for Plex Autoscan, Cloudplow, and Traktarr.
 
 ### Contributors
 
 * [EnorMOZ](https://github.com/EnorMOZ) - Cloudbox.
-* [Horjulf](https://github.com/horjulf) - ruTorrent + autodl Docker Image (creator); Plex Autoscan; Traktarr, Plex Patrol, Arrpush, and others.
-* [RXWatcher](https://github.com/RXWatcher1) - Cloudbox.
-* [Vuur](https://github.com/vuur) -  Web Design; Admin of GitHub, Discord, and Reddit.
+* [horjulf](https://github.com/horjulf) - Forked version of LSIO ruTorrent Docker image with autodl-irssi (creator); Plex Autoscan; Traktarr, Plex Patrol, Arrpush, and others.
+* [RXWatcher1](https://github.com/RXWatcher1) - Cloudbox.
+* [Vuur](https://github.com/vuur) -  Web Design.
 * [TheBradz](https://github.com/TheBradz) - Cloudbox; Cloudbox Wiki.
-* [Kasper56](https://github.com/After-Shock) - Cloudbox Wiki.
+* [Kasper56](https://github.com/After-Shock) - Cloudbox Wiki. Admin on Discord.
 * [Hotio](https://gitlab.com/hotio) - Suitarr Docker Image (creator).
 * [Mitchell Klijs](https://github.com/mitchellklijs) - Traktarr; Cloudplow.
+* [davemaster223](https://github.com/daghaian) - Traktarr; Cloudplow.
 * [MZA](https://github.com/mza921) - Plex Autoscan.
+* [andrewkhunn](https://github.com/andrewkhunn) - Forked version of Suitarr Docker image with Sickbeard MP4 Automator (creator).
 
 
 ### Dependencies

CREDITS.md

@@ -3,8 +3,8 @@
 <br /><br />
 [![Website](https://img.shields.io/badge/Website-https%3A%2F%2Fcloudbox.works-blue.svg?colorB=177DC1&label=Website)](https://cloudbox.works)
 [![Wiki](https://img.shields.io/badge/Wiki-http%3A%2F%2Fcloudbox.wiki-blue.svg?colorB=177DC1&label=Wiki)](http://cloudbox.wiki)
-[![Reddit](https://img.shields.io/badge/Reddit-%2Fr%2Fcloudbox-blue.svg?colorB=177DC1&label=Reddit)](https://reddit.com/r/Cloudbox)
 [![Discord](https://img.shields.io/discord/381077432285003776.svg?colorB=177DC1&label=Discord)](https://discord.io/cloudbox)
+[![Reddit](https://img.shields.io/badge/Reddit-%2Fr%2Fcloudbox-blue.svg?colorB=177DC1&label=Reddit)](https://reddit.com/r/Cloudbox)
 [![Feature Requests](https://img.shields.io/badge/Requests-Feathub-blue.svg?colorB=177DC1&label=Requests)](https://feathub.com/Cloudbox/Cloudbox)
 [![Beerpay](https://beerpay.io/Cloudbox/Cloudbox/badge.svg?style=flat)](https://beerpay.io/Cloudbox/Cloudbox)
 [![Beerpay](https://beerpay.io/Cloudbox/Cloudbox/make-wish.svg?style=flat)](https://beerpay.io/Cloudbox/Cloudbox)
@@ -50,29 +50,10 @@ Featured Applications:
 
 ***
 
-If you find this project helpful, feel free to make a small donation to the developers:
-
-
-- [l3uddz](https://github.com/l3uddz) (creator)
-
-  - [Monzo](https://monzo.me/jamesbayliss9): Credit Card, Apple Pay, Google Pay
-
-  - [Beerpay](https://beerpay.io/Cloudbox/Cloudbox): Credit Card, BTC
-
-  - [Paypal: [email protected]](https://www.paypal.me/l3uddz)
-
-  - BTC: 3CiHME1HZQsNNcDL6BArG7PbZLa8zUUgjL
-
-- [desimaniac](https://github.com/Desimaniac) (developer)
-
-  - [Square Cash](https://cash.me/$desimaniac): Credit Card
-
-  - [Beerpay](https://beerpay.io/Cloudbox/Cloudbox): Credit Card, BTC
-
-  - [Paypal: [email protected]](https://www.paypal.me/desimaniac123)
-
-  - BTC: 3Jz922kDLQwjnFh986igeEmc72c8Hh5T3Y
+If you find this project helpful, feel free to make a small donation to the developers.
 
-  - LTC: MD2gTjR3Mur2pHZxo1cku3i9U8SuDU8k2B
 
-  - ETH: 0xE50B388Aa66593153801e4ff99bA23737c888BF9
+|  Developers  | Roles | Donation Methods   |
+|:---|:---|:---|
+| [l3uddz](https://github.com/l3uddz) | creator, developer | [Beerpay](https://beerpay.io/Cloudbox/Cloudbox), [Paypal ([email protected])](https://www.paypal.me/l3uddz), [Monzo](https://monzo.me/jamesbayliss9) (Apple Pay, Google Pay), [BTC](https://en.cryptobadges.io/donate/3CiHME1HZQsNNcDL6BArG7PbZLa8zUUgjL)
+| [desimaniac](https://github.com/desimaniac) | developer | [Beerpay](https://beerpay.io/Cloudbox/Cloudbox), [Paypal ([email protected])](https://www.paypal.me/desimaniac123), [Square Cash](https://cash.me/$desimaniac), [BTC](https://en.cryptobadges.io/donate/3Jz922kDLQwjnFh986igeEmc72c8Hh5T3Y), [ETH](https://en.cryptobadges.io/donate/0xE50B388Aa66593153801e4ff99bA23737c888BF9)|

README.md

@@ -6,30 +6,45 @@ skip_tags: true
 skip_commits:
   files:
     - '*.md'
-    - '*.yml.default'
+    - 'defaults/*'
     - 'roles/*/files/*'
   message: /\[minor\]/
 
 image: ubuntu
 
-environment:
-  CLOUDBOX_FOLDER: "/home/appveyor/projects/cloudbox/"
+matrix:
+  fast_finish: true
+
+# to disable automatic builds
+build: off
 
 init:
   - sh: curl -s https://cloudbox.works/dep.sh | sudo -H sh
 
 install:
-  - sh: cd ${CLOUDBOX_FOLDER}
-  - sh: TAG_VERSION=$(curl --silent "https://api.github.com/repos/${APPVEYOR_REPO_NAME}/releases/latest" | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c 2-)
-  - sh: BUILD_NUMBER=$(git rev-list $(git rev-list --tags --no-walk --max-count=1)..HEAD --count)
-  - sh: appveyor UpdateBuild -Version "${TAG_VERSION}-${BUILD_NUMBER}"
   - sh: git submodule update --init --recursive
-  - sh: cp -n defaults/ansible.cfg.default ansible.cfg; cp -n defaults/accounts.yml.default accounts.yml; cp -n defaults/settings.yml.default settings.yml; cp -n defaults/adv_settings.yml.default adv_settings.yml; cp -n defaults/backup_config.yml.default backup_config.yml
+  - sh: for i in defaults/*; do cp -n $i "$(basename "${i%.*}")"; done
   - sh: sudo ansible-playbook cloudbox.yml --syntax-check
   - sh: sudo ansible-playbook cloudbox.yml --tags "cloudbox" --skip-tags "settings" --extra-vars '{"continuous_integration":true}'
 
-matrix:
-  fast_finish: true
+# https://boblokerse.github.io/2015/11/03/GitVersion-versioning-made-easy-and-dry/
+on_finish:
+  - ps: |
+      function gitVersion() {
+        $env:newhash=git rev-parse HEAD
+        $env:shorthash=git rev-parse --short HEAD
 
-# to disable automatic builds
-build: off
+        $env:gitCommits=git describe --tags $env:APPVEYOR_REPO_BRANCH | %{$_.split('-')[1]}
+        $gitVersion=git describe --tags --abbrev=0 $env:APPVEYOR_REPO_BRANCH
+        $env:newVersion="$gitVersion-$env:gitCommits"
+        $env:appveyor_info_version="$env:newVersion-$env:APPVEYOR_REPO_BRANCH"
+
+        $env:appveyor_build_version="$env:newVersion"
+        appveyor UpdateBuild -Version "$env:newVersion"
+
+        write-host "Using hash for build version: $env:newhash"
+        write-host "Update appveyor build version to: $env:appveyor_build_version"
+        write-host "Update appveyor info version to: $env:appveyor_info_version"
+      }
+
+      gitVersion

appveyor.yml

@@ -9,13 +9,15 @@
     - { role: sanity_check }
     - { role: settings, tags: ['always', 'settings'] }
     - { role: pre_tasks }
-    - { role: kernel, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'kernel'] }
-    - { role: pre_install, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
     - { role: backup, tags: ['backup'] }
     - { role: restore, tags: ['restore'] }
+    - { role: user, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'user'] }
+    - { role: shell, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'], 'shell' }
+    - { role: kernel, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'kernel'] }
+    - { role: pre_install, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
     - { role: system, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'system'] }
-    - { role: motd, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'motd'] }
     - { role: common, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'common'] }
+    - { role: motd, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'motd'] }
     - { role: docker, tags: ['core', 'cloudbox', 'mediabox', 'feederbox', 'docker'] }
     - { role: plexdrive, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
     - { role: unionfs, tags: ['core', 'cloudbox', 'mediabox', 'feederbox'] }
@@ -29,20 +31,22 @@
     - { role: portainer, tags: ['cloudbox', 'feederbox', 'portainer'] }
     - { role: organizr, tags: ['cloudbox', 'feederbox', 'organizr'] }
     - { role: cloudplow, tags: ['cloudbox', 'feederbox', 'cloudplow'] }
-    - { role: nzbget, tags: ['cloudbox', 'feederbox', 'nzbget'], when: [ 'nzbs' ] }
-    - { role: rutorrent, tags: ['cloudbox', 'feederbox', 'rutorrent'], when: [ 'torrents' ] }
-    - { role: jackett, tags: ['cloudbox', 'feederbox', 'jackett'], when: [ 'torrents' ] }
-    - { role: nzbhydra2, tags: ['cloudbox', 'feederbox', 'nzbhydra2'] }
+    - { role: nzbget, tags: ['cloudbox', 'feederbox', 'nzbget'], when: ['run_nzbs'] }
+    - { role: rutorrent, tags: ['cloudbox', 'feederbox', 'rutorrent'], when: ['run_torrents'] }
+    - { role: jackett, tags: ['cloudbox', 'feederbox', 'jackett'], when: ['run_torrents'] }
+    - { role: nzbhydra2, tags: ['cloudbox', 'feederbox', 'nzbhydra2'], when: ['run_nzbs or run_torrents'] }
     - { role: sonarr, tags: ['cloudbox', 'feederbox', 'sonarr'] }
     - { role: radarr, tags: ['cloudbox', 'feederbox', 'radarr'] }
-    - { role: sickbeard_mp4_automator, tags: ['cloudbox', 'feederbox', 'sickbeard_mp4_automator', 'sma'], when: ['sma_enabled'] }
     - { role: lidarr, tags: ['cloudbox', 'feederbox', 'lidarr'] }
+    - { role: sickbeard_mp4_automator, tags: ['cloudbox', 'feederbox', 'sickbeard_mp4_automator', 'sma'], when: ['sma_enabled'] }
     - { role: feeder-mount, tags: ['feeder-mount'] }
     - { role: feeder-dismount, tags: ['feeder-dismount'] }
+    - { role: plex_auth_token, tags: ['plex_auth_token'] }
     - { role: watchtower, tags: ['watchtower'] }
     - { role: plexrequests, tags: ['plexrequests'] }
     - { role: resilio-sync, tags: ['resilio-sync'] }
     - { role: nextcloud, tags: ['nextcloud'] }
+    - { role: mariadb, tags: ['mariadb'] }
     - { role: emby, tags: ['emby'] }
     - { role: nzbhydra, tags: ['nzbhydra'] }
     - { role: traktarr, tags: ['traktarr'] }
@@ -62,3 +66,4 @@
     - { role: sabnzbd, tags: ['sabnzbd'] }
     - { role: nginx, tags: ['nginx'] }
     - { role: organizrv1, tags: ['organizrv1'] }
+    - { role: nzbthrottle, tags: ['nzbthrottle'] }

cloudbox.yml

@@ -1,15 +1,13 @@
 ---
-install:
-  auto_restart: yes
-kernel:
-  version: default
 plex:
   open_port: no
   force_auto_adjust_quality: no
   force_high_output_bitrates: no
   db_cache_size: default
 suitarr:
   version: default
+emby:
+  version: latest
 organizr:
   direct_domain: no
 nginx:

defaults/adv_settings.yml.default

@@ -1,13 +1,13 @@
 ---
 local:
-  keep_local_copy: true
-  destination: /home/{{user}}/Backups/
+  enable: yes
+  destination: /home/{{user}}/Backups/Cloudbox
 rclone:
-  enabled: false
-  destination: google:/Backups
+  enable: yes
+  destination: google:/Backups/Cloudbox
 rsync:
-  enabled: false
-  dest: rsync://somehost.com/Backups
+  enable: no
+  dest: rsync://somehost.com/Backups/Cloudbox
 cron:
   cron_time: weekly
   cron_state: absent

defaults/backup_config.yml.default

@@ -8,7 +8,7 @@ rutorrent:
   downloads:
 plex:
   tag: public
-  transcodes: /home/{{user}}/transcodes
+  transcodes: /mnt/local/transcodes
 rclone:
   version: latest
 shell: zsh

defaults/settings.yml.default

@@ -1,6 +1,6 @@
 #########################################################################
 # Title:         Cloudbox: Backup Excludes List                         #
-# Author(s):     Desimaniac                                             #
+# Author(s):     desimaniac                                             #
 # URL:           https://github.com/Cloudbox/Cloudbox                   #
 # --                                                                    #
 #         Part of the Cloudbox project: https://cloudbox.works          #
@@ -14,7 +14,7 @@
 ./cloudplow/cloudplow.log.*
 ./cloudplow/locks/*
 
-./lidarr/app/MediaCover/*
+./lidarr/app/logs/*
 
 ./plex/Library/Application Support/Plex Media Server/Cache/PhotoTranscoder/*
 ./plex/Library/Application Support/Plex Media Server/Cache/Transcode/*
@@ -30,13 +30,9 @@
 ./plexpy/logs/*
 
 ./radarr/app/logs/*
-./radarr/app/MediaCover/*
 
 ./radarr4k/app/logs/*
-./radarr4k/app/MediaCover/*
 
 ./sonarr/app/logs/*
-./sonarr/app/MediaCover/*
 
 ./sonarr4k/app/logs/*
-./sonarr4k/app/MediaCover/*

roles/backup/files/backup_excludes_list.txt

@@ -1,6 +1,6 @@
 #########################################################################
 # Title:         Backup: Cron Tasks                                     #
-# Author(s):     Desimaniac                                             #
+# Author(s):     desimaniac                                             #
 # URL:           https://github.com/cloudbox/cloudbox                   #
 # --                                                                    #
 #         Part of the Cloudbox project: https://cloudbox.works          #