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
Jean-Paul Smets
slapos
Commits
7b6fae8d
Commit
7b6fae8d
authored
Apr 07, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
require/provide installation profile name
parent
30a9f53d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
slapos/recipe/drupal/__init__.py
slapos/recipe/drupal/__init__.py
+7
-6
software/drupal/instance-custom.cfg.in
software/drupal/instance-custom.cfg.in
+1
-0
software/drupal/software.cfg
software/drupal/software.cfg
+1
-1
No files found.
slapos/recipe/drupal/__init__.py
View file @
7b6fae8d
...
@@ -74,12 +74,13 @@ class InitRecipe(GenericBaseRecipe):
...
@@ -74,12 +74,13 @@ class InitRecipe(GenericBaseRecipe):
if
self
.
is_db_empty
(
php_binary
=
self
.
options
[
'php-binary'
],
if
self
.
is_db_empty
(
php_binary
=
self
.
options
[
'php-binary'
],
settings_php
=
settings_php
):
settings_php
=
settings_php
):
drush_output
=
subprocess
.
check_output
([
drush_binary
,
subprocess
.
check_output
([
drush_binary
,
'-y'
,
'site-install'
,
'-y'
,
'site-install'
,
'--account-name=admin'
,
self
.
options
[
'profile'
],
'--account-pass=%s'
%
self
.
options
[
'admin-password'
],
'--account-name=admin'
,
],
'--account-pass=%s'
%
self
.
options
[
'admin-password'
],
stderr
=
subprocess
.
STDOUT
)
],
stderr
=
subprocess
.
STDOUT
)
# drush removes the 'w' bit from both the settings file and its
# drush removes the 'w' bit from both the settings file and its
# directory.
# directory.
...
...
software/drupal/instance-custom.cfg.in
View file @
7b6fae8d
...
@@ -9,6 +9,7 @@ drupal-admin-password = $${drupal-init:admin-password}
...
@@ -9,6 +9,7 @@ drupal-admin-password = $${drupal-init:admin-password}
recipe = slapos.cookbook:drupal_init
recipe = slapos.cookbook:drupal_init
drush-binary = ${apache-php:location}/bin/drush
drush-binary = ${apache-php:location}/bin/drush
php-binary = ${apache-php:location}/bin/php
php-binary = ${apache-php:location}/bin/php
profile = standard
settings-php = ${application-configuration:location}
settings-php = ${application-configuration:location}
htdocs = $${rootdirectory:srv}/www
htdocs = $${rootdirectory:srv}/www
admin-password = $${gen-passwd:passwd}
admin-password = $${gen-passwd:passwd}
...
...
software/drupal/software.cfg
View file @
7b6fae8d
...
@@ -34,7 +34,7 @@ part-list = drupal-init publish-drupal-admin-password
...
@@ -34,7 +34,7 @@ part-list = drupal-init publish-drupal-admin-password
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-custom.cfg.in
url = ${:_profile_base_location_}/instance-custom.cfg.in
output = ${buildout:directory}/instance-custom.cfg
output = ${buildout:directory}/instance-custom.cfg
md5sum =
30b3d75d79916ae25ef19969499a3aa2
md5sum =
eedb3f91b9382234ab4289e8c404a454
mode = 0644
mode = 0644
...
...
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