Commit graph

67 commits

Author SHA1 Message Date
David Stephens
3886d012f8 Fix Mylar merge conflicts 2020-05-13 00:13:02 +01:00
David Stephens
dd16930490 Merge branch 'uTorrent-addition' of https://github.com/bcurran3/ansible-nas into bcurran3-uTorrent-addition
* 'uTorrent-addition' of https://github.com/bcurran3/ansible-nas:
  Changed GUID/PUID to root to match Transmission defaults
  homepage -> container
  add Docker homepage
  no real need to specify the UDP port as it should be the same as the TCP port
  no real need to specify the UDP port as it should be the same as the TCP port
  uTorrent add
  uTorrent add
  uTorrent add
  uTorrent add
  uTorrent add
  uTorrent add
  uTorrent add
2020-05-11 12:45:28 +01:00
David Stephens
eadfe38f2b Merge branch 'Krusader-addition' of https://github.com/bcurran3/ansible-nas into bcurran3-Krusader-addition
* 'Krusader-addition' of https://github.com/bcurran3/ansible-nas:
  added variables for PUID, GUID, secure or not, and default VNC password
  added variables for PUID, GUID, secure or not, and default VNC password
  Krusader add
  Krusader add
  Krusader add
  Krusader add
  Krusader add
  Krusader add
  Krusader add
2020-05-10 22:14:33 +01:00
David Stephens
7082f97dab Merge branch 'youtubedl-material-add' of https://github.com/bcurran3/ansible-nas into bcurran3-youtubedl-material-add
* 'youtubedl-material-add' of https://github.com/bcurran3/ansible-nas:
  fix subscriptions variable use
  fix spelling error
  change default dl location
  youtubedl-material add
  youtubedl-material add
  youtubedl-material add
  youtubedl-material add
  youtubedl-material add
  youtubedl-material add
  youtubedl-material add
2020-05-10 14:25:33 +01:00
David Stephens
07dd68ded0 Add Pytivo to traefik.toml 2020-05-09 23:04:21 +01:00
bcurran3
3498de18a3
Mylar addition 2020-05-02 16:00:06 -07:00
David Stephens
349b5efbf0 Merge branch 'Organizr---addition' of https://github.com/bcurran3/ansible-nas into bcurran3-Organizr---addition
* 'Organizr---addition' of https://github.com/bcurran3/ansible-nas:
  Update external organizr hostname
  "typo" (template) fix
  OOPS! Deleted plex.yml from project instead of from PR comment
  Plex transcode directory not supposed to be in this commit
  Plex transcode directory not supposed to be in this commit
  Organizr add
  Organizr add
  Organizr add
  Organizr add
  Organizr add
  Organizr add
  Organizer add
  Plex - add transcode directory volume
  Plex - variable to define transcode directory
2020-04-25 23:32:46 +01:00
David Stephens
d4ae0131d2
Update external organizr hostname 2020-04-25 23:30:35 +01:00
bcurran3
c346174f86
Organizr add 2020-04-24 21:08:50 -07:00
bcurran3
0c9b6b03b3
Krusader add 2020-04-22 23:42:14 -07:00
bcurran3
c6519c3108
youtubedl-material add 2020-04-22 23:10:58 -07:00
bcurran3
0f3d758915
uTorrent add 2020-04-22 22:44:32 -07:00
David Stephens
0993bed44c
Merge pull request #249 from bcurran3/patch-1
Use hostname defined in all.yml for main hostname in traefik template
2020-04-20 00:36:32 +01:00
David Stephens
0a9ea0da86 Lots of work on stats, including an awesome Ansible-NAS Grafana dashboard 2020-04-20 00:14:33 +01:00
bcurran3
5140a59683
Use hostname defined in all.yml for main hostname in traefik template
Change to use the defined hostname instead of hardcoded "ansible-nas"
2020-04-15 21:37:44 -07:00
Dale Larson
ee1fde0142 Add Gitlab to available AnsibleNAS packages. 2020-02-07 08:41:05 -06:00
David Stephens
cc78a2cebc Add virtual desktop support 2020-01-25 12:17:08 +00:00
David Stephens
719c6657e4 Add Serposcope SEO tracking 2020-01-20 22:26:07 +00:00
animeai
8807ba4057 map traefik 2020-01-16 05:19:15 +00:00
David Stephens
0cab8d8085 Fix merge conflict 2020-01-05 16:10:48 +00:00
David Stephens
7780748a2d Merge conflict... 2020-01-05 15:44:09 +00:00
David Stephens
b765ea95a0 Fix Ubooquity merge conflict 2020-01-05 15:06:04 +00:00
David Stephens
319c9b2309
Merge branch 'master' into master 2020-01-05 09:44:08 +00:00
David Stephens
cf86008b10
Template TimeMachine share name into avahi config 2019-12-16 17:44:03 +00:00
tyler
f94f94d5d0 add support for ombi 2019-11-20 20:28:11 -07:00
Jesse
af4671e2b2 adding ubooquity 2019-11-19 13:13:15 -05:00
David Stephens
b61052a7c1 Fix merge conflict 2019-10-20 23:24:07 +01:00
David Stephens
c3a27b0122 Merge branch 'samba-timemachine' of git://github.com/ryanolf/ansible-nas into ryanolf-samba-timemachine
* 'samba-timemachine' of git://github.com/ryanolf/ansible-nas:
  Fixed typo in time machine doc and added more detail
  Updated time machine documentation
  Changed timemachine data directory to be consistent with old AFP-based timemachine task
  Reverted unrelated change to tasks/users.yml
  Changed timemachine to use samba instead of netatalk, consistent with current standard
  Changed ansible-nas user to nologin shell
2019-10-20 22:13:58 +01:00
David Stephens
4fd2f84c3f Fix merge conflicts 2019-10-19 22:38:30 +01:00
Ryan Olf
90ca36857f Merge branch 'master' into samba-timemachine 2019-10-19 13:24:38 -07:00
David Stephens
30b20768fe Fix merge conflict 2019-10-19 17:30:47 +01:00
Koldo Aingeru
7903648129 lidarr support 2019-10-16 19:58:37 +02:00
Koldo Aingeru
6ce13ad645 update upstream 2019-10-16 19:04:06 +02:00
Koldo Aingeru
9b5b28a2e2 update from upstream 2019-10-16 19:02:03 +02:00
David Stephens
373783144e Fix merge conflicts 2019-10-15 22:15:43 +01:00
badcrc
5ebafba6b6
Merge branch 'master' into cloudcmd 2019-10-14 17:06:36 +02:00
David Stephens
5691d32f39 Fix nas.yml merge conflict 2019-10-14 11:43:38 +01:00
David Stephens
8f6bd6871a Fix Home Assistant merge smash 2019-10-13 23:08:41 +01:00
Koldo Aingeru
7f73907f7e cloud commander support 2019-10-05 12:53:49 +02:00
Jeroen Brons
58a2be31e2
Merge branch 'master' into master 2019-10-04 10:02:44 +02:00
Koldo Aingeru
d91f62bf7a Bazarr support 2019-09-25 21:07:13 +02:00
Milan Jubitz
86fe360945 The code part of the changes, docs to follow 2019-08-31 23:10:51 +02:00
Jesse
379d04ffed adding jellyfin 2019-08-27 08:58:00 -04:00
Ryan Olf
f8ce85c319 Merge branch 'master' into samba-timemachine 2019-08-25 17:06:04 -07:00
Ryan Olf
8e5fb6f827 Changed timemachine to use samba instead of netatalk, consistent with current standard
Apple deprecated netatalk and prefers samba/smb for timemachine (with some extensions).
This update uses awls/samba-timemachine to create a dedicated samba instance for timemachine,
and then sets up the appropriate service in avahi so timemachine is discovered properly.
2019-08-25 16:04:08 -07:00
CherryKitten
e9ce59f44b Add openHAB to traefik.toml 2019-08-13 14:43:26 +02:00
Sam Maes
c680dbcb06 Add Home Assistant 2019-07-23 20:13:59 +00:00
Jeroen Brons
c5df2788c1 fixing traefik.toml and vagrantfile 2019-06-24 15:22:26 +02:00
Jeroen Brons
3357308e3e Revert "Update traefik.toml"
This reverts commit cd5fb1bfd6.
2019-06-24 15:13:20 +02:00
David Stephens
c7ec25c4b8
Merge pull request #91 from ripps818/pyload
Add pyLoad
2019-06-22 17:26:58 +01:00