81 Commits

Author SHA1 Message Date
j0nnymoe
6c25aaf6f4 Merge pull request #24 from linuxserver/expose_smokeping.conf
expose smokeping.conf to allow user customisations for RP etc
56 55 54 53
2017-05-07 16:21:43 +01:00
sparklyballs
000c5fe5f2 expose smokeping.conf in /config/site-confs to allow user customisations for RP etc 2017-05-07 14:53:41 +01:00
Neil
fd5f2b0962 Merge pull request #23 from linuxserver/sed_in_place
Sed in place
52 51 50 49 48
2017-04-13 02:05:08 +01:00
sparklyballs
fc03e3d34b consolidate layers 2017-04-12 23:49:39 +01:00
sparklyballs
3eeec9688b sed in place 2017-04-12 23:44:04 +01:00
sparklyballs
cf140e9a03 Merge pull request #22 from nibbledeez/master
Fix path to cropper.js
47
2017-04-12 23:41:42 +01:00
nibbledeez
2944ee8d97 Smart sed line 2017-04-12 22:26:26 +01:00
nibbledeez
a56d6b777b Fix path to cropper.js
Allows ability to click-drag to zoom on the graphs
2017-04-11 13:35:04 +01:00
sparklyballs
f2975162df fix formatting markdown README 46 45 44 43 2017-03-15 17:27:18 +00:00
Neil
65fdafedb5 Merge pull request #19 from linuxserver/3.5
rebase to alpine 3.5
42 41 40 39 38 37
2017-02-09 17:56:08 +00:00
sparklyballs
9c6a51ee72 rebase to alpine 3.5 2017-02-09 17:26:04 +00:00
Neil
12d75126fc Merge pull request #12 from linuxserver/linting
implement linting recommendations
36 34 33 32 31 30 29 28 27 26 25 24 23 22 21 20 19
2016-10-30 20:05:30 +00:00
sparklyballs
fc67922661 implement linting recommendations 2016-10-30 18:25:43 +00:00
sparklyballs
d933e5b852 Update README.md 18 17 16 15 2016-10-20 23:46:30 +01:00
aptalca
c681c0fd68 Merge pull request #11 from linuxserver/dejavu-font
add ttf-dejavu package
14
2016-10-17 16:05:07 -04:00
sparklyballs
91809fd45c add extra parameters info to README 2016-10-17 21:02:28 +01:00
sparklyballs
eb2566524a add ttf-dejavu package 2016-10-17 20:42:36 +01:00
sparklyballs
01c4fdb0d5 update media links README 13 12 2016-10-07 10:31:47 +01:00
sparklyballs
957e55287a update image link 2016-10-05 12:15:53 +01:00
sparklyballs
621dd6849a add .ignores and templates 11 10 9 2016-09-17 02:56:48 +01:00
sparklyballs
a91520db4d Merge pull request #10 from linuxserver/microbadger
add layer badge to README
8
2016-09-10 10:45:37 +01:00
sparklyballs
c722d01227 add layer badge to README 2016-09-10 10:42:27 +01:00
j0nnymoe
a1f71a9dfd Merge pull request #9 from sparklyballs/add-curl
add curl package
7
2016-09-06 08:08:19 +01:00
sparklyballs
771b76ab10 badges on one line 2016-09-05 13:03:24 +01:00
sparklyballs
0bf5efb47a add curl package 2016-09-05 12:23:22 +01:00
sparklyballs
abdd536a74 Merge pull request #6 from sparklyballs/badges
add badges to README
6
2016-08-28 01:07:41 +01:00
sparklyballs
c6ad78e2de add badges to README 2016-08-28 01:05:31 +01:00
sparklyballs
dc48b8dda7 Merge pull request #3 from sparklyballs/alpine
Alpine
5
2016-08-04 13:35:12 +01:00
sparklyballs
75f00a623e revert the config copy routine, was replacing existing files 2016-07-25 18:25:25 +01:00
sparklyballs
a9446f53b6 change path for webui 2016-07-25 14:11:56 +01:00
sparklyballs
98a56f3d09 last tweak of config copy 2016-07-25 13:44:20 +01:00
sparklyballs
77a31d58c6 tweak config copy routine 2016-07-25 13:25:20 +01:00
sparklyballs
1f822a7026 improved copy config routine 2016-07-25 12:41:48 +01:00
sparklyballs
4598b9b5eb add alpine setup 2016-07-25 09:22:11 +01:00
sparklyballs
691ccbd861 spaces on readme 2016-07-25 09:19:53 +01:00
sparklyballs
7a5cd58724 readme edits and refresh 2016-07-25 09:18:00 +01:00
j0nnymoe
de9a521026 Merge pull request #2 from sparklyballs/apt-fix-bandaid
Apt fix bandaid
4
2016-07-23 15:13:44 +01:00
sparklyballs
729658be59 fix formatting of README 2016-07-23 14:49:40 +01:00
sparklyballs
e8dfe65b48 bandaid fix for apt 2016-07-23 14:47:26 +01:00
sparklyballs
434567d14d Update Dockerfile 3 2 1 2015-08-06 09:02:55 +01:00
Sean Dion
e018b9f6b1 update baseimage 2015-07-30 11:20:22 -05:00
Alex Kretzschmar
112baf5b5e Merge branch 'master' of github.com:linuxserver/smokeping
Conflicts:
	Targets
2015-07-15 15:52:43 +01:00
Alex Kretzschmar
2891ef8a20 Added extra hosts to default Targets 2015-07-15 15:50:23 +01:00
krunchyal
0c823f4d93 Merge pull request #1 from sparklyballs/master
checked over the commits, they seem good.
2015-07-07 15:14:16 +01:00
sparklyballs
9961eeca2d fix up init order and permissions for data folder 2015-07-07 15:05:20 +01:00
sparklyballs
8d11960eed remove extraneous references to php.ini 2015-07-07 14:43:32 +01:00
sparklyballs
27fc186b1d fix up ssmtp and apache run as www-data 2015-07-07 14:38:06 +01:00
Stian Larsen
e683c57c99 Added a note about version and beta 2015-06-29 12:44:46 +02:00
Stian Larsen
927c8a8427 Its port 80 that needs to be exposed not 8080 2015-06-29 12:43:22 +02:00
Stian Larsen
469754967b No reason to restart. 2015-06-29 12:42:12 +02:00