v0.0.1

Dockerfile

@@ -82,11 +82,14 @@ RUN bench get-app --branch develop payments \
 # Need root access for installing mysql; there could be other ways but it works
 USER root
 
+COPY supervisord.conf /etc/supervisor/supervisord.conf
+
 # Basically move config to proper location (see below for details[1])
-RUN mkdir -p /run/supervisor && \
-    sudo ln -s /app/data/frappe/config/supervisor.conf /etc/supervisor/conf.d/frappe-bench.conf && \
-    sudo ln -s /app/data/frappe/config/nginx.conf /etc/nginx/conf.d/frappe-bench.conf && \
-    sudo ln -sf /run/supervisor/supervisord.log /var/log/supervisor/supervisord.log
+RUN mkdir -p /run/supervisor/{logs} \
+    && sudo ln -s /run/supervisor/logs/supervisord.log /var/log/supervisor/supervisord.log \
+    && sudo ln -s /app/data/frappe/config/supervisor.conf /etc/supervisor/conf.d/frappe-bench.conf \
+    && sudo ln -s /app/data/frappe/config/supervisor-app-nginx.conf /etc/supervisor/conf.d/app-nginx.conf \
+    && sudo ln -s /app/data/frappe/config/nginx.conf /etc/nginx/sites-enabled/cloudron-erpnext.conf
 
 # Add our custom mysql/mariadb configuration
 ADD mysql_custom.cnf /etc/mysql/conf.d/
@@ -120,12 +123,11 @@ RUN mkdir -p /app/data/redis /run/redis/logs \
     && mv /etc/redis /etc/redis-orig \
     && ln -sf /app/data/redis /etc/redis
 
-RUN mkdir -p /run/nginx/logs /app/data/nginx \
-    && rm -r /var/log/nginx \
-    && ln -sf /run/nginx/logs /var/log/nginx \
-    && rm -r /var/lib/nginx \
-    && ln -sf /app/data/nginx /var/lib/nginx
-
+RUN mkdir -p /run/nginx/ \
+    && rm -r /var/lib/nginx && ln -sf /run/nginx /var/lib/nginx \
+    && rm -r /var/log/nginx && ln -sf /run/nginx/logs /var/log/nginx \
+    && rm -f /etc/nginx/sites-available/default && rm -f /etc/nginx/sites-enabled/default \
+    && sed -i 's|pid /run/nginx.pid;|pid /run/nginx/nginx.pid;|g' /etc/nginx/nginx.conf
 
 # Same thing, but for the folders that frappe would pollute with writes
 RUN mkdir -p /app/data/frappe \

README.md

@@ -4,7 +4,7 @@ Run [erpnext](https://www.erpnext.com/) on [Cloudron](https://cloudron.io)
 
 ## Why
 
-erpnext can federate users from Cloudron user directory and acts as a OpenID / SAML Provider.
+Because, why not?
 
 ## Build and Install
 
@@ -15,17 +15,19 @@ erpnext can federate users from Cloudron user directory and acts as a OpenID / S
 - If you're using your own docker registry, name the image properly,
   like `docker.example-cloudron.tld/john_doe/cloudron-erpnext`.
 - Log in to Docker Hub and mark the image as public, if necessary.
-- Install the app `cloudron install -l <auth.yourdomain.tld>`
+- Install the app `cloudron install -l <erp.yourdomain.tld>`
 - Look at the logs to see if everything is going as planned.
 
 Refer to the [Cloudron Docs](https://docs.cloudron.io/packaging/cli) for more information.
 
 ## About dev-scripts
-Please refer to `docker-run.sh` file for some commands handy for you to test this setup.
 
+Please refer to `docker-run.sh` file for some commands handy for you to test this setup.
 
 ## Updating ErpNext
+
 [Official Documentation](https://frappeframework.com/docs/v14/user/en/production-setup#updating)
+
 ```shell
   # update everything
   bench update

dev-scripts/README.md

@@ -1 +1,2 @@
-Scripts inside this folder are only used as reference during development, and have no use or effect in the docker image or containers.
+Scripts inside this folder are only used as reference during development, and have no use or effect in the docker image
+or containers.

manifest/CHANGELOG.md

@@ -1,17 +1,2 @@
-v18.0.2
-Bump to erpnext v18.0.2
----
-v18.0.1
-Bump to erpnext v18.0.1
----
-v18.0.0
-Bump to erpnext v18.0.0
----
-v17.0.1
-Bump to erpnext v17.0.1
----
-v17.0.0
-First release of erpnext on Quarkus.
----
-v1.0.0
-Initial Version
+v1
+Erpnext v14 initial release

manifest/DESCRIPTION.md

@@ -1,12 +1,5 @@
-Run erpnext on Cloudron. The default *master* realm is set up to use Cloudron LDAP for user federation.
+Run [Erpnext](https://erpnext.com) on [Cloudron](https://cloudron.io).
+
+For now, it just works, if nothing goes wrong during installation.
 
-Features
----
-- Configured to use Cloudron LDAP for user federation
-- Configured to use Cloudron SMTP for email
 
-Optimizations
---
-- Uses recommended LDAP search filter to log in with email/username
-- Sets the recommended custom JVM options to fix java memory issues
-- Properly maps the givenName property with firstName to work with Cloudron LDAP

manifest/POSTINSTALL.md

@@ -1,9 +1,5 @@
-A superadmin account is created with the following credentials. Log in and change the password immmediately.
+A super-admin account is created with the following credentials. Log in and change the password immmediately.
 
-```
-Username: erpnextadmin
-Password: erpnextadminpassword
-```
-
-A new realm named `cloudron` is added to authenticate users agains the Cloudron user directory. Do not use the `master`
-realm for anything else except managing erpnext itself.
+Please check the `sitename-credential.txt` file inside the `/app/data/` folder. If you installed this
+app under the domain `erp.example.com`, check `/app/data/erp.example.com-credential.txt` file for username and
+password.