Project

General

Profile

« Previous | Next » 

Revision 243

Added by Aaron Marcuse-Kubitza about 13 years ago

Changed vegbien_dest and users of it to use separate bien_password file

View differences:

scripts/test/map
12 12 
test -n "$n" || export n="$tests_n" testMode=1
13 13 

  		




  14
  14
  
    
. ../util/env_password in_password


  		




  
  15
  
    
bien_password="$(cat ../util/bien_password)"


  		




  15
  16
  
    

  		




  16
  17
  
    
make --directory=../../mappings


  		




  17
  18
  
    

  		












  

    
      scripts/Makefile
    
  





  27
  27
  
    

  		




  28
  28
  
    
#####


  		




  29
  29
  
    

  		




  30
  
  
    
ifneq ($(filter _with_db_%,$(MAKECMDGOALS)),)


  		




  31
  
  
    
include util/vegbien_dest


  		




  32
  
  
    
endif


  		




  33
  
  
    

  		




  34
  30
  
    
with_db = $(MAKE) _with_db_$@


  		




  35
  31
  
    

  		




  36
  32
  
    
#####


  		




  ......




  63
  59
  
    
asPostgresAdmin = sudo -u postgres


  		




  64
  60
  
    
psqlAsAdmin = $(asPostgresAdmin) psql $(psqlOpts)


  		




  65
  61
  
    
psqlAsDbUser = ./util/psql_vegbien $(psqlOpts)


  		




  
  62
  
    
bienPassword = $(shell cat util/bien_password)


  		




  66
  63
  
    

  		




  67
  64
  
    
postgres_user: _not_file


  		




  68
  65
  
    
	$(with_db)


  		




  ......




  70
  67
  
    
_with_db_postgres_user: _not_file


  		




  71
  68
  
    
	@echo $(emph)"At sudo password prompt, enter *your* password"$(end_emph)


  		




  72
  69
  
    
	@sudo -v


  		




  73
  
  
    
	@echo $(emph)"At \"Enter password for new role:\", enter $(out_password)"$(end_emph)


  		




  
  70
  
    
	@echo $(emph)"At \"Enter password for new role:\", enter $(bienPassword)"$(end_emph)


  		




  74
  71
  
    
	-$($@_cmd)


  		




  75
  72
  
    
# ignore errors about user existing


  		




  76
  73
  
    
_with_db_postgres_user_cmd = $(asPostgresAdmin) createuser --no-superuser \


  		




  77
  
  
    
--no-createdb --no-createrole --pwprompt "$(out_user)"


  		




  
  74
  
    
--no-createdb --no-createrole --pwprompt "bien"


  		




  78
  75
  
    

  		




  79
  76
  
    
rm_postgres_user: _not_file


  		




  80
  77
  
    
	echo "DROP USER IF EXISTS bien;"|$(psqlAsAdmin)


  		




  ......




  103
  100
  
    
	$(with_db)


  		




  104
  101
  
    
# sub-make will include vegbien_dest


  		




  105
  102
  
    
_with_db_mysql-Linux: _not_file


  		




  106
  
  
    
	@echo $(emph)"At prompt for MySQL root password, enter $(out_password)"$(end_emph)


  		




  
  103
  
    
	@echo $(emph)"At prompt for MySQL root password, enter $(bienPassword)"$(end_emph)


  		




  107
  104
  
    
	@$(wait)


  		




  108
  105
  
    
	-sudo apt-get install mysql-server mysql-client python-mysqldb


  		




  109
  106
  
    

  		




  ......




  126
  123
  
    

  		




  127
  124
  
    
mysql-: _not_file # other OSes


  		




  128
  125
  
    

  		




  129
  
  
    
mysqlAsAdmin = mysql --user=root --password='$(out_password)'


  		




  
  126
  
    
mysqlAsAdmin = mysql --user=root --password='$(bienPassword)'


  		




  130
  127
  
    

  		




  131
  128
  
    
mysql_user: _not_file


  		




  132
  129
  
    
	$(with_db)


  		




  ......




  134
  131
  
    
_with_db_mysql_user: _not_file


  		




  135
  132
  
    
	-$($@_cmd)


  		




  136
  133
  
    
# ignore errors about user existing


  		




  137
  
  
    
_with_db_mysql_user_cmd = echo "CREATE USER '$(out_user)'@'$(out_host)' \


  		




  138
  
  
    
IDENTIFIED BY '$(out_password)';"|$(mysqlAsAdmin)


  		




  
  134
  
    
_with_db_mysql_user_cmd = echo "CREATE USER 'bien'@'localhost' \


  		




  
  135
  
    
IDENTIFIED BY '$(bienPassword)';"|$(mysqlAsAdmin)


  		




  139
  136
  
    

  		




  140
  137
  
    
rm_mysql_user: _not_file


  		




  141
  138
  
    
	$(with_db)


  		












  

    
      scripts/util/bien_password
    
  





  
  1
  
    
67d6c28fac7541d9ce1f46ba4f84e149


  		












  

    
      scripts/util/psql_vegbien
    
  





  3
  3
  
    

  		




  4
  4
  
    
selfDir="$(dirname -- "$0")"


  		




  5
  5
  
    

  		




  
  6
  
    
bien_password="$(cat "$selfDir/bien_password")"


  		




  6
  7
  
    
. "$selfDir/vegbien_dest"


  		




  7
  8
  
    
export PGHOST="$out_host" PGUSER="$out_user" PGPASSWORD="$out_password"


  		




  8
  9
  
    

  		












  

    
      scripts/util/vegbien_dest
    
  





  1
  
  
    
export out_engine=PostgreSQL


  		




  2
  
  
    
export out_host=localhost


  		




  3
  
  
    
export out_user=bien


  		




  4
  
  
    
export out_password=67d6c28fac7541d9ce1f46ba4f84e149


  		




  5
  
  
    
export out_database=vegbien


  		




  
  1
  
    
#!/bin/sh


  		




  
  2
  
    
# Requires var bien_password


  		




  
  3
  
    

  		




  
  4
  
    
export out_engine=PostgreSQL out_host=localhost out_user=bien \


  		




  
  5
  
    
out_password="$bien_password" out_database=vegbien


  		












Also available in:  Unified diff