Commit graph

44 commits

Author SHA1 Message Date
Alexander Weidinger
f3345b1f66 Added pillar.example docs for PR #12 2018-04-27 22:15:46 +02:00
Alexander Weidinger
99d0f18951 Merge branch 'sitepoint-sitepoint' 2018-04-27 22:10:40 +02:00
Alexander Weidinger
4268773915 Merge branch 'sitepoint' of git://github.com/sitepoint/apt-cacher-formula into sitepoint-sitepoint 2018-04-27 22:07:55 +02:00
Alexander Weidinger
ab5e96800e Merge branch 'heimdull-master' 2018-04-27 21:56:03 +02:00
Alexander Weidinger
c4efef8861 Allow specification of HTTPS proxy; default: DIRECT 2018-04-27 21:55:44 +02:00
Niels Abspoel
9847b2c1b5
Merge pull request #15 from saltstack-formulas/ignore-https
ng.client: don't cache https://
2018-04-27 14:40:05 +02:00
Niels Abspoel
b6e402e699
Merge pull request #14 from saltstack-formulas/default-passwords-are-evil
Drop default AdminAuth
2018-04-27 14:39:39 +02:00
Alexander Weidinger
70963ac790 ng.client: don't cache https:// 2018-04-27 13:39:12 +02:00
Alexander Weidinger
00efeecd78 Drop default AdminAuth 2018-04-27 13:09:02 +02:00
Alexander Weidinger
7714f45b2f Revert "Drop default AdminAuth"
This reverts commit e4d1e7de10.
Sry, I was on the wrong branch.
2018-04-27 13:08:19 +02:00
Alexander Weidinger
e4d1e7de10 Drop default AdminAuth 2018-04-27 13:07:56 +02:00
Freddy Andersen
15d4be9806 typo 2017-01-23 07:53:20 -08:00
Freddy Andersen
f7b957bf5e adding ability to enable/disable https apt repositories 2017-01-23 07:36:11 -08:00
Adam Bolte
9243cf8a38 Minor formatting fix in ng server state sls 2016-12-05 11:06:31 +11:00
Adam Bolte
ba5262c0b6 Have ng server use require directive from pillar 2016-12-05 11:05:43 +11:00
Forrest
03d82da02d Merge pull request #11 from sitepoint/require_in_support
Support include and require_in pillar options.
2016-11-02 18:33:15 -07:00
Adam Bolte
02390fe49e Support include and require_in pillar options. 2016-11-03 10:48:46 +11:00
puneet kandhari
0baeeb3faa Merge pull request #10 from jpic/server_extra_config
Allow the user to add extra server config
2015-09-25 09:55:59 -05:00
jpic
f3932009e5 Allow the user to add extra server config 2015-09-25 16:45:25 +02:00
Nitin Madhok
4dc8314d2d Merge pull request #7 from qbcode/master
Fix typo in template 01proxy
2014-12-22 06:35:41 -05:00
Jimmy Tang
3f605b9e20 Fix typo in template 01proxy
The key is always null and thus localhost is always used no matter
way. This correction lets users specify the apt-cacher host.
2014-12-22 11:26:48 +00:00
Wolodja Wentland
b1d7ca1094 Merge pull request #6 from saltstack-formulas/style-short-dec
Change states to use short-dec style
2014-12-13 08:09:48 +00:00
Seth House
7f2436b712 Change states to use short-dec style 2014-12-13 00:19:58 -07:00
Nitin Madhok
bbb6c6b270 Merge pull request #5 from Kenshir0/mkdirs
Use makedirs for server_cache_dir and server_log_dir
2014-11-28 00:08:03 -05:00
Kenshir0
774f20b3bf Use makedirs for server_cache_dir and server_log_dir 2014-11-27 23:38:31 +01:00
Nitin Madhok
b4ce9009c1 Merge pull request #4 from fessoga5/master
Add support pillar attr for apt-cacher
2014-09-04 00:21:17 -04:00
root
3de3ac23bb Add support pillar attr for apt-cacher 2014-09-04 13:18:34 +09:00
Nitin Madhok
6b105e5881 Update README.rst 2014-07-30 13:39:17 -04:00
Nitin Madhok
db08c67956 Update README.rst
Fix broken link
2014-07-28 19:11:12 -04:00
Forrest
5f5bf52751 Merge pull request #3 from Kenshir0/acng_integration
Add apt-cacher-ng states to apt-cacher-formula
2014-07-06 19:49:30 -07:00
Kenshir0
0bb9b25cb9 Add apt-cacher-ng states 2014-07-07 01:27:51 +02:00
Forrest
9dab2d34af Merge pull request #2 from MadRussian/master
Updated the README.rst to follow a better layout
2014-01-05 15:16:55 -08:00
Nodar Nutsubidze
9631e20fce Update README.rst 2014-01-05 17:15:46 -06:00
Nodar Nutsubidze
da4b2ee89c Update README.rst 2014-01-05 17:14:39 -06:00
Nodar Nutsubidze
c6f45cb988 Updated the README to follow a better layout 2014-01-05 17:09:09 -06:00
Forrest
73b3f07e8a Merge pull request #1 from MadRussian/master
Pull request for initial apt-cacher-formula
2014-01-05 14:59:09 -08:00
Nodar Nutsubidze
1b6584c554 Removed README.md 2014-01-05 16:57:01 -06:00
Nodar Nutsubidze
224b8b482c Merge branch 'master' of https://github.com/MadRussian/apt-cacher-formula-1 2014-01-05 16:56:22 -06:00
Forrest
59b5f8d46d Create README.md 2014-01-05 15:36:23 -07:00
Nodar Nutsubidze
942885c84c Added different pillar examples based on server/client 2014-01-05 16:26:38 -06:00
Nodar Nutsubidze
456a714086 README.md -> README.rst to follow saltstack docs 2014-01-05 16:23:47 -06:00
Nodar Nutsubidze
83fe6bdf18 Update README.md 2014-01-05 16:03:49 -06:00
Nodar Nutsubidze
3e16e19cbd Update README.md 2014-01-05 16:03:02 -06:00
Nodar Nutsubidze
327acd54d6 initial commit 2014-01-05 16:02:07 -06:00