From 9cf2218af9bf2abe0344f0736991735f395d17bb Mon Sep 17 00:00:00 2001 From: myvault Date: Sun, 30 Sep 2018 11:14:41 +0300 Subject: [PATCH] Removing ignored files --- cookiecutter.json | 3 ++- {{cookiecutter.project_slug}}/sc/create_db.sh | 14 +++++++------- .../sc/git_create_repo.sh | 0 3 files changed, 9 insertions(+), 8 deletions(-) mode change 100644 => 100755 {{cookiecutter.project_slug}}/sc/git_create_repo.sh diff --git a/cookiecutter.json b/cookiecutter.json index a58ce8b22..3abf5487f 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -2,7 +2,8 @@ "project_name": "My Awesome Project", "project_slug": "{{ cookiecutter.project_name.lower()|replace(' ', '_')|replace('-', '_') }}", "venv_name": "{{cookiecutter.project_slug}}_venv", - "database_user_password":"pass", + "database_user":"{{cookiecutter.project_slug}}_user", + "database_user_password":"password", "description": "Behold My Awesome Project!", "author_name": "Mohand Ahmad", "domain_name": "example.com", diff --git a/{{cookiecutter.project_slug}}/sc/create_db.sh b/{{cookiecutter.project_slug}}/sc/create_db.sh index 038d01894..ac1177683 100755 --- a/{{cookiecutter.project_slug}}/sc/create_db.sh +++ b/{{cookiecutter.project_slug}}/sc/create_db.sh @@ -3,25 +3,25 @@ sudo -u postgres psql --command 'CREATE DATABASE {{cookiecutter.project_slug}};' echo -echo 'Creating DB user {{cookiecutter.project_slug}}_user with password {{cookiecutter.database_user_password}}' -sudo -u postgres psql --command 'CREATE USER {{cookiecutter.project_slug}}_user WITH PASSWORD '\'{{cookiecutter.database_user_password}}\'; +echo 'Creating DB user {{cookiecutter.database_user}} with password {{cookiecutter.database_user_password}}' +sudo -u postgres psql --command 'CREATE USER {{cookiecutter.database_user}} WITH PASSWORD '\'{{cookiecutter.database_user_password}}\'; echo echo 'Altering role to utf8' -sudo -u postgres psql --command 'ALTER ROLE {{cookiecutter.project_slug}}_user SET client_encoding TO '\'utf8\'; +sudo -u postgres psql --command 'ALTER ROLE {{cookiecutter.database_user}} SET client_encoding TO '\'utf8\'; echo echo 'setting default_transaction_isolation TO read committed' -sudo -u postgres psql --command 'ALTER ROLE {{cookiecutter.project_slug}}_user SET default_transaction_isolation TO '\'read\ committed\'; +sudo -u postgres psql --command 'ALTER ROLE {{cookiecutter.database_user}} SET default_transaction_isolation TO '\'read\ committed\'; echo echo 'setting timezone to {{cookiecutter.timezone}}' -sudo -u postgres psql --command 'ALTER ROLE {{cookiecutter.project_slug}}_user SET timezone TO '\'{{cookiecutter.timezone}}\'; +sudo -u postgres psql --command 'ALTER ROLE {{cookiecutter.database_user}} SET timezone TO '\'{{cookiecutter.timezone}}\'; echo -echo 'Granting all privileges on Database {{cookiecutter.project_slug}} to {{cookiecutter.project_slug}}_user;' -sudo -u postgres psql --command 'GRANT ALL PRIVILEGES ON DATABASE {{cookiecutter.project_slug}} TO {{cookiecutter.project_slug}}_user;' +echo 'Granting all privileges on Database {{cookiecutter.project_slug}} to {{cookiecutter.database_user}};' +sudo -u postgres psql --command 'GRANT ALL PRIVILEGES ON DATABASE {{cookiecutter.project_slug}} TO {{cookiecutter.database_user}};' diff --git a/{{cookiecutter.project_slug}}/sc/git_create_repo.sh b/{{cookiecutter.project_slug}}/sc/git_create_repo.sh old mode 100644 new mode 100755