diff of 0fb597dafa973c71def06f8be880c7719e480d8d
0fb597dafa973c71def06f8be880c7719e480d8d
diff --git a/Makefile b/Makefile
index 15134fd..1856d88 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,13 @@
+# DB settings. Replace if yours differ.
+MURJA_DB_USER = "blogadmin"
+MURJA_DB = "blogdb"
+MURJA_DB_PASSWORD = "blog"
+MURJA_DB_HOST = "localhost"
+MURJA_DB_PORT = 5432
+
+REPL_PORT=4005
+APP_PORT=3000
+
SHELL=/bin/bash
SRC_FILES := $(shell find . -name \*.lisp)
@@ -27,3 +37,19 @@ install: murja
$(MAKE) /usr/lib/systemd/system/Murja.service
chown -R murja:murja /opt/murja/
systemctl start Murja
+
+# devtime stuff
+
+.PHONY: repl
+repl: ## Sets up the repl and starts the app
+ @(export APP_PORT=$(APP_PORT) && export MURJA_DB_HOST=$(MURJA_DB_HOST) && export MURJA_DB_PORT=$(MURJA_DB_PORT) && export MURJA_DB_USER=$(MURJA_DB_USER) && export MURJA_DB=$(MURJA_DB) && export MURJA_DB_PASSWORD=$(MURJA_DB_PASSWORD) && export MURJA_DB_PORT=$(MURJA_DB_PORT) && sbcl --dynamic-space-size 4096 --load aggressive-murja.asd --eval "(ql:quickload :aggressive-murja)" --eval "(swank:create-server :port $(REPL_PORT) :dont-close t)" --eval "(cl-user::run)")
+
+.PHONY: run
+run: ## Runs the app without repl
+ @(export APP_PORT=$(APP_PORT) && export MURJA_DB_PORT=$(MURJA_DB_PORT) && export MURJA_DB_USER=$(MURJA_DB_USER) && export MURJA_DB=$(MURJA_DB) && export MURJA_DB_PASSWORD=$(MURJA_DB_PASSWORD) && export MURJA_DB_PORT=$(MURJA_DB_PORT) && sbcl --load aggressive-murja.asd --eval "(ql:quickload :aggressive-murja)" --eval "(cl-user::run)")
+
+.PHONY: clean
+clean: ## Deletes all the fasl droppings
+ find . -name '*.fasl' -delete
+ find . -name '*.lisp' -exec touch {} \+
+
diff --git a/aggressive-murja.asd b/aggressive-murja.asd
index 825e8f0..e446e3e 100644
--- a/aggressive-murja.asd
+++ b/aggressive-murja.asd
@@ -31,7 +31,11 @@
"cl-hash-util"
"spinneret"
"parenscript"
- "paren-async")
+ "paren-async"
+
+
+ "swank"
+ "swank/exts")
:description "A rewrite of the <a href=\"https://github.com/feuery/murja-blog/\">murja blogging engine</a> in lisp"
:components ((:module "src"
:components
diff --git a/src/main.lisp b/src/main.lisp
index 7e1af8a..e475aef 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -5,20 +5,24 @@
(defun stop-server ()
(hunchentoot:stop *server*))
-(defun start-server (&key (port 3010))
- (log:info "Starting murja server~%")
- (with-db
- (migrate))
- (let ((server (make-instance 'easy-routes:easy-routes-acceptor :port port)))
- (when (equalp 3010 port)
- (setf *server* server))
-
- (hunchentoot:start server)
- (log:info "Started murja server on ~a ~%" port)
- server))
+(defun start-server ()
+ (let ((port (or (some-> (sb-ext:posix-getenv "APP_PORT") parse-number)
+ 3123)))
+ (log:info "Starting murja server~%")
+ (with-db
+ (migrate))
-(defun main (&key (port 3010))
- (start-server :port port)
+ (log:info "Don't migrate~%")
+ (let ((server (make-instance 'easy-routes:easy-routes-acceptor :port port)))
+ (when (equalp 3010 port)
+ (setf *server* server))
+
+ (hunchentoot:start server)
+ (log:info "Started murja server on ~a ~%" port)
+ server)))
+
+(defun main ()
+ (start-server)
(handler-case
(loop do (sleep 1000))
(condition () nil)))
diff --git a/src/middleware-db.lisp b/src/middleware-db.lisp
index 31a37f1..dd82133 100644
--- a/src/middleware-db.lisp
+++ b/src/middleware-db.lisp
@@ -3,14 +3,10 @@
(defvar *automatic-tests-on?* nil)
(defun db-config ()
- (list :db (or (sb-ext:posix-getenv "MURJA_DB")
- "blogdb")
- :username (or (sb-ext:posix-getenv "MURJA_DB_USER")
- "blogadmin")
- :password (or (sb-ext:posix-getenv "MURJA_DB_PASSWD")
- "blog")
- :host (or (sb-ext:posix-getenv "MURJA_DB_HOST")
- "localhost")
+ (list :db (sb-ext:posix-getenv "MURJA_DB")
+ :username (sb-ext:posix-getenv "MURJA_DB_USER")
+ :password (sb-ext:posix-getenv "MURJA_DB_PASSWORD")
+ :host (sb-ext:posix-getenv "MURJA_DB_HOST")
:port (let ((port-str
;; return env-var if it exists (GHA, connecting straight to the automatic test db container)
(or (sb-ext:posix-getenv "MURJA_DB_PORT")
diff --git a/src/packages/main.lisp b/src/packages/main.lisp
index b1590dd..2aea9c0 100644
--- a/src/packages/main.lisp
+++ b/src/packages/main.lisp
@@ -1,5 +1,5 @@
(defpackage murja
- (:use :cl)
+ (:use :cl :parse-number :binding-arrows)
(:import-from :murja.posts.post-db)
(:import-from :murja.middleware.db :with-db)
(:import-from :murja.migrations :migrate)
diff --git a/src/setting-definitions.lisp b/src/setting-definitions.lisp
index 2f53372..36c57fb 100644
--- a/src/setting-definitions.lisp
+++ b/src/setting-definitions.lisp
@@ -16,4 +16,4 @@
(page-size 23456)
;; for example, "/blog" on feuerx.net
- (prefix "/blog"))
+ (prefix ""))