contao 0.6.3 → 0.6.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/contao/application.rb +1 -1
- data/lib/contao/templates/contao_initializer.rb.erb +28 -24
- data/lib/contao/version.rb +1 -1
- metadata +2 -2
data/lib/contao/application.rb
CHANGED
@@ -21,7 +21,7 @@ module TechnoGate
|
|
21
21
|
def load_global_config!
|
22
22
|
config.contao.global =
|
23
23
|
YAML.load(File.read(global_config_path)).to_openstruct
|
24
|
-
config.contao.global.mysql.database = name
|
24
|
+
config.contao.global.mysql.database = name unless config.contao.global.mysql.nil?
|
25
25
|
end
|
26
26
|
|
27
27
|
def config
|
@@ -4,38 +4,42 @@
|
|
4
4
|
|
5
5
|
module ContaoTemplate
|
6
6
|
class Application < Rails::Application
|
7
|
-
|
8
|
-
config.contao.install_password = '<%= config.install_password %>'
|
7
|
+
if config.respond_to? :contao
|
9
8
|
|
10
|
-
|
11
|
-
|
9
|
+
# The install password is used by /contao/install.php page
|
10
|
+
config.contao.install_password = '<%= config.install_password %>'
|
12
11
|
|
13
|
-
|
14
|
-
|
12
|
+
# The encryption key is used by extensions
|
13
|
+
config.contao.encryption_key = '<%= config.encryption_key %>'
|
15
14
|
|
16
|
-
|
17
|
-
|
15
|
+
# The admin email
|
16
|
+
config.contao.admin_email = '<%= config.admin_email %>'
|
18
17
|
|
19
|
-
|
20
|
-
|
18
|
+
# The time zone
|
19
|
+
config.contao.time_zone = '<%= config.time_zone %>'
|
21
20
|
|
22
|
-
|
23
|
-
|
24
|
-
<%- if config.smtp_enabled %>
|
25
|
-
# SMTP Host
|
26
|
-
config.contao.smtp.host = '<%= config.smtp_host %>'
|
21
|
+
# SMTP Configuration
|
22
|
+
# Configure contao to use an SMTP server
|
27
23
|
|
28
|
-
|
29
|
-
|
24
|
+
# Enable SMTP ?
|
25
|
+
config.contao.smtp.enabled = <%= config.smtp_enabled %>
|
26
|
+
<%- if config.smtp_enabled %>
|
27
|
+
# SMTP Host
|
28
|
+
config.contao.smtp.host = '<%= config.smtp_host %>'
|
30
29
|
|
31
|
-
|
32
|
-
|
30
|
+
# SMTP User
|
31
|
+
config.contao.smtp.user = '<%= config.smtp_user %>'
|
33
32
|
|
34
|
-
|
35
|
-
|
33
|
+
# SMTP Pass
|
34
|
+
config.contao.smtp.pass = '<%= config.smtp_pass %>'
|
36
35
|
|
37
|
-
|
38
|
-
|
39
|
-
|
36
|
+
# SMTP SSL
|
37
|
+
config.contao.smtp.ssl = <%= config.smtp_ssl %>
|
38
|
+
|
39
|
+
# SMTP Port
|
40
|
+
config.contao.smtp.port = <%= config.smtp_port %>
|
41
|
+
<%- end %>
|
42
|
+
|
43
|
+
end
|
40
44
|
end
|
41
45
|
end
|
data/lib/contao/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: contao
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
211
211
|
version: '0'
|
212
212
|
segments:
|
213
213
|
- 0
|
214
|
-
hash:
|
214
|
+
hash: 1687258099450564260
|
215
215
|
requirements: []
|
216
216
|
rubyforge_project:
|
217
217
|
rubygems_version: 1.8.23
|