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
Joanne Hugé
slapos
Commits
6c34f889
Commit
6c34f889
authored
Oct 26, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
attempt to publish admin password
parent
693e8a42
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
slapos/recipe/drupal/__init__.py
slapos/recipe/drupal/__init__.py
+2
-1
software/drupal/instance-custom.cfg.in
software/drupal/instance-custom.cfg.in
+6
-0
software/drupal/software.cfg
software/drupal/software.cfg
+3
-2
No files found.
slapos/recipe/drupal/__init__.py
View file @
6c34f889
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
##############################################################################
##############################################################################
import
os
import
os
import
re
import
subprocess
import
subprocess
import
tempfile
import
tempfile
import
textwrap
import
textwrap
...
@@ -80,7 +81,7 @@ class InitRecipe(GenericBaseRecipe):
...
@@ -80,7 +81,7 @@ class InitRecipe(GenericBaseRecipe):
],
],
stderr
=
subprocess
.
STDOUT
)
stderr
=
subprocess
.
STDOUT
)
self
.
options
[
'admin
_
password'
]
=
self
.
extract_password
(
drush_output
)
self
.
options
[
'admin
-
password'
]
=
self
.
extract_password
(
drush_output
)
# 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 @
6c34f889
[buildout]
[buildout]
[publish-drupal-admin-password]
recipe = slapos.cookbook:publish
drupal-admin-password = $${drupal-init:admin-password}
[drupal-init]
[drupal-init]
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
settings-php = ${application-configuration:location}
settings-php = ${application-configuration:location}
htdocs = $${rootdirectory:srv}/www
htdocs = $${rootdirectory:srv}/www
#admin-password =
dependency = $${apache-php:recipe}
dependency = $${apache-php:recipe}
software/drupal/software.cfg
View file @
6c34f889
...
@@ -26,14 +26,15 @@ location = sites/default/settings.php
...
@@ -26,14 +26,15 @@ location = sites/default/settings.php
[custom-application-deployment]
[custom-application-deployment]
path = ${custom-application-deployment-template:output}
path = ${custom-application-deployment-template:output}
part-list = drupal-init
part-list = drupal-init publish-drupal-admin-password
[custom-application-deployment-template]
[custom-application-deployment-template]
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 =
86a6e065a8e01416f0c028a0571615db
md5sum =
283cb53ff8cd34635703e771062db919
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