Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
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
Mynij
slapos-mynij-dev
Commits
cbb07be4
Commit
cbb07be4
authored
12 years ago
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'drupal2'
Conflicts: software/drupal/software.cfg
parents
5e792b10
47dedac9
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
2 deletions
+39
-2
software/drupal/settings.php.in
software/drupal/settings.php.in
+12
-1
software/drupal/software.cfg
software/drupal/software.cfg
+9
-1
software/drupal/system.theme.css.patch
software/drupal/system.theme.css.patch
+18
-0
No files found.
software/drupal/settings.php.in
View file @
cbb07be4
...
...
@@ -200,12 +200,23 @@
* );
* @endcode
*/
/*
+ * The apachephp recipe provided with both host+port in the same string.
+ * Split them again, php way.
+ * And it could be an ipv6 as well, so beware of colons.
+ */
$mysql_host_port = '%(mysql_host)s';
$mysql_port = substr(strrchr($mysql_host_port, ":"), 1);
$mysql_host = substr($mysql_host_port, 0, strlen($mysql_host_port) - strlen($mysql_port) - 1);
$databases['default']['default'] = array(
'driver' => 'mysql',
'database' => '%(mysql_database)s',
'username' => '%(mysql_user)s',
'password' => '%(mysql_password)s',
'host' => '%(mysql_host)s',
'host' => $mysql_host,
'port' => $mysql_port,
'prefix' => '',
);
...
...
This diff is collapsed.
Click to expand it.
software/drupal/software.cfg
View file @
cbb07be4
...
...
@@ -3,15 +3,23 @@
extends =
../../stack/lamp/buildout.cfg
parts +=
patch-css
[application]
recipe = slapos.recipe.build:download-unpacked
url = http://ftp.drupal.org/files/projects/drupal-7.16.tar.gz
md5sum = 352497b2df94b5308e31cb8da020b631
[patch-css]
recipe = cp.recipe.cmd
install_cmd = patch ${application:location}/modules/system/system.theme.css <${:_profile_base_location_}/system.theme.css.patch
[application-template]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/settings.php.in
md5sum =
add9e4e96094a9d3fb7cf0f4d26ae544
md5sum =
b0ef5548c3ac1de8ca56882e51e6eb6d
download-only = True
filename = template.in
mode = 0644
...
...
This diff is collapsed.
Click to expand it.
software/drupal/system.theme.css.patch
0 → 100644
View file @
cbb07be4
--- a/system.theme.css Mon Oct 29 11:20:30 2012 +0100
+++ b/system.theme.css Mon Oct 29 11:20:53 2012 +0100
@@ -1,3 +1,14 @@
+
+#install-settings-form .form-item-driver,
+#install-settings-form #edit-mysql * {
+ display: none;
+}
+
+#install-settings-form #edit-mysql:before {
+ content: "The database has been set up by SlapOS.";
+ font-weight: bold;
+ font-size: 120%;
+}
/**
* @file
This diff is collapsed.
Click to expand it.
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