Another refactor

merge joplin and joplin-server

ressources/joplin/joplin

@@ -1,20 +1,64 @@
 #!/bin/bash
 
-STEP="envinit makedeb"
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=joplin
+
+GIT_VERSION=v2.7.14
+DEB_VERSION_DESKTOP=2.7.14-4
+DEB_VERSION_SERVER=2.7.4-4
+
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=12
+
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt-get install -y --no-install-recommends wget ca-certificates fakeroot dpkg
+	apt install -y --no-install-recommends build-essential git python wget ca-certificates rsync fakeroot dpkg 
+	wget -qO - https://deb.nodesource.com/setup_16.x | bash
+	wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
+	echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
+	apt-get update
+	apt-get install -y yarn nodejs
 }
 
+prebuild(){
+	git clone --depth 1 -b ${GIT_VERSION} https://github.com/laurent22/joplin.git /tmp/joplin
+	cd /tmp/joplin
+#	rm -fr packages/app*
+#	rm -fr packages/generator-joplin 
+#	rm -fr packages/plugin-repo-cli
+#	rm -fr packages/plugins
+	rm -fr packages/app-mobile
+}
+
+build() {
+	cd /tmp/joplin/
+	BUILD_SEQUENCIAL=1 yarn install
+	cd packages/app-desktop
+	npm run dist
+}
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
-	PATH_DEB=/tmp/src/rootfs
+	PATH_DEB=/tmp/src/rootfs-server/
 
-	wget https://github.com/laurent22/joplin/releases/download/v${GIT_VERSION}/Joplin-${GIT_VERSION}.AppImage -qO ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
-	chmod +x ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
-	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
+	cp -fr /tmp/joplin/packages/lib ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/turndown-plugin-gfm ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/turndown ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/htmlpack ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/fork-uslug ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/fork-sax ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/renderer ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/fork-htmlparser2 ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/tools ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/server ${PATH_DEB}/usr/share/joplin-server/
+	sed -i "s/%VERSION%/$DEB_VERSION_SERVER/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+
+	PATH_DEB=/tmp/src/rootfs-desktop/
+	cp /tmp/joplin/packages/app-desktop/dist/Joplin-*.AppImage ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
+	sed -i "s/%VERSION%/$DEB_VERSION_DESKTOP/" ${PATH_DEB}/DEBIAN/control
+	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+
 }
 

ressources/joplin/rootfs-desktop/DEBIAN/control

@@ -3,5 +3,6 @@ Version: %VERSION%
 Section: base
 Priority: optional
 Architecture: all
+Depends: nodejs
 Maintainer: Thomas Legay <thomas@syngate.fr>
-Description: joplin 
+Description: joplin desktop

ressources/joplin/rootfs-server/DEBIAN/conffiles

@@ -0,0 +1 @@
+/etc/default/joplin-server

ressources/joplin/rootfs-server/DEBIAN/control

@@ -0,0 +1,8 @@
+Package: joplin-server
+Version: %VERSION%
+Section: base
+Priority: optional
+Architecture: all
+Depends: nodejs
+Maintainer: Thomas Legay <thomas@syngate.fr>
+Description: joplin server

ressources/joplin/rootfs-server/DEBIAN/postinst

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+id joplin-server &> /dev/null || useradd joplin-server -r -s /bin/false -md /var/lib/joplin-server
+## issue https://github.com/laurent22/joplin/issues/5980
+[ ! -e /usr/lib/joplin-server/server/temp/ ] && mkdir /usr/lib/joplin-server/server/temp/
+[ ! -e /usr/lib/joplin-server/server/logs/ ] && mkdir /usr/lib/joplin-server/server/logs/
+chown joplin-server:joplin-server /usr/lib/joplin-server/server/temp/
+chown joplin-server:joplin-server /usr/lib/joplin-server/server/logs/

ressources/joplin/rootfs-server/etc/default/joplin-server

@@ -0,0 +1,60 @@
+APP_NAME='Joplin Server'
+APP_PORT=22300
+SIGNUP_ENABLED=0
+TERMS_ENABLED=0
+ACCOUNT_TYPES_ENABLED=0
+ERROR_STACK_TRACES=0
+COOKIES_SECURE=0
+RUNNING_IN_DOCKER=0
+# Maxiumm allowed drift between NTP time and server time. A few
+# milliseconds is normally not an issue unless many clients are modifying
+# the same note at the exact same time. But past a certain limit it might
+# mean the server clock is incorrect and should be fixed as that could
+# result in clients generating many conflicts. Set to 0 to disable the
+# check. https:#github.com/laurent22/joplin/issues/5738
+MAX_TIME_DRIFT=2000
+#==================================================
+# URL config
+#==================================================
+#APP_BASE_URL=
+USER_CONTENT_BASE_URL=
+API_BASE_URL=
+JOPLINAPP_BASE_URL='https:#joplinapp.org'
+#==================================================
+# Database config
+#==================================================
+DB_CLIENT='sqlite3'
+DB_SLOW_QUERY_LOG_ENABLED=0
+DB_SLOW_QUERY_LOG_MIN_DURATION=1000
+DB_AUTO_MIGRATION=1
+POSTGRES_PASSWORD='joplin'
+POSTGRES_DATABASE='joplin'
+POSTGRES_USER='joplin'
+POSTGRES_HOST=
+POSTGRES_PORT=5432
+# This must be the full path to the database file
+SQLITE_DATABASE=
+#==================================================
+# Content driver config
+#==================================================
+STORAGE_DRIVER='Type=Database'
+STORAGE_DRIVER_FALLBACK=
+#==================================================
+# Mailer config
+#==================================================
+MAILER_ENABLED=0
+MAILER_HOST=
+MAILER_PORT=587
+MAILER_SECURE=1
+MAILER_AUTH_USER=
+MAILER_AUTH_PASSWORD=
+MAILER_NOREPLY_NAME=
+MAILER_NOREPLY_EMAIL=
+SUPPORT_EMAIL='SUPPORT_EMAIL'
+SUPPORT_NAME=
+BUSINESS_EMAIL=
+#==================================================
+# Stripe config
+#==================================================
+STRIPE_SECRET_KEY=
+STRIPE_WEBHOOK_SECRET=

ressources/joplin/rootfs-server/etc/systemd/system/joplin-server.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=joplin server
+Documentation=https://github.com/laurent22/joplin
+
+After=network.target
+
+[Service]
+User=joplin-server
+Group=joplin-server
+EnvironmentFile=/etc/default/joplin-server
+ExecStart=/usr/bin/yarn --cwd  /usr/lib/joplin-server/server/ start
+WorkingDirectory=/var/lib/joplin-server/
+Restart=on-failure
+RestartSec=30s
+
+[Install]
+WantedBy=multi-user.target

ressources/joplin/rootfs-server/usr/share/joplin-server/.gitkeep

@@ -0,0 +1 @@
+