Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
slapos
Commits
82aac1bf
Commit
82aac1bf
authored
May 27, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
squid: Squid use entrance port for acl
parent
ecd0a327
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
slapos/recipe/squid/__init__.py
slapos/recipe/squid/__init__.py
+2
-2
slapos/recipe/squid/template/squid.conf.in
slapos/recipe/squid/template/squid.conf.in
+1
-1
software/apache-frontend/instance.cfg
software/apache-frontend/instance.cfg
+2
-1
No files found.
slapos/recipe/squid/__init__.py
View file @
82aac1bf
...
@@ -41,7 +41,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -41,7 +41,7 @@ class Recipe(GenericBaseRecipe):
cache-path -- location of the cache directory
cache-path -- location of the cache directory
XXXX No good, specific...
XXXX No good, specific...
public_ipv4 -- public ipv4 of the server
open_port -- entrance port to the host and allowed to use cache
ip -- ip of the squid server
ip -- ip of the squid server
...
@@ -69,7 +69,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -69,7 +69,7 @@ class Recipe(GenericBaseRecipe):
access_log_path
=
self
.
options
[
'access-log-path'
],
access_log_path
=
self
.
options
[
'access-log-path'
],
cache_log_path
=
self
.
options
[
'cache-log-path'
],
cache_log_path
=
self
.
options
[
'cache-log-path'
],
pid_filename_path
=
self
.
options
[
'pid-filename-path'
],
pid_filename_path
=
self
.
options
[
'pid-filename-path'
],
public_ipv4
=
self
.
options
[
'public-ipv4
'
],
open_port
=
self
.
options
[
'open-port
'
],
)
)
template_filename
=
self
.
getTemplateFilename
(
'squid.conf.in'
)
template_filename
=
self
.
getTemplateFilename
(
'squid.conf.in'
)
...
...
slapos/recipe/squid/template/squid.conf.in
View file @
82aac1bf
...
@@ -8,7 +8,7 @@ http_port %(ip)s:%(port)s accel defaultsite=%(ip)s
...
@@ -8,7 +8,7 @@ http_port %(ip)s:%(port)s accel defaultsite=%(ip)s
cache_peer %(backend_ip)s parent %(backend_port)s 0 no-query originserver name=backend
cache_peer %(backend_ip)s parent %(backend_port)s 0 no-query originserver name=backend
acl our_sites
dst %(public_ipv4
)s
acl our_sites
port %(open_port
)s
http_access allow our_sites
http_access allow our_sites
cache_peer_access backend allow our_sites
cache_peer_access backend allow our_sites
cache_peer_access backend deny all
cache_peer_access backend deny all
...
...
software/apache-frontend/instance.cfg
View file @
82aac1bf
...
@@ -82,6 +82,7 @@ configuration.plain_http_port = 8080
...
@@ -82,6 +82,7 @@ configuration.plain_http_port = 8080
configuration.server-admin = admin@example.com
configuration.server-admin = admin@example.com
configuration.apache_custom_https = ""
configuration.apache_custom_https = ""
configuration.apache_custom_http = ""
configuration.apache_custom_http = ""
configuration.open-port = 80 443
[jinja2-template-base]
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -398,7 +399,7 @@ ip = $${instance-parameter:ipv4-random}
...
@@ -398,7 +399,7 @@ ip = $${instance-parameter:ipv4-random}
port = $${apache-configuration:cache-port}
port = $${apache-configuration:cache-port}
backend-ip = $${instance-parameter:ipv4-random}
backend-ip = $${instance-parameter:ipv4-random}
backend-port = $${apache-configuration:cache-through-port}
backend-port = $${apache-configuration:cache-through-port}
public-ipv4 = $${instance-parameter:configuration.public-ipv4
}
open-port = $${instance-parameter:configuration.open-port
}
access-log-path = $${directory:log}/squid-access.log
access-log-path = $${directory:log}/squid-access.log
cache-log-path = $${directory:log}/squid-cache.log
cache-log-path = $${directory:log}/squid-cache.log
pid-filename-path = $${directory:run}/squid.pid
pid-filename-path = $${directory:run}/squid.pid
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment