Merge pull request #81 from NTIA/login-fixes

Login fixes
NTIA · Jan 5, 2018 · 499e0f5 · 499e0f5
2 parents a7bc288 + ede688c
commit 499e0f5
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/puppet/lib/facter/admin_email.rb b/puppet/lib/facter/admin_email.rb
@@ -0,0 +1,4 @@
+# admin_email.rb
+Facter.add('admin_email') do
+   setcode '/bin/cat /opt/scos-sensor/.admin_email'
+end
diff --git a/puppet/lib/facter/admin_password.rb b/puppet/lib/facter/admin_password.rb
@@ -0,0 +1,4 @@
+# admin_password.rb
+Facter.add('admin_password') do
+   setcode '/bin/cat /opt/scos-sensor/.admin_password'
+end
diff --git a/puppet/lib/facter/db_admin_email.rb b/puppet/lib/facter/db_admin_email.rb
diff --git a/puppet/lib/facter/db_admin_pw.rb b/puppet/lib/facter/db_admin_pw.rb
diff --git a/puppet/manifests/clone.pp b/puppet/manifests/clone.pp
@@ -9,8 +9,8 @@
   $ssl_dir = $scos::ssl_dir,
   $ssl_cert = $scos::ssl_cert,
   $ssl_key = $scos::ssl_key,
-  $db_admin_email = $scos::db_admin_email,
-  $db_admin_pw = $scos::db_admin_pw,
+  $admin_email = $scos::admin_email,
+  $admin_password = $scos::admin_password,
   )
 
 {

diff --git a/puppet/manifests/docker.pp b/puppet/manifests/docker.pp
@@ -9,8 +9,8 @@
   $ssl_dir = $scos::ssl_dir,
   $ssl_cert = $scos::ssl_cert,
   $ssl_key = $scos::ssl_key,
-  $db_admin_email = $scos::db_admin_email,
-  $db_admin_pw = $scos::db_admin_pw,
+  $admin_email = $scos::admin_email,
+  $admin_password = $scos::admin_password,
   $secret_key = $scos::setup::secret_key,
   )
 

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
@@ -11,8 +11,8 @@
   $ssl_dir = "${install_root}/nginx/certs",
   $ssl_cert = undef,
   $ssl_key = undef,
-  $db_admin_email = undef,
-  $db_admin_pw = 'changeme!',
+  $admin_email = undef,
+  $admin_password = 'changeme!',
 )
 
 {

diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
@@ -9,8 +9,8 @@
   $ssl_dir = $scos::ssl_dir,
   $ssl_cert = $scos::ssl_cert,
   $ssl_key = $scos::ssl_key,
-  $db_admin_email = $scos::db_admin_email,
-  $db_admin_pw = $scos::db_admin_pw,
+  $admin_email = $scos::admin_email,
+  $admin_password = $scos::admin_password,
   )
 
 {
@@ -24,12 +24,12 @@
 
   $secret_key = fqdn_rand_string(32)
 
-  exec { 'db_admin_pw':
-    command => "/bin/echo ${db_admin_pw} > ${install_root}/.db_admin_pw",
+  exec { 'admin_password':
+    command => "/bin/echo ${admin_password} > ${install_root}/.admin_password",
   }
 
-  exec { 'db_admin_email':
-    command => "/bin/echo ${db_admin_email} > ${install_root}/.db_admin_email",
+  exec { 'admin_email':
+    command => "/bin/echo ${admin_email} > ${install_root}/.admin_email",
   }
 
   file { "${ssl_dir}/ssl-cert-snakeoil.pem":

diff --git a/scripts/create_superuser.py b/scripts/create_superuser.py
@@ -14,9 +14,9 @@
 from django.contrib.auth import get_user_model  # noqa
 
 try:
-    with open('/opt/scos/.db_admin_pw', 'r') as admin_pw_file:
-        password = admin_pw_file.readline().rstrip()
-    with open('/opt/scos/.db_admin_email', 'r') as admin_email_file:
+    with open('/opt/scos-sensor/.admin_password', 'r') as admin_password_file:
+        password = admin_password_file.readline().rstrip()
+    with open('/opt/scos-sensor/.admin_email', 'r') as admin_email_file:
         email = admin_email_file.readline().rstrip()
 
 except IOError: