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
5
Merge Requests
5
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
Jérome Perrin
slapos
Commits
1f7bf3d1
Commit
1f7bf3d1
authored
Feb 27, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: Upgrade apache to 2.4
parent
1829c584
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
16 deletions
+18
-16
software/apache-frontend/README.apache_frontend.rst
software/apache-frontend/README.apache_frontend.rst
+1
-1
software/apache-frontend/buildout.hash.cfg
software/apache-frontend/buildout.hash.cfg
+2
-2
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+2
-2
software/apache-frontend/instance-apache-frontend.cfg
software/apache-frontend/instance-apache-frontend.cfg
+5
-5
software/apache-frontend/templates/apache.conf.in
software/apache-frontend/templates/apache.conf.in
+8
-6
No files found.
software/apache-frontend/README.apache_frontend.rst
View file @
1f7bf3d1
...
@@ -461,6 +461,6 @@ Solution 2 (IPv6 only)
...
@@ -461,6 +461,6 @@ Solution 2 (IPv6 only)
It is also possible to directly allow the service to listen on 80 and 443 ports using the following command:
It is also possible to directly allow the service to listen on 80 and 443 ports using the following command:
setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache
-2.2
/bin/httpd
setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache/bin/httpd
Then specify in the instance parameters "port" and "plain_http_port" to be 443 and 80, respectively.
Then specify in the instance parameters "port" and "plain_http_port" to be 443 and 80, respectively.
software/apache-frontend/buildout.hash.cfg
View file @
1f7bf3d1
...
@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
...
@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend]
[template-apache-frontend]
filename = instance-apache-frontend.cfg
filename = instance-apache-frontend.cfg
md5sum =
f093d1f85449c9a8d48ccd5a32980c1d
md5sum =
e0559650ee303714a77c7c1ace03f664
[template-apache-replicate]
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
...
@@ -39,7 +39,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
...
@@ -39,7 +39,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
[template-apache-frontend-configuration]
[template-apache-frontend-configuration]
filename = templates/apache.conf.in
filename = templates/apache.conf.in
md5sum =
7d5f0f38e4dd81ff26f2499890b13315
md5sum =
0382e39cd6ed7ce68c07ef906049dbcf
[template-custom-slave-list]
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
...
...
software/apache-frontend/common.cfg
View file @
1f7bf3d1
...
@@ -25,8 +25,8 @@ parts +=
...
@@ -25,8 +25,8 @@ parts +=
template
template
template-apache-frontend
template-apache-frontend
template-apache-replicate
template-apache-replicate
apache
-2.2
apache
apache-antiloris
-apache-2.2
apache-antiloris
stunnel
stunnel
...
...
software/apache-frontend/instance-apache-frontend.cfg
View file @
1f7bf3d1
...
@@ -123,7 +123,7 @@ configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
...
@@ -123,7 +123,7 @@ configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
[frontend-configuration]
[frontend-configuration]
template-log-access = ${template-log-access:target}
template-log-access = ${template-log-access:target}
log-access-configuration = $${directory:etc}/apache-log-access.conf
log-access-configuration = $${directory:etc}/apache-log-access.conf
apache-directory = ${apache
-2.2
:location}
apache-directory = ${apache:location}
apache-ipv6 = $${instance-parameter:ipv6-random}
apache-ipv6 = $${instance-parameter:ipv6-random}
apache-https-port = $${instance-parameter:configuration.port}
apache-https-port = $${instance-parameter:configuration.port}
...
@@ -156,7 +156,7 @@ template-default-slave-virtualhost = ${template-default-slave-virtualhost:target
...
@@ -156,7 +156,7 @@ template-default-slave-virtualhost = ${template-default-slave-virtualhost:target
template-cached-slave-virtualhost = ${template-cached-slave-virtualhost:target}
template-cached-slave-virtualhost = ${template-cached-slave-virtualhost:target}
template-nginx-eventsource-slave-virtualhost = ${template-nginx-eventsource-slave-virtualhost:target}
template-nginx-eventsource-slave-virtualhost = ${template-nginx-eventsource-slave-virtualhost:target}
template-nginx-notebook-slave-virtualhost = ${template-nginx-notebook-slave-virtualhost:target}
template-nginx-notebook-slave-virtualhost = ${template-nginx-notebook-slave-virtualhost:target}
apache-location = ${apache
-2.2
:location}
apache-location = ${apache:location}
[dynamic-custom-personal-template-slave-list]
[dynamic-custom-personal-template-slave-list]
< = jinja2-template-base
< = jinja2-template-base
...
@@ -241,7 +241,7 @@ extra-context =
...
@@ -241,7 +241,7 @@ extra-context =
[apache-frontend]
[apache-frontend]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${apache
-2.2
:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
command-line = ${apache:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
wrapper-path = $${directory:service}/frontend_apache
wrapper-path = $${directory:service}/frontend_apache
wait-for-files =
wait-for-files =
$${ca-frontend:cert-file}
$${ca-frontend:cert-file}
...
@@ -271,7 +271,7 @@ error-log = $${directory:log}/frontend-apache-error.log
...
@@ -271,7 +271,7 @@ error-log = $${directory:log}/frontend-apache-error.log
pid-file = $${directory:run}/httpd.pid
pid-file = $${directory:run}/httpd.pid
protected-path = /
protected-path = /
access-control-string = none
access-control-string = none
frontend-configuration-verification = ${apache
-2.2
:location}/bin/httpd -Sf $${:frontend-configuration} > /dev/null
frontend-configuration-verification = ${apache:location}/bin/httpd -Sf $${:frontend-configuration} > /dev/null
frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
# Comunication with ats
# Comunication with ats
...
@@ -282,7 +282,7 @@ ssl-cache-through-port = 26012
...
@@ -282,7 +282,7 @@ ssl-cache-through-port = 26012
# Create wrapper for "apachectl conftest" in bin
# Create wrapper for "apachectl conftest" in bin
[configtest]
[configtest]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${apache
-2.2
:location}/bin/httpd -f $${directory:etc}/apache_frontend.conf -t
command-line = ${apache:location}/bin/httpd -f $${directory:etc}/apache_frontend.conf -t
wrapper-path = $${directory:bin}/apache-configtest
wrapper-path = $${directory:bin}/apache-configtest
[certificate-authority]
[certificate-authority]
...
...
software/apache-frontend/templates/apache.conf.in
View file @
1f7bf3d1
...
@@ -44,8 +44,7 @@ CustomLog "{{ access_log }}" combined
...
@@ -44,8 +44,7 @@ CustomLog "{{ access_log }}" combined
</Directory>
</Directory>
<Directory {{ document_root }}>
<Directory {{ document_root }}>
Order Allow,Deny
Require all granted
Allow from All
Options -Indexes
Options -Indexes
ErrorDocument 404 /notfound.html
ErrorDocument 404 /notfound.html
RewriteEngine on
RewriteEngine on
...
@@ -53,10 +52,11 @@ CustomLog "{{ access_log }}" combined
...
@@ -53,10 +52,11 @@ CustomLog "{{ access_log }}" combined
</Directory>
</Directory>
# List of modules
# List of modules
#LoadModule unixd_module
modules/mod_unixd.so
LoadModule unixd_module {{ httpd_home }}/
modules/mod_unixd.so
#LoadModule access_compat_module
modules/mod_access_compat.so
LoadModule access_compat_module {{ httpd_home }}/
modules/mod_access_compat.so
#LoadModule authz_core_module
modules/mod_authz_core.so
LoadModule authz_core_module {{ httpd_home }}/
modules/mod_authz_core.so
LoadModule authz_host_module {{ httpd_home }}/modules/mod_authz_host.so
LoadModule authz_host_module {{ httpd_home }}/modules/mod_authz_host.so
LoadModule authn_core_module {{ httpd_home }}/modules/mod_authn_core.so
LoadModule log_config_module {{ httpd_home }}/modules/mod_log_config.so
LoadModule log_config_module {{ httpd_home }}/modules/mod_log_config.so
LoadModule deflate_module {{ httpd_home }}/modules/mod_deflate.so
LoadModule deflate_module {{ httpd_home }}/modules/mod_deflate.so
LoadModule setenvif_module {{ httpd_home }}/modules/mod_setenvif.so
LoadModule setenvif_module {{ httpd_home }}/modules/mod_setenvif.so
...
@@ -71,13 +71,15 @@ LoadModule negotiation_module {{ httpd_home }}/modules/mod_negotiation.so
...
@@ -71,13 +71,15 @@ LoadModule negotiation_module {{ httpd_home }}/modules/mod_negotiation.so
LoadModule rewrite_module {{ httpd_home }}/modules/mod_rewrite.so
LoadModule rewrite_module {{ httpd_home }}/modules/mod_rewrite.so
LoadModule headers_module {{ httpd_home }}/modules/mod_headers.so
LoadModule headers_module {{ httpd_home }}/modules/mod_headers.so
LoadModule cache_module {{ httpd_home }}/modules/mod_cache.so
LoadModule cache_module {{ httpd_home }}/modules/mod_cache.so
LoadModule mem_cache_module {{ httpd_home }}/modules/mod_mem_cache.so
LoadModule cache_socache_module {{ httpd_home }}/modules/mod_cache_socache.so
LoadModule socache_shmcb_module {{ httpd_home }}/modules/mod_socache_shmcb.so
LoadModule antiloris_module {{ httpd_home }}/modules/mod_antiloris.so
LoadModule antiloris_module {{ httpd_home }}/modules/mod_antiloris.so
LoadModule alias_module {{ httpd_home }}/modules/mod_alias.so
LoadModule alias_module {{ httpd_home }}/modules/mod_alias.so
LoadModule autoindex_module {{ httpd_home }}/modules/mod_autoindex.so
LoadModule autoindex_module {{ httpd_home }}/modules/mod_autoindex.so
LoadModule auth_basic_module {{ httpd_home }}/modules/mod_auth_basic.so
LoadModule auth_basic_module {{ httpd_home }}/modules/mod_auth_basic.so
LoadModule authz_user_module {{ httpd_home }}/modules/mod_authz_user.so
LoadModule authz_user_module {{ httpd_home }}/modules/mod_authz_user.so
LoadModule authn_file_module {{ httpd_home }}/modules/mod_authn_file.so
LoadModule authn_file_module {{ httpd_home }}/modules/mod_authn_file.so
LoadModule filter_module {{ httpd_home }}/modules/mod_filter.so
# The following directives modify normal HTTP response behavior to
# The following directives modify normal HTTP response behavior to
# handle known problems with browser implementations.
# handle known problems with browser implementations.
...
...
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