Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update config keys to match xiana 0.4 #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update config keys to match xiana 0.4 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59203f0
update config keys to match xiana 0.4
Feb 21, 2022
fe51975
dot
Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# xiana

A Leiningen template for flexiana/framework v0.3.0.
A Leiningen template for flexiana/framework.

## Usage

Expand Down
4 changes: 2 additions & 2 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(defproject xiana/lein-template "0.3.4.1"
:description "A Leiningen template for flexiana/framework v0.3.x"
(defproject xiana/lein-template "0.4.0"
:description "A Leiningen template for flexiana/framework v0.4.x"
:url "https://github.com/Flexiana/xiana-template"
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"}
Expand Down
46 changes: 23 additions & 23 deletions resources/leiningen/new/xiana/config/dev/config.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{:framework.db.storage/postgresql {:port 5433
:dbname "{{name-to-path}}"
:host "localhost"
:dbtype "postgresql"
:user "postgres"
:password "postgres"}
:framework.app/session-backend {:storage :database
:session-table-name :sessions}
:framework.db.storage/migration {:store :database
:seeds-dir "dev_seeds"
:migration-dir "migrations"
:init-in-transaction? false
:migration-table-name "migrations"
:seeds-table-name "seeds"}
:framework.app/web-server {:port 3000
:join? false}
:framework.app/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2
:bcrypt-settings {:work-factor 11}
:scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2
:memory-cost 8
:parallelization 1}
:pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256
:iterations 100000}}}
{:xiana/postgresql {:port 5433
:dbname "{{name-to-path}}"
:host "localhost"
:dbtype "postgresql"
:user "postgres"
:password "postgres"}
:xiana/session-backend {:storage :database
:session-table-name :sessions}
:xiana/migration {:store :database
:seeds-dir "dev_seeds"
:migration-dir "migrations"
:init-in-transaction? false
:migration-table-name "migrations"
:seeds-table-name "seeds"}
:xiana/web-server {:port 3000
:join? false}
:xiana/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2
:bcrypt-settings {:work-factor 11}
:scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2
:memory-cost 8
:parallelization 1}
:pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256
:iterations 100000}}}
44 changes: 22 additions & 22 deletions resources/leiningen/new/xiana/config/test/config.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{:framework.db.storage/postgresql {:image-name "postgres:14-alpine"
:port 5433
:dbname "{{name-to-path}}"
:host "localhost"
:dbtype "postgresql"
:user "postgres"
:password "postgres"}
:framework.db.storage/migration {:store :database
:seeds-dir "test_seeds"
:migration-dir "migrations"
:init-in-transaction? false
:migration-table-name "migrations"
:seeds-table-name "seeds"}
:framework.app/web-server {:port 3333
:join? false}
:framework.app/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2
:bcrypt-settings {:work-factor 11}
:scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2
:memory-cost 8
:parallelization 1}
:pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256
:iterations 100000}}}
{:xiana/postgresql {:image-name "postgres:14-alpine"
:port 5433
:dbname "{{name-to-path}}"
:host "localhost"
:dbtype "postgresql"
:user "postgres"
:password "postgres"}
:xiana/migration {:store :database
:seeds-dir "test_seeds"
:migration-dir "migrations"
:init-in-transaction? false
:migration-table-name "migrations"
:seeds-table-name "seeds"}
:xiana/web-server {:port 3333
:join? false}
:xiana/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2
:bcrypt-settings {:work-factor 11}
:scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2
:memory-cost 8
:parallelization 1}
:pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256
:iterations 100000}}}
2 changes: 1 addition & 1 deletion resources/leiningen/new/xiana/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:description "FIXME: write description"
:min-lein-version "2.0.0"
:dependencies [[org.clojure/clojure "1.10.3"]
[com.flexiana/framework "0.3.4"]
[com.flexiana/framework "0.4.0"]
[thheller/shadow-cljs "2.11.26"]
[migratus "1.3.5"]
[clj-http "3.12.1"]
Expand Down
2 changes: 1 addition & 1 deletion resources/leiningen/new/xiana/shadow-cljs.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
:output-dir "resources/public/assets/js/compiled",
:asset-path "assets/js/compiled",
:modules {:app {:init-fn {{sanitized-name}}.core/init,
:preloads [devtools.preload]}}}}, :lein true}
:preloads [devtools.preload]}}}}, :lein true}
2 changes: 1 addition & 1 deletion resources/leiningen/new/xiana/src/backend/app_name/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
(defn ->system
[app-cfg]
(-> (config/config app-cfg)
(rename-key :framework.app/auth :auth)
(rename-key :xiana/auth :auth)
routes/reset
rbac/init
session/init-backend
Expand Down