Changeset 905

Timestamp:

05/22/13 15:30:27 (10 years ago)

Author:

ramonb

Message:

jobarchived/job_dbase.sql:

• changed to CREATE user and ALTER password: so that create may fail (if user exists) and password upate still succeeds

pkg/rpm/jobmonarch.spec.in, debian/jobmonarch.postinst:

• changed CREATE to ALTER

Location:

branches/1.0

Files:

• debian/jobmonarch.postinst (modified) (1 diff)
• jobarchived/job_dbase.sql (modified) (2 diffs)
• pkg/rpm/jobmonarch.spec.in (modified) (1 diff)

branches/1.0/debian/jobmonarch.postinst

@@ -12 +12 @@
     export DB_PASSWD=$(tr -dc A-Za-z0-9_< /dev/urandom |head -c 8 | xargs)
     # Set the password in the SQL script 
-    sed -i -e '/^.*modify me:.*$/d' -e 's/^-- CREATE/CREATE/g' -e "s/'';/'$DB_PASSWD';/g" %{_datadir}/jobarchived/job_dbase.sql
+    sed -i -e '/^.*modify me:.*$/d' -e 's/^-- ALTER/ALTER/g' -e "s/'';/'$DB_PASSWD';/g" %{_datadir}/jobarchived/job_dbase.sql
     # Set the password in the jobarchived config.
     sed -i -e "s/^#JOB_SQL_PASSWORD.*$/JOB_SQL_PASSWORD\t\t: $DB_PASSWD/g" %{_sysconfdir}/jobarchived.conf

branches/1.0/jobarchived/job_dbase.sql

@@ -1 @@
-DROP TABLE jobs CASCADE;
-DROP TABLE nodes CASCADE;
-DROP TABLE job_nodes CASCADE;
-
 CREATE TABLE jobs (
         job_id                  VARCHAR(20) NOT NULL UNIQUE PRIMARY KEY,
@@ -28 +24 @@
 );
 
+CREATE USER jobarchive;
+
 -- modify me: set a password
--- CREATE USER jobarchive WITH PASSWORD '';
+-- ALTER USER jobarchive WITH PASSWORD '';
 
 GRANT ALL ON jobs,nodes,job_nodes TO "jobarchive";

branches/1.0/pkg/rpm/jobmonarch.spec.in

@@ -145 +145 @@
     export DB_PASSWD=$(tr -dc A-Za-z0-9_< /dev/urandom |head -c 8 | xargs)
     # Set the password in the SQL script 
-    sed -i -e '/^.*modify me:.*$/d' -e 's/^-- CREATE/CREATE/g' -e "s/'';/'$DB_PASSWD';/g" %{_datadir}/jobarchived/job_dbase.sql
+    sed -i -e '/^.*modify me:.*$/d' -e 's/^-- ALTER/ALTER/g' -e "s/'';/'$DB_PASSWD';/g" %{_datadir}/jobarchived/job_dbase.sql
     # Set the password in the jobarchived config.
     sed -i -e "s/^#JOB_SQL_PASSWORD.*$/JOB_SQL_PASSWORD\t\t: $DB_PASSWD/g" %{_sysconfdir}/jobarchived.conf