Adapt CI installations for removed ledgersmb.conf

ehuelsmann · Jan 3, 2025 · d9f2d36 · d9f2d36
1 parent d38782e
commit d9f2d36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -156,18 +156,8 @@ commands:
           command: |
             mkdir -p logs/screens
             # these commands are in start.sh of the Perl container too:
-            cp doc/conf/ledgersmb.conf.default ledgersmb.conf
-            sed -i \
-                -e "s/\(cache_templates = \).*\$/cache_templates = 1/g" \
-                -e "s/\(host = \).*\$/\1$POSTGRES_HOST/g" \
-                -e "s/\(port = \).*\$/\1$POSTGRES_PORT/g" \
-                -e "s/\(default_db = \).*\$/\1$DEFAULT_DB/g" \
-                -e "s%\(sendmail   = \).*%#\1/usr/sbin/ssmtp%g" \
-                -e "s/# \(smtphost = \).*\$/\1mailhog:1025/g" \
-                -e "s/# \(backup_email_from = \).*\$/\[email protected]/g" \
-                -e "s/#dojo_built = 1/dojo_built = 0/" \
-                -e "s/db_namespace = public/db_namespace = xyz/" \
-              ledgersmb.conf
+            cp doc/conf/ledgersmb.yaml ledgersmb.yaml
+            sed -i -e "s/# schema: public/schema: xyz/" ledgersmb.yaml
 
       # Freshen up CPAN
       - restore_cache:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -253,8 +253,8 @@ jobs:
           hostname -i | awk '{printf("%s lsmb\n",$1)}' | sudo tee -a /etc/hosts
 
           # Set the correct LedgerSMB Server configuration
-          cp doc/conf/ledgersmb.conf.default ledgersmb.conf
-          sed -i -e 's/db_namespace = public/db_namespace = xyz/ ; s/#suppress_tooltips/suppress_tooltips/' ledgersmb.conf
+          cp doc/conf/ledgersmb.yaml ledgersmb.yaml
+          sed -i -e 's/# schema: public/schema: xyz/ ; s/#stylesheet: ledgersmb.css/stylesheet: ledgersmb-test.css/' ledgersmb.yaml
 
           # Start 'nginx' reverse proxy
           mkdir logs
@@ -422,8 +422,8 @@ jobs:
           mkdir -p logs/screens
 
           # Set the correct LedgerSMB Server configuration
-          cp doc/conf/ledgersmb.conf.default ledgersmb.conf
-          sed -i -e 's/db_namespace = public/db_namespace = xyz/' ledgersmb.conf
+          cp doc/conf/ledgersmb.yaml ledgersmb.yaml
+          sed -i -e 's/# schema: public/schema: xyz/' ledgersmb.yaml
 
           # Start 'nginx' reverse proxy
           nginx -c $GITHUB_WORKSPACE/doc/conf/webserver/nginx-github.conf \