Move web stuff before env (env uses a variable from web) (#49)

criteo-cookbooks · Jun 8, 2018 · b5a30e3 · b5a30e3
1 parent fce1e18
commit b5a30e3
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -13,14 +13,6 @@
 default['librenms']['user']  = 'librenms'
 default['librenms']['group'] = 'librenms'
 
-# env related
-default['librenms']['env']['APP_KEY'] = 'Ch4ng3m3pl34s3TyChangeMePleaseTy'
-default['librenms']['env']['DB_HOST'] = 'localhost'
-default['librenms']['env']['DB_DATABASE'] = node['mariadb']['database']['name']
-default['librenms']['env']['DB_USERNAME'] = node['mariadb']['user_librenms']['username']
-default['librenms']['env']['DB_PASSWORD'] = node['mariadb']['user_librenms']['password']
-default['librenms']['env']['APP_URL'] = 'http://' + node['librenms']['web']['name'] + '/'
-
 # httpd related
 default['librenms']['web']['name'] = 'librenms.example.com'
 default['librenms']['web']['port'] = '80'
@@ -30,6 +22,14 @@
 default['librenms']['phpini']['memory_limit'] = '128M'
 default['librenms']['phpini']['timezone'] = 'UTC'
 
+# env related
+default['librenms']['env']['APP_KEY'] = 'Ch4ng3m3pl34s3TyChangeMePleaseTy'
+default['librenms']['env']['DB_HOST'] = 'localhost'
+default['librenms']['env']['DB_DATABASE'] = node['mariadb']['database']['name']
+default['librenms']['env']['DB_USERNAME'] = node['mariadb']['user_librenms']['username']
+default['librenms']['env']['DB_PASSWORD'] = node['mariadb']['user_librenms']['password']
+default['librenms']['env']['APP_URL'] = 'http://' + node['librenms']['web']['name'] + '/'
+
 # snmpd
 default['librenms']['snmp']['community'] = 'public'
 default['librenms']['contact'] = '[email protected]'