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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Leymonerie
slapos
Commits
e1cc062e
Commit
e1cc062e
authored
Oct 05, 2012
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update stack boinc according to new apachephp recipe
parent
23afd102
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
122 additions
and
26 deletions
+122
-26
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+9
-1
stack/boinc/instance-boinc.cfg
stack/boinc/instance-boinc.cfg
+32
-25
stack/boinc/template/apache.in
stack/boinc/template/apache.in
+81
-0
No files found.
stack/boinc/buildout.cfg
View file @
e1cc062e
...
@@ -9,6 +9,7 @@ parts =
...
@@ -9,6 +9,7 @@ parts =
apache-php
apache-php
template-mariadb
template-mariadb
template-boinc
template-boinc
template-httpd-conf
# Local development
# Local development
slapos.cookbook-repository
slapos.cookbook-repository
check-recipe
check-recipe
...
@@ -40,7 +41,7 @@ eggs =
...
@@ -40,7 +41,7 @@ eggs =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg
url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
md5sum =
cb4ac3f37266731cfa4e9f304266cb77
md5sum =
fe0ace78cd2f886b0aa4132efd57e6f2
mode = 0644
mode = 0644
#Template for deploying MySQL Database Server
#Template for deploying MySQL Database Server
...
@@ -51,6 +52,13 @@ output = ${buildout:directory}/template-mariadb.cfg
...
@@ -51,6 +52,13 @@ output = ${buildout:directory}/template-mariadb.cfg
md5sum = f355b0b29901a0e8b5e173e0cfa24326
md5sum = f355b0b29901a0e8b5e173e0cfa24326
mode = 0644
mode = 0644
[template-httpd-conf]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
download-only = true
filename = apache.in
md5sum = f3d842f8c3b41454feaded4cb5eb5710
# Local development
# Local development
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = plone.recipe.command
recipe = plone.recipe.command
...
...
stack/boinc/instance-boinc.cfg
View file @
e1cc062e
...
@@ -14,7 +14,6 @@ parts =
...
@@ -14,7 +14,6 @@ parts =
slapmonitor
slapmonitor
slapreport
slapreport
frontend-promise
frontend-promise
content-promise
publish-connection-informations
publish-connection-informations
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
...
@@ -116,32 +115,54 @@ return = url
...
@@ -116,32 +115,54 @@ return = url
recipe = slapos.cookbook:urlparse
recipe = slapos.cookbook:urlparse
url = $${request-mariadb:connection-url}
url = $${request-mariadb:connection-url}
[httpd-conf]
recipe = slapos.recipe.template
url = ${template-httpd-conf:location}/${template-httpd-conf:filename}
output = $${rootdirectory:etc}/apache.conf
document_root = $${rootdirectory:srv}/www/
pid_file = $${basedirectory:run}/apache.pid
lock_file = $${basedirectory:run}/apache.lock
ip = $${slap-network-information:global-ipv6}
port = 8080
error_log = $${directory:httpd-log}/error.log
access_log = $${directory:httpd-log}/access.log
php_ini_dir = $${directory:php-ini-dir}
niceprojectname = $${slap-parameter:project}@HOME
project = $${slap-parameter:project}
installroot = $${rootdirectory:project}/$${slap-parameter:project}
[environment]
PATH = %(PATH)s:$${rootdirectory:bin}:${subversion:location}/bin:${perl:location}/bin
# Deploy Apache + PHP application
# Deploy Apache + PHP application
[apache-php]
[apache-php]
recipe = slapos.cookbook:apachephp
recipe = slapos.cookbook:apachephp
source = $${basedirectory:application}
source = $${basedirectory:application}
htdocs = $${rootdirectory:srv}/www/
default-conf = false
httpd-conf = $${httpd-conf:output}
pid-file = $${basedirectory:run}/apache.pid
pid-file = $${basedirectory:run}/apache.pid
lock-file = $${basedirectory:run}/apache.lock
lock-file = $${basedirectory:run}/apache.lock
ip = $${slap-network-information:global-ipv6}
port = 8080
url = http://[$${:ip}]:$${:port}/
error-log = $${directory:httpd-log}/error.log
error-log = $${directory:httpd-log}/error.log
access-log = $${directory:httpd-log}/access.log
access-log = $${directory:httpd-log}/access.log
php-ini-dir = $${directory:php-ini-dir}
tmp-dir = $${directory:tmp-php}
httpd-conf = $${rootdirectory:etc}/apache.conf
wrapper = $${basedirectory:services}/apache
wrapper = $${basedirectory:services}/apache
ip = $${httpd-conf:ip}
port = $${httpd-conf:port}
url = http://[$${:ip}]:$${:port}/
httpd-binary = ${apache:location}/bin/httpd
httpd-binary = ${apache:location}/bin/httpd
htdocs = $${rootdirectory:srv}/www/
tmp-dir = $${directory:tmp-php}
php-ini-dir = $${directory:php-ini-dir}
mysql-username = $${mariadb-urlparse:username}
mysql-username = $${mariadb-urlparse:username}
mysql-password = $${mariadb-urlparse:password}
mysql-password = $${mariadb-urlparse:password}
mysql-database = $${mariadb-urlparse:path}
mysql-database = $${mariadb-urlparse:path}
mysql-host = $${stunnel:local-host}
mysql-host = $${stunnel:local-host}
mysql-port = $${stunnel:local-port}
mysql-port = $${stunnel:local-port}
#send environment variable for apache process
environment-section =
environment
template =
template =
configuration =
configuration =
...
@@ -160,8 +181,6 @@ home = $${buildout:directory}
...
@@ -160,8 +181,6 @@ home = $${buildout:directory}
project = $${slap-parameter:project}
project = $${slap-parameter:project}
fullname = $${slap-parameter:full-name}
fullname = $${slap-parameter:full-name}
copyright = $${slap-parameter:copyright-holder}
copyright = $${slap-parameter:copyright-holder}
project-config = $${:home}/.$${:project}.conf
boinc-httpd-conf = $${rootdirectory:etc}/apache_boinc.conf
boinc = ${boinc:location}
boinc = ${boinc:location}
installroot = $${rootdirectory:project}/$${slap-parameter:project}
installroot = $${rootdirectory:project}/$${slap-parameter:project}
wrapper-dir = $${basedirectory:services}
wrapper-dir = $${basedirectory:services}
...
@@ -172,19 +191,14 @@ develop-egg = ${buildout:develop-eggs-directory}
...
@@ -172,19 +191,14 @@ develop-egg = ${buildout:develop-eggs-directory}
#Other binary path
#Other binary path
svn-binary = ${subversion:location}/bin
svn-binary = ${subversion:location}/bin
python-binary = ${buildout:executable}
perl-binary = ${perl:location}/bin
perl-binary = ${perl:location}/bin
#Apache and php
#Apache and php
ip = $${apache-php:ip}
ip = $${apache-php:ip}
port = $${apache-php:port}
port = $${apache-php:port}
httpd-conf = $${apache-php:httpd-conf}
apache-bin = ${apache:location}/bin/httpd
apache-wrapper = $${apache-php:wrapper}
htpasswd = ${apache:location}/bin/htpasswd
htpasswd = ${apache:location}/bin/htpasswd
php-ini = $${apache-php:php-ini-dir}/php.ini
php-ini = $${apache-php:php-ini-dir}/php.ini
php-bin = ${apache-php:location}/bin/php
php-bin = ${apache-php:location}/bin/php
pid-file = $${apache-php:pid-file}
php-wrapper = $${rootdirectory:bin}php
php-wrapper = $${rootdirectory:bin}php
#Mysql Informations
#Mysql Informations
...
@@ -212,7 +226,7 @@ state-file = $${rootdirectory:srv}/logrotate.status
...
@@ -212,7 +226,7 @@ state-file = $${rootdirectory:srv}/logrotate.status
<= logrotate
<= logrotate
recipe = slapos.cookbook:logrotate.d
recipe = slapos.cookbook:logrotate.d
name = apache
name = apache
log = $${
apache-php:error-log} $${apache-php:access-
log}
log = $${
httpd-conf:error_log} $${httpd-conf:access_
log}
frequency = daily
frequency = daily
rotate-num = 30
rotate-num = 30
sharedscripts = true
sharedscripts = true
...
@@ -317,14 +331,7 @@ port = $${apache-php:port}
...
@@ -317,14 +331,7 @@ port = $${apache-php:port}
[frontend-promise]
[frontend-promise]
recipe = slapos.cookbook:check_url_available
recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend
path = $${basedirectory:promises}/frontend
url = $${request-frontend:connection-site_url}
url = $${request-frontend:connection-site_url}/$${slap-parameter:project}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
[content-promise]
recipe = slapos.cookbook:check_page_content
path = $${basedirectory:promises}/content
url = $${boinc-server:home_page}
dash_path = ${dash:location}/bin/dash
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
curl_path = ${curl:location}/bin/curl
...
...
stack/boinc/template/apache.in
0 → 100644
View file @
e1cc062e
# Apache static configuration
# Automatically generated
# Basic server configuration
PidFile "${:pid_file}"
Listen ${:ip}:${:port}
PHPINIDir ${:php_ini_dir}
ServerAdmin someone@email
DefaultType text/plain
TypesConfig conf/mime.types
AddType application/x-compress .Z
AddType application/x-gzip .gz .tgz
AddType application/x-httpd-php .php .phtml .php5 .php4
AddType application/x-httpd-php-source .phps
# Log configuration
ErrorLog "${:error_log}"
LogLevel warn
LogFormat "%h %{REMOTE_USER}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %{REMOTE_USER}i %l %u %t \"%r\" %>s %b" common
CustomLog "${:access_log}" common
# Directory protection
<Directory />
Options FollowSymLinks
AllowOverride None
Require all denied
</Directory>
<Directory ${:document_root}>
Options FollowSymLinks
AllowOverride All
Require all granted
</Directory>
DocumentRoot ${:document_root}
DirectoryIndex index.html index.php
# List of modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule version_module modules/mod_version.so
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_http_module modules/mod_proxy_http.so
LoadModule mime_module modules/mod_mime.so
LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule negotiation_module modules/mod_negotiation.so
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so
LoadModule dir_module modules/mod_dir.so
LoadModule php5_module modules/libphp5.so
LoadModule alias_module modules/mod_alias.so
LoadModule auth_basic_module modules/mod_auth_basic.so
LoadModule authz_user_module modules/mod_authz_user.so
LoadModule authn_file_module modules/mod_authn_file.so
LoadModule ssl_module modules/mod_ssl.so
LoadModule authn_core_module modules/mod_authn_core.so
## Settings for BOINC project ${:niceprojectname}
Alias /${:project} ${:installroot}/html/user
Alias /${:project}_ops ${:installroot}/html/ops
ScriptAlias /${:project}_cgi ${:installroot}/cgi-bin
# Note: projects/*/keys/ should NOT be readable!
<Directory "${:installroot}/html">
Options Indexes FollowSymlinks MultiViews
AllowOverride AuthConfig
Require all granted
</Directory>
<Directory "${:installroot}/cgi-bin">
Options ExecCGI
AllowOverride AuthConfig
Require all granted
</Directory>
\ 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