Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/discourse/files/init-discourse

Issue 9351210: Define Discourse admins and site settings in Puppet, separate private data from other settings (Closed)
Patch Set: Created Feb. 19, 2013, 3:08 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: modules/discourse/files/init-discourse
===================================================================
--- a/modules/discourse/files/init-discourse
+++ b/modules/discourse/files/init-discourse
@@ -1,14 +1,14 @@
#!/usr/bin/env python
import sys, os, pwd, subprocess
app_dir = '/opt/discourse'
-secret = '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08'
+secret = os.environ.get('DISCOURSE_SECRET', None)
# HOME environment variable isn't reliable when called via sudo
home_dir = os.path.expanduser('~' + pwd.getpwuid(os.getuid()).pw_name)
env = dict(os.environ)
env['GEM_HOME'] = os.path.join(home_dir, '.gems')
def preprocessFiles():
@@ -19,20 +19,23 @@ def preprocessFiles():
handle = open(gemfile_path, 'ab')
print >>handle, "gem 'fcgi'"
print >>sys.stderr, 'Added fcgi gem to Gemfile'
handle.close()
secret_path = os.path.join(app_dir, 'config', 'initializers', 'secret_token.rb')
handle = open(secret_path, 'rb')
if handle.read().find('SET_SECRET_HERE') >= 0:
- handle.close()
- handle = open(secret_path, 'wb')
- print >>handle, 'Discourse::Application.config.secret_token = "%s"' % secret
- print >>sys.stderr, 'Defined our secret in config/initializers/secret_token.rb'
+ if secret != None:
+ handle.close()
+ handle = open(secret_path, 'wb')
+ print >>handle, 'Discourse::Application.config.secret_token = "%s"' % secret
+ print >>sys.stderr, 'Defined our secret in config/initializers/secret_token.rb'
+ else:
+ print >>sys.stderr, 'Skipping defining secret in config/initializers/secret_token.rb, please set DISCOURSE_SECRET environment variable'
handle.close()
def callRailsCommand(command):
subprocess.call(command, env=env, cwd=app_dir)
def runInitCommands():
rake_path = os.path.join(env['GEM_HOME'], 'bin', 'rake')
spawn_path = '/etc/init.d/spawn-fcgi'

Powered by Google App Engine
This is Rietveld