diff options
Diffstat (limited to 'auth/auth-cass/cass_init')
-rw-r--r-- | auth/auth-cass/cass_init/cmd.sh | 5 | ||||
-rw-r--r-- | auth/auth-cass/cass_init/init.cql | 1 | ||||
-rw-r--r-- | auth/auth-cass/cass_init/init2_10.cql | 2 | ||||
-rw-r--r-- | auth/auth-cass/cass_init/prep.sh | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index ffaf182d..ba55648e 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -33,6 +33,7 @@ fi # Always need startup status... if [ ! -e "$DIR" ]; then mkdir -p "$DIR" + chmod 777 $DIR fi function status { @@ -134,7 +135,7 @@ case "$1" in # Startup like normal echo "Cassandra Startup" - /usr/local/bin/docker-entrypoint.sh + exec /usr/local/bin/docker-entrypoint.sh ;; wait) # Wait for initialization. This can be called from Docker only as a check to make sure it is ready @@ -148,7 +149,7 @@ case "$1" in # Startup like normal echo "Cassandra Startup" - /usr/local/bin/docker-entrypoint.sh + exec /usr/local/bin/docker-entrypoint.sh ;; esac diff --git a/auth/auth-cass/cass_init/init.cql b/auth/auth-cass/cass_init/init.cql index bf75998d..04540799 100644 --- a/auth/auth-cass/cass_init/init.cql +++ b/auth/auth-cass/cass_init/init.cql @@ -73,6 +73,7 @@ CREATE TABLE cred ( notes varchar, cred blob, prev blob, + tag varchar, PRIMARY KEY (id,type,expires) ); CREATE INDEX cred_ns ON cred(ns); diff --git a/auth/auth-cass/cass_init/init2_10.cql b/auth/auth-cass/cass_init/init2_10.cql new file mode 100644 index 00000000..839acf60 --- /dev/null +++ b/auth/auth-cass/cass_init/init2_10.cql @@ -0,0 +1,2 @@ +use authz; +alter TABLE cred ADD tag varchar; diff --git a/auth/auth-cass/cass_init/prep.sh b/auth/auth-cass/cass_init/prep.sh index 03031a48..3254c0ee 100644 --- a/auth/auth-cass/cass_init/prep.sh +++ b/auth/auth-cass/cass_init/prep.sh @@ -28,7 +28,7 @@ mv user_role.dat $TEMP cat $TEMP | awk -F '|' '{print $1"|"$2"|"ENVIRON["DATE"]"|"$4"|"$5}' > user_role.dat mv cred.dat $TEMP -cat $TEMP | awk -F '|' '{print $1"|"$2"|"ENVIRON["DATE"]"|"$4"|"$5"|"$6"|"$7"|"$8}' > cred.dat +cat $TEMP | awk -F '|' '{print $1"|"$2"|"ENVIRON["DATE"]"|"$4"|"$5"|"$6"|"$7"|"$8"|"$9}' > cred.dat rm $TEMP |