Skip to content

sort squidGuard #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 66 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
5d8a4b1
parametrage
Nov 12, 2015
620f143
parametrage
Nov 12, 2015
6d567d1
parametrage
Nov 12, 2015
767d45b
rename keepalived cookbook
Nov 13, 2015
bd1e264
rename keepalived cookbook
Nov 13, 2015
4390045
parametrage
Nov 13, 2015
72353b6
option othersAreBackup
Nov 14, 2015
c2e2d93
option othersAreBackup
Nov 14, 2015
94e8ce2
parametrage
Nov 16, 2015
6685eae
parametrage
Nov 16, 2015
3fcf4eb
parametrage
Nov 16, 2015
fbd9d87
parametrage
Nov 18, 2015
0ba6ef1
parametrage
Nov 19, 2015
1b30eed
parametrage
Nov 19, 2015
f1b8f5e
parametrage
Nov 20, 2015
da061bc
parametrage
Nov 20, 2015
0287652
parametrage
Nov 20, 2015
82587e5
parametrage
Nov 20, 2015
b5fec42
parametrage
Dec 4, 2015
7f67b88
parametrage
Dec 11, 2015
42dee1c
parametrage
Dec 12, 2015
8ae1ace
parametrage
Dec 15, 2015
b1dda52
parametrages
Dec 15, 2015
d58bac1
parametrage
Dec 15, 2015
d246dd4
parametrages
Dec 16, 2015
4590408
parametrages
Dec 16, 2015
d7957e5
parametrages
Dec 16, 2015
ac4fb63
parametrages
Dec 21, 2015
6535387
sort of squidguard definitions
Dec 22, 2015
4113791
parametrages
Dec 28, 2015
68a21e3
parametrages
Jan 7, 2016
c703104
ajout du service ldap
Jan 13, 2016
337526a
parametrages
Jan 13, 2016
a3d5166
parametrages
Jan 18, 2016
d8284d6
parametrages
Jan 19, 2016
773d42a
parametrage
Feb 16, 2016
2562aff
parametrage
Feb 16, 2016
bb2e2b8
parametrage
Feb 17, 2016
3e5f0ae
parametrage
Feb 17, 2016
62eea3d
parametrage
Feb 18, 2016
b90f775
parametrage
Mar 4, 2016
6384cee
Allowoverride option added
Mar 10, 2016
0322dc8
bug PING chain
Mar 22, 2016
f5c2f6d
bug PING chain
Mar 23, 2016
1fa1740
parametrage
Mar 23, 2016
d87d9aa
parametrage
Mar 23, 2016
f086883
parametrage
Mar 29, 2016
dc0a7e8
add ocs creation on squid*.toriki
Apr 21, 2016
eb23802
parametrage
Apr 27, 2016
87270d9
Update ocs.json
Jul 18, 2016
d7a919b
parametrage
Jul 28, 2016
c8df72a
parametrage
Jul 28, 2016
8f89564
parametrage
Jul 28, 2016
1eaecc3
parametrage
Aug 19, 2016
bac07bf
parametrag
Aug 19, 2016
7ad519d
parametrage
Aug 25, 2016
0d59a60
parametrage
Aug 25, 2016
c75955f
parametrage
Aug 25, 2016
967376d
parametrage
Aug 25, 2016
4a9e302
parametrage
Aug 25, 2016
cd86ff5
parametrage
Aug 31, 2016
5bde357
parametrage
Sep 8, 2016
49f1513
parametrages
Nov 9, 2016
f6c8449
default file env added to chef-iptables
Nov 23, 2016
b95410e
parametrage
Apr 26, 2017
4b160fe
parametrage
Apr 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions Cheffile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ site "https://supermarket.getchef.com/api/v1"
cookbook 'chef-client', :version => '4.0.0'
cookbook 'chef-server', :version => '2.1.6'
cookbook 'database', :version => '2.3.1'
cookbook 'iptables-ng', :version => '2.2.4'
cookbook 'keepalived', :version => '1.2.0'
cookbook 'd4ea871cba8b3c762fdfc55ac38b8a6336e6037ciptables-ng', :version => '2.2.4'
#cookbook 'keepalived', :version => '1.2.0'
cookbook 'locales', :version => '0.3.1'
cookbook 'nscd', :version => '0.12.0'
cookbook 'ntp', :version => '1.7.0'
cookbook 'postfix', :version => '3.6.2'
cookbook 'resolver', :version => '1.2.0'
cookbook 'rsyslog', :version => '1.13.0'
cookbook 'squid', :version => '0.5.2'
cookbook 'sudo', :version => '2.7.1'
cookbook 'timezone', :version => '0.0.1'
cookbook 'users', :version => '1.7.0'
Expand Down Expand Up @@ -63,23 +62,19 @@ cookbook 'chef-delegate',

cookbook 'chef-haproxy-ng',
:git => 'https://github.com/peychart/chef-haproxy-ng',
:ref => '06799cdb59ae7eec00f3750b572258e2c1a6842a'
:ref => '23cdeba4b807a1905c050cc75bc5cfbebe38393e'

cookbook 'chef-keepalived',
:git => 'https://github.com/peychart/chef-keepalived',
:ref => 'a6e01a6dd4aaeb46b8085d24613651a88e77e4a9'
:ref => '77cf52f9b9e8a13640127df6d6f993236fa1219a'

cookbook 'chef-hostsfile',
:git => 'https://github.com/peychart/chef-hostsfile',
:ref => '636dbf3a19384ca3fa3930c6ef57a990c54852c3'

cookbook 'chef-ldap-checkbackend',
:git => 'https://github.com/peychart/chef-ldap-checkbackend',
:ref => 'f260d729e64e40e386a82bf9a77f622ed222467d'
:ref => 'e6fa8ff36532c7ac19f2efc8fc21cf33a03ccfe5'

cookbook 'chef-lvm',
:git => 'https://github.com/peychart/chef-lvm',
:ref => '18ef0f560419acf135677b5780a40f4e4f8f89c1'
:ref => '3aa20e9c9dab32b55a41415d89d869b2c818e542'

cookbook 'lvm',
:git => 'https://github.com/peychart/lvm',
Expand All @@ -99,15 +94,11 @@ cookbook 'qmail',

cookbook 'chef-squid',
:git => 'https://github.com/peychart/chef-squid',
:ref => 'aeb6643e6534c757758131a3e85c22076d7c11e7'
:ref => '2b8ebb8072ee34930a61dd1ae4b611100d76ba7d'

cookbook 'chef-proxypacfile',
:git => 'https://github.com/peychart/chef-proxypacfile',
:ref => 'bec55cfa7534b312e14fb116686296cbe0635ed7'

cookbook 'chef-squid_ldap_auth',
:git => 'https://github.com/peychart/chef-squid_ldap_auth',
:ref => '05b3579ed3b7760e78c798cb883be4c43cb567e1'
:ref => '82accf96fff9cec3b1a657cb6cbbcbdcd3417bbd'

cookbook 'openldap',
:git => 'https://github.com/sitle/openldap',
Expand All @@ -131,11 +122,11 @@ cookbook 'mataara',

cookbook 'chef-crontab',
:git => 'https://github.com/peychart/chef-crontab',
:ref => '76dcd654c0a5d1c606ce727873dcc0d0947b09d2'
:ref => '66b0c9934fda2ff4a0e9f48966bcc46886f564a8'

cookbook 'chef-iptables',
:git => 'https://github.com/peychart/chef-iptables',
:ref => '0b66da6636cd88f15611cd474fe8269a5daa4860'
:ref => '9cb422945557b05a5fd0ea78f5207fb5cb55b014'

cookbook 'chef-iscsiadm',
:git => 'https://github.com/peychart/chef-iscsiadm',
Expand All @@ -147,15 +138,15 @@ cookbook 'chef-owncloud',

cookbook 'chef-cloudfuse',
:git => 'https://github.com/peychart/chef-cloudfuse',
:ref => '45887bf517bac145359cf6de711b7396903ef494'
:ref => '25b8b380dac2f8661d59c24361e121f4576f1248'

cookbook 'chef-s3ql',
:git => 'https://github.com/peychart/chef-s3ql',
:ref => '587b802de7d68b137c5de07b28d3fca2b8662065'

cookbook 'chef-specific-gov-pf',
:git => 'https://gitlab.gov.pf/infrastructure/chef-specifique-gov-pf.git',
:ref => '147dca6fddd68cf4397291a4225f24c7e2dd5fe7'
:ref => '290fdd2d2b9059236d351892845dea5081120476'

cookbook 'dsi-users',
:git => 'https://github.com/dsi-infrastructure/chef-dsi-users',
Expand Down
8 changes: 4 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

# avant, modifier les attributs par defaut:
chef.json = {
"chef-nodeAttributes" => {
"service" => "tomcat"
"chef-serviceAttributes" => {
"service" => "squid"
}
}

chef.run_list = [
"recipe[chef-nodeAttributes::default]",
"recipe[chef-serviceAttributes::default]",
# "recipe[chef-serviceAttributes::default]",
# "recipe[chef-hostsfile::default]",
# "recipe[chef-lvm::default]",
Expand All @@ -64,7 +64,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# "recipe[chef-iscsi::default]"
# "recipe[chef-crontab::create]"
# "recipe[tomcat::default]"
"recipe[chef-tomcat-application::default]"
"recipe[cookbook-nmp:default]"
]


Expand Down
2 changes: 1 addition & 1 deletion data_bags
Submodule data_bags updated from ccce9b to c245e0
2 changes: 1 addition & 1 deletion roles
Submodule roles updated from 4c63d7 to 8a82c8