Save passwords as bcrypt instead of plain SHA-1 hashes (includes migration of old...

[pr0n] / sql / pr0n.sql

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index fe749b9e6ed116717b796f24f8e558247d75cb5e..4089a6a577790984a74672c9580fa6d8d80ef957 100644 (file)
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -18,8 +18,10 @@ CREATE TABLE last_picture_cache (
    FOREIGN KEY (vhost,event) REFERENCES events(vhost,event)
 );
 
    FOREIGN KEY (vhost,event) REFERENCES events(vhost,event)
 );
 

+CREATE SEQUENCE imageid_seq;
+

 CREATE TABLE images (
 CREATE TABLE images (

-    id serial NOT NULL PRIMARY KEY,
+    id integer DEFAULT nextval('imageid_seq') NOT NULL PRIMARY KEY,

     vhost character varying NOT NULL,
     event character varying NOT NULL,
     filename character varying NOT NULL,
     vhost character varying NOT NULL,
     event character varying NOT NULL,
     filename character varying NOT NULL,


@@ -71,9 +73,10 @@ CREATE TABLE shadow_files (
 
 CREATE TABLE users (
     username character varying NOT NULL,
 
 CREATE TABLE users (
     username character varying NOT NULL,

-    sha1password character(27) NOT NULL,
+    sha1password character(27),

     vhost character varying NOT NULL,
     vhost character varying NOT NULL,

-    digest_ha1_hex character(32)
+    digest_ha1_hex character(32),
+    cryptpassword character varying

 );
 
 -- Mainly used for manual queries -- usually too slow to be very useful
 );
 
 -- Mainly used for manual queries -- usually too slow to be very useful


@@ -100,7 +103,7 @@ CREATE INDEX tags_tag ON tags ( tag );
 GRANT INSERT ON TABLE deleted_images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE events TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE fake_files TO pr0n;
 GRANT INSERT ON TABLE deleted_images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE events TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE fake_files TO pr0n;

-GRANT SELECT,UPDATE ON TABLE images_id_seq TO pr0n;
+GRANT SELECT,UPDATE ON TABLE imageid_seq TO pr0n;

 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE shadow_files TO pr0n;
 GRANT SELECT,UPDATE ON TABLE users TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE shadow_files TO pr0n;
 GRANT SELECT,UPDATE ON TABLE users TO pr0n;