Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
5e3820b4
Commit
5e3820b4
authored
Apr 15, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 1.0
parents
a9a3c3c1
a04ba384
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
component/qemu-kvm/buildout.cfg
component/qemu-kvm/buildout.cfg
+2
-2
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/nginx_conf.in
software/slaprunner/nginx_conf.in
+1
-1
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+2
-3
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+1
-0
stack/monitor/templates/wrapper.in
stack/monitor/templates/wrapper.in
+1
-1
No files found.
component/qemu-kvm/buildout.cfg
View file @
5e3820b4
...
@@ -43,9 +43,9 @@ environment =
...
@@ -43,9 +43,9 @@ environment =
[debian-amd64-netinst.iso]
[debian-amd64-netinst.iso]
# Download the installer of Debian 8 (Jessie)
# Download the installer of Debian 8 (Jessie)
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = http://cdimage.debian.org/debian-cd/8.
3.0/amd64/iso-cd/debian-8.3
.0-amd64-netinst.iso
url = http://cdimage.debian.org/debian-cd/8.
4.0/amd64/iso-cd/debian-8.4
.0-amd64-netinst.iso
filename = ${:_buildout_section_name_}
filename = ${:_buildout_section_name_}
md5sum =
a9b490b4215d1e72e876b031dafa7184
md5sum =
8d52d1b7789cd5a464aae719f05299ec
download-only = true
download-only = true
mode = 0644
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
software/slaprunner/common.cfg
View file @
5e3820b4
...
@@ -106,7 +106,7 @@ mode = 0644
...
@@ -106,7 +106,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/nginx_conf.in
url = ${:_profile_base_location_}/nginx_conf.in
download-only = true
download-only = true
md5sum =
2ccfb122a6e8e4cce0d98e9db28be749
md5sum =
e6c2e1dd2153afefa0805c4065066e4e
filename = nginx_conf.in
filename = nginx_conf.in
mode = 0644
mode = 0644
...
...
software/slaprunner/nginx_conf.in
View file @
5e3820b4
...
@@ -25,7 +25,7 @@ http {
...
@@ -25,7 +25,7 @@ http {
ssl_certificate {{ param_nginx_frontend['ssl-certificate'] }};
ssl_certificate {{ param_nginx_frontend['ssl-certificate'] }};
ssl_certificate_key {{ param_nginx_frontend['ssl-key'] }};
ssl_certificate_key {{ param_nginx_frontend['ssl-key'] }};
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
ssl_ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
;
ssl_prefer_server_ciphers on;
ssl_prefer_server_ciphers on;
keepalive_timeout 90s;
keepalive_timeout 90s;
client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
...
...
stack/monitor/buildout.cfg
View file @
5e3820b4
...
@@ -71,7 +71,7 @@ md5sum = 5913d2a0096b50537f394a49b762b3e5
...
@@ -71,7 +71,7 @@ md5sum = 5913d2a0096b50537f394a49b762b3e5
[monitor-template-wrapper]
[monitor-template-wrapper]
<= monitor-template-base
<= monitor-template-base
filename = wrapper.in
filename = wrapper.in
md5sum =
8cde04bfd0c0e9bd56744b988275cfd8
md5sum =
1695c9a06a2b11ccfe893d7a224e489d
[monitor-conf]
[monitor-conf]
<= monitor-template-base
<= monitor-template-base
...
@@ -99,7 +99,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -99,7 +99,7 @@ recipe = slapos.recipe.template:jinja2
filename = template-monitor.cfg
filename = template-monitor.cfg
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
rendered = ${buildout:directory}/template-monitor.cfg
rendered = ${buildout:directory}/template-monitor.cfg
md5sum =
b8c804aba89a3938aa00bed914b1729a
md5sum =
eab45fd2b0f017ab97a9c8f466c8dceb
context =
context =
key apache_location apache:location
key apache_location apache:location
key gzip_location gzip:location
key gzip_location gzip:location
...
@@ -173,4 +173,3 @@ url = ${:_profile_base_location_}/make-rss.sh.in
...
@@ -173,4 +173,3 @@ url = ${:_profile_base_location_}/make-rss.sh.in
md5sum = 98c8f6fd81e405b0ad10db07c3776321
md5sum = 98c8f6fd81e405b0ad10db07c3776321
output = ${buildout:directory}/template-make-rss.sh.in
output = ${buildout:directory}/template-make-rss.sh.in
mode = 0644
mode = 0644
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
5e3820b4
...
@@ -269,6 +269,7 @@ rendered = ${directory:scripts}/monitor-httpd-graceful
...
@@ -269,6 +269,7 @@ rendered = ${directory:scripts}/monitor-httpd-graceful
mode = 0700
mode = 0700
context =
context =
key content :command
key content :command
raw dash_binary {{ dash_executable_location }}
command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
[monitor-status2rss-wrapper]
[monitor-status2rss-wrapper]
...
...
stack/monitor/templates/wrapper.in
View file @
5e3820b4
#!
${dash-output:dash
}
#!
{{ dash_binary }
}
{{ content }}
{{ content }}
\ No newline at end of file
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