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
29ec5ded
Commit
29ec5ded
authored
May 30, 2022
by
HongzheWang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/lamp:Add changeable root file path
parent
aaaf939a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
6 deletions
+18
-6
software/matomo/software.cfg
software/matomo/software.cfg
+1
-0
stack/lamp/apache-httpd.conf.in
stack/lamp/apache-httpd.conf.in
+3
-3
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+9
-0
stack/lamp/buildout.hash.cfg
stack/lamp/buildout.hash.cfg
+3
-3
stack/lamp/instance-apache-php.cfg.in
stack/lamp/instance-apache-php.cfg.in
+1
-0
stack/lamp/instance.cfg.in
stack/lamp/instance.cfg.in
+1
-0
No files found.
software/matomo/software.cfg
View file @
29ec5ded
...
...
@@ -37,6 +37,7 @@ part-list = matomo-backup.sh matomo-backup-cron
db-name = matomo
db-user = matomo
db-password = 12345678
root-path = /matomo
[template-matomo-instance]
recipe = slapos.recipe.template:jinja2
...
...
stack/lamp/apache-httpd.conf.in
View file @
29ec5ded
<VirtualHost *:{{ parameter_dict['port'] }}>
ServerAdmin admin@example.com
DocumentRoot {{ parameter_dict['document-root'] }}
/matomo
DocumentRoot {{ parameter_dict['document-root'] }}
{{ root_path }}
SetEnvIf Origin "^http(s)?://(.+\.)?(app\.officejs\.com)$" ORIGIN_DOMAIN=$0
Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
...
...
@@ -18,7 +18,7 @@
Dav off
</Directory>
ErrorLog "{{ parameter_dict['log-dir'] }}/
matomo
-error.log"
CustomLog "{{ parameter_dict['log-dir'] }}/
matomo
-access.log" combined
ErrorLog "{{ parameter_dict['log-dir'] }}/
lamp
-error.log"
CustomLog "{{ parameter_dict['log-dir'] }}/
lamp
-access.log" combined
</VirtualHost>
stack/lamp/buildout.cfg
View file @
29ec5ded
...
...
@@ -57,6 +57,14 @@ part-list =
db-name = lamp
db-user = lamp
db-password = insecure
# routing
# The default location of the LAMP URL link is
# ~/srv/project/runner/instance/slappartX/srv/www/
# If you want to redirect it, edit this keyword
# for example, root-path = /matomo
# that means the root document path is changed to
# ~/srv/project/runner/instance/slappartX/srv/www/matomo
root-path = /
#----------------
#-- Instance-level buildout profiles.
...
...
@@ -107,6 +115,7 @@ context =
key db_name custom-application-deployment:db-name
key db_user custom-application-deployment:db-user
key db_password custom-application-deployment:db-password
key root_path custom-application-deployment:root-path
key lamp_apache_httpd template-apache-httpd:target
[instance-apache-php]
...
...
stack/lamp/buildout.hash.cfg
View file @
29ec5ded
...
...
@@ -14,11 +14,11 @@
# not need these here).
[instance]
filename = instance.cfg.in
md5sum =
b87556b0e5651bc8217c1bccbdd6b4d7
md5sum =
053f8ba78c2634a1ef7586e025dcc2cc
[instance-apache-php]
filename = instance-apache-php.cfg.in
md5sum =
8506f245087dfdc02561e8739a567bd6
md5sum =
b1494674c9a373d6e87affd55281ec4c
[instance-lamp]
filename = instance-lamp.cfg.jinja2.in
...
...
@@ -34,4 +34,4 @@ md5sum = 980f603c34fcb008ce73a9dde2dbceb3
[template-apache-httpd]
filename = apache-httpd.conf.in
md5sum =
9940e05d5e624a7884f4e6e062355798
md5sum =
b6c5a467759582a321063242ae2a635e
stack/lamp/instance-apache-php.cfg.in
View file @
29ec5ded
...
...
@@ -140,6 +140,7 @@ url = {{ lamp_apache_httpd }}
output = ${directory:apache.d}/lamp.conf
context =
section parameter_dict apache-php-configuration
raw root_path {{ root_path }}
[apache-php-conf]
recipe = slapos.recipe.template:jinja2
...
...
stack/lamp/instance.cfg.in
View file @
29ec5ded
...
...
@@ -73,6 +73,7 @@ extra-context =
key custom_application_template application-parameters:custom-application-template
section parameter_dict dynamic-template-apache-php-parameters
raw lamp_apache_httpd {{ lamp_apache_httpd }}
raw root_path {{ root_path }}
[dynamic-template-mariadb-parameters]
bash = {{ bash_location }}
...
...
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