CI stuff

9 files changed, 70 insertions, 70 deletions

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 18a0dab..b6cce8d 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,12 +1,12 @@
 FROM ubuntu:noble
 MAINTAINER Carlos Konstanski
 ADD tmp/docker-start.tar.xz /
-ARG OLO_USERNAME=root
-ARG OLO_GROUPNAME=root
-ARG OLO_UID=0
-ARG OLO_GID=0
+ARG USER_USERNAME=root
+ARG USER_GROUPNAME=root
+ARG USER_UID=0
+ARG USER_GID=0
 RUN data/install-root.sh
-USER ${OLO_UID}:${OLO_GID}
+USER ${USER_UID}:${USER_GID}
 RUN data/install-user-sbcl.sh
 ENTRYPOINT [ "data/start_app.sh" ]
 #ENTRYPOINT [ "/bin/bash", "-l", "-c" ]
diff --git a/ci/data/bogenherr-starter.lisp b/ci/data/bogenherr-starter.lisp
deleted file mode 100644
index 1b95947..0000000
--- a/ci/data/bogenherr-starter.lisp
+++ /dev/null
@@ -1,7 +0,0 @@
-(load "/etc/sbclrc")
-(asdf:operate 'asdf:load-op 'swank)
-(setf swank::*loopback-interface* "0.0.0.0")
-(swank:create-server :port 4110 :dont-close t)
-(asdf:operate 'asdf:load-op 'bogenherr)
-(in-package :bogenherr)
-(bogenherr)
diff --git a/ci/data/etc/bogenherr/options.lisp b/ci/data/etc/bogenherr/options.lisp
index e4d8934..b083b90 100644
--- a/ci/data/etc/bogenherr/options.lisp
+++ b/ci/data/etc/bogenherr/options.lisp
@@ -1,15 +1,15 @@
-(:name "bogenherr"
+(:name "resume"
  :scheme "http"
- :url "www.bogenherr.org"
- :document-root "bogenherr"
- :title "Bogenherr Violin and Viola Studio"
- :meta-description "Bogenherr Violin and Viola Studio written in Common Lisp/Hunchentoot and ClojureScript."
- :databases (:db-bogenherr ("bogenherr" "bogenherr" "neweboy" "127.0.0.1"))
- :mail-mx "mail.bogenherr.org"
- :mail-from "postmaster@bogenherr.org"
- :mail-postmaster "postmaster@bogenherr.org"
- :mail-webmaster "webmaster@bogenherr.org"
- :mail-info "postmaster@bogenherr.org"
- :mail-login-notify "postmaster@bogenherr.org"
+ :url "resume.ckons.org"
+ :document-root "resume"
+ :title "Resume Builder"
+ :meta-description "Resume Builder written in Common Lisp/Hunchentoot and ClojureScript/Reagent."
+ :databases (:db-resume ("resume" "resume" "neweboy" "127.0.0.1"))
+ :mail-mx "mail.ckons.org"
+ :mail-from "postmaster@ckons.org"
+ :mail-postmaster "postmaster@ckons.org"
+ :mail-webmaster "webmaster@ckons.org"
+ :mail-info "postmaster@ckons.org"
+ :mail-login-notify "postmaster@ckons.org"
  :mail-authentication (:login "me@ckons.org" "ayluvmiym")
  :mail-ssl :starttls)
diff --git a/ci/data/install-root.sh b/ci/data/install-root.sh
index be226f0..5385707 100755
--- a/ci/data/install-root.sh
+++ b/ci/data/install-root.sh
@@ -12,18 +12,18 @@ aptitude -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--f
 
 rsync -av /data/ /
 
-if (( OLO_UID != 0 )); then
+if (( USER_UID != 0 )); then
     userdel ubuntu || true
     groupdel ubuntu || true
     rm -rf /home/ubuntu || true
-    export HOMEDIR="/home/${OLO_USERNAME}"
-    groupadd -g "${OLO_GID}" "${OLO_GROUPNAME}" || OLO_GROUPNAME=$(grep -F "x:${OLO_GID}:" /etc/group | awk -F: '{print $1}')
-    useradd -s /bin/bash -m -u "${OLO_UID}" -g "${OLO_GROUPNAME}" "${OLO_USERNAME}" || OLO_USERNAME=$(grep -F "x:${OLO_UID}:" /etc/passwd | awk -F: '{print $1}')
-    SUDOERS_FILENAME="${OLO_USERNAME//\./_}"
-    echo "${OLO_USERNAME} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${SUDOERS_FILENAME}"
+    export HOMEDIR="/home/${USER_USERNAME}"
+    groupadd -g "${USER_GID}" "${USER_GROUPNAME}" || USER_GROUPNAME=$(grep -F "x:${USER_GID}:" /etc/group | awk -F: '{print $1}')
+    useradd -s /bin/bash -m -u "${USER_UID}" -g "${USER_GROUPNAME}" "${USER_USERNAME}" || USER_USERNAME=$(grep -F "x:${USER_UID}:" /etc/passwd | awk -F: '{print $1}')
+    SUDOERS_FILENAME="${USER_USERNAME//\./_}"
+    echo "${USER_USERNAME} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${SUDOERS_FILENAME}"
     chmod 0440 "/etc/sudoers.d/${SUDOERS_FILENAME}"
     mkdir -p "${HOMEDIR}/.gnupg"
-    chown "${OLO_USERNAME}":"${OLO_GROUPNAME}" "${HOMEDIR}/.gnupg"
+    chown "${USER_USERNAME}":"${USER_GROUPNAME}" "${HOMEDIR}/.gnupg"
     chmod 0700 "${HOMEDIR}/.gnupg"
 fi
 
diff --git a/ci/data/resume-starter.lisp b/ci/data/resume-starter.lisp
new file mode 100644
index 0000000..287e1ef
--- /dev/null
+++ b/ci/data/resume-starter.lisp
@@ -0,0 +1,7 @@
+(load "/etc/sbclrc")
+(asdf:operate 'asdf:load-op 'swank)
+(setf swank::*loopback-interface* "0.0.0.0")
+(swank:create-server :port 4111 :dont-close t)
+(asdf:operate 'asdf:load-op 'resume)
+(in-package :resume)
+(resume)
diff --git a/ci/data/start_app.sh b/ci/data/start_app.sh
index 6f83bf7..bafb8a0 100755
--- a/ci/data/start_app.sh
+++ b/ci/data/start_app.sh
@@ -2,24 +2,24 @@
 
 mkdir -p ~/common-lisp/systems ~/opt
 cd ~/opt
-git clone -b master git@ns:repos/bogenherr.git
-git clone -b master git@github.com:ckonstanski/org-ckons-cljs.form.git
-git clone -b master git@github.com:ckonstanski/org-ckons-cljs.notifications
-git clone -b master git@github.com:ckonstanski/org-ckons-condition
-git clone -b master git@github.com:ckonstanski/org-ckons-core
-git clone -b master git@github.com:ckonstanski/org-ckons-file
-git clone -b master git@github.com:ckonstanski/org-ckons-http
-git clone -b master git@github.com:ckonstanski/org-ckons-json
-git clone -b master git@github.com:ckonstanski/org-ckons-serializable
-git clone -b master git@github.com:ckonstanski/org-ckons-session
-git clone -b master git@github.com:ckonstanski/org-ckons-sql
+git clone -b main git@ns:repos/resume.git
+git clone -b master git@ns:repos/org-ckons-cljs.form.git
+git clone -b master git@ns:repos/org-ckons-cljs.notifications
+git clone -b master git@ns:repos/org-ckons-condition
+git clone -b master git@ns:repos/org-ckons-core
+git clone -b master git@ns:repos/org-ckons-file
+git clone -b master git@ns:repos/org-ckons-http
+git clone -b master git@ns:repos/org-ckons-json
+git clone -b master git@ns:repos/org-ckons-serializable
+git clone -b master git@ns:repos/org-ckons-session
+git clone -b master git@ns:repos/org-ckons-sql
 
 logdir="/var/log/lisp"
-mv -f ${logdir}/bogenherr.log.1 ${logdir}/bogenherr.log.2
-mv -f ${logdir}/bogenherr.log ${logdir}/bogenherr.log.1
+mv -f ${logdir}/resume.log.1 ${logdir}/resume.log.2
+mv -f ${logdir}/resume.log ${logdir}/resume.log.1
 
 pushd ~/common-lisp/systems
-ln -s ~/opt/bogenherr/lisp/bogenherr.asd bogenherr.asd
+ln -s ~/opt/resume/lisp/resume.asd resume.asd
 ln -s ~/opt/org-ckons-condition/org-ckons-condition.asd org-ckons-condition.asd
 ln -s ~/opt/org-ckons-core/org-ckons-core.asd org-ckons-core.asd
 ln -s ~/opt/org-ckons-file/org-ckons-file.asd org-ckons-file.asd
@@ -30,12 +30,12 @@ ln -s ~/opt/org-ckons-session/org-ckons-session.asd org-ckons-session.asd
 ln -s ~/opt/org-ckons-sql/org-ckons-sql.asd org-ckons-sql.asd
 popd
 
-pushd ~/opt/bogenherr/lisp/webapps/bogenherr/conf
-ln -s /etc/bogenherr/options.lisp options.lisp
+pushd ~/opt/resume/lisp/webapps/resume/conf
+ln -s /etc/resume/options.lisp options.lisp
 popd
 
-pushd ~/opt/bogenherr/lisp/webapps/bogenherr/clojurescript/bogenherr
-ln -s /etc/bogenherr/figwheel-main.edn figwheel-main.edn
+pushd ~/opt/resume/lisp/webapps/resume/clojurescript/resume
+ln -s /etc/resume/figwheel-main.edn figwheel-main.edn
 mkdir checkouts
 pushd checkouts
 ln -s ~/opt/org-ckons-cljs.form org-ckons-cljs.form
@@ -43,7 +43,7 @@ ln -s ~/opt/org-ckons-cljs.notifications org-ckons-cljs.notifications
 popd
 
 lein clean
-lein fig:build | tee /tmp/bogenherr/lein.log &
+lein fig:build | tee /tmp/resume/lein.log &
 popd
 
-SBCL_HOME=/usr/lib/sbcl SBCL_SOURCE_ROOT=/usr/lib/sbcl/src exec sbcl --dynamic-space-size 2048 --userinit /data/bogenherr-starter.lisp | tee /tmp/bogenherr/sbcl.log
+SBCL_HOME=/usr/lib/sbcl SBCL_SOURCE_ROOT=/usr/lib/sbcl/src exec sbcl --dynamic-space-size 2048 --userinit /data/resume-starter.lisp | tee /tmp/resume/sbcl.log
diff --git a/ci/docker-build.sh b/ci/docker-build.sh
index b927920..470830d 100755
--- a/ci/docker-build.sh
+++ b/ci/docker-build.sh
@@ -3,7 +3,7 @@
 . env.sh
 
 builddir='tmp'
-container='bogenherr'
+container='resume'
 
 rm -rf ${builddir}
 mkdir ${builddir}
@@ -12,8 +12,8 @@ pushd ${builddir} 2>/dev/null
 
 tar Jcvf docker-start.tar.xz data/
 docker stop ${container} || true
-docker container prune -f
 docker rmi --force ${container} || true
+docker system prune -f
 
 DOCKER_BUILDKIT=0 docker compose \
     --progress "plain" \
diff --git a/ci/docker-compose.yaml.example b/ci/docker-compose.yaml.example
index ecb6836..2ee776d 100644
--- a/ci/docker-compose.yaml.example
+++ b/ci/docker-compose.yaml.example
@@ -1,35 +1,35 @@
 services:
-  bogenherr:
-    image: bogenherr
+  resume:
+    image: resume
     tty: true
     build:
       context: .
       args:
-        OLO_USERNAME: ${OLO_USERNAME}
-        OLO_GROUPNAME: ${OLO_GROUPNAME}
-        OLO_UID: ${OLO_UID}
-        OLO_GID: ${OLO_GID}
+        USER_USERNAME: ${USER_USERNAME}
+        USER_GROUPNAME: ${USER_GROUPNAME}
+        USER_UID: ${USER_UID}
+        USER_GID: ${USER_GID}
     network_mode: "host"
-    container_name: bogenherr
+    container_name: resume
     volumes:
       - type: bind
         source: ~/.m2
-        target: /home/${OLO_USERNAME}/.m2
+        target: /home/${USER_USERNAME}/.m2
       - type: bind
         source: ~/.bashrc
-        target: /home/${OLO_USERNAME}/.bashrc
+        target: /home/${USER_USERNAME}/.bashrc
       - type: bind
         source: ~/.bash_history
-        target: /home/${OLO_USERNAME}/.bash_history
+        target: /home/${USER_USERNAME}/.bash_history
       - type: bind
         source: ~/.vimrc
-        target: /home/${OLO_USERNAME}/.vimrc
+        target: /home/${USER_USERNAME}/.vimrc
       - type: bind
         source: ~/.gitconfig
-        target: /home/${OLO_USERNAME}/.gitconfig
+        target: /home/${USER_USERNAME}/.gitconfig
       - type: bind
         source: ~/.ssh
-        target: /home/${OLO_USERNAME}/.ssh
+        target: /home/${USER_USERNAME}/.ssh
       - type: bind
         source: /etc/hosts
         target: /etc/hosts
diff --git a/ci/env.sh b/ci/env.sh
index a49fb54..7fe3763 100644
--- a/ci/env.sh
+++ b/ci/env.sh
@@ -1,4 +1,4 @@
-export OLO_USERNAME=$(id -un)
-export OLO_GROUPNAME=$(id -gn)
-export OLO_UID=$(id -u)
-export OLO_GID=$(id -g)
+export USER_USERNAME=$(id -un)
+export USER_GROUPNAME=$(id -gn)
+export USER_UID=$(id -u)
+export USER_GID=$(id -g)