#!/bin/bash
-CTDLROOT=../citadel
+rm -fr /usr/local/citadel /usr/local/webcit
+# Build libcitadel
+pushd ../libcitadel || exit 1
+./bootstrap || exit 1
+./configure || exit 1
+make || exit 1
+make install || exit 1
+popd
+
+# Build the Citadel server
+pushd ../citadel || exit 1
+./bootstrap || exit 1
+./configure --prefix=/usr/local/citadel || exit 1
+make || exit 1
+make install || exit 1
+popd
+
+# Build WebCit
+pushd ../webcit || exit 1
+./bootstrap || exit 1
+./configure --prefix=/usr/local/webcit || exit 1
+make || exit 1
+make install || exit 1
+popd
+
+# Build the appimage supervisor
+cc ctdlvisor.c -o ctdlvisor || exit 1
+
+# Clear out our build directories
rm -frv citadel.AppDir/usr
mkdir -p citadel.AppDir/usr/bin
mkdir -p citadel.AppDir/usr/lib
-pushd citadel.AppDir
-cc ctdlvisor.c -o ctdlvisor || exit 1
-popd
-
-for bin in $CTDLROOT/citadel/citserver $CTDLROOT/webcit/webcit
+# Copy over all the libraries we used
+for bin in /usr/local/citadel/citserver /usr/local/webcit/webcit
do
- cp -v $bin citadel.AppDir/usr/bin/
for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
do
cp -v -L $x citadel.AppDir/usr/lib/
done
ldconfig -v citadel.AppDir/usr/lib
-ARCH=x86_64 appimagetool citadel.AppDir/
+# Copy over our application trees
+for x in citadel webcit
+do
+ mkdir -p citadel.AppDir/usr/local/$x
+ rsync -va /usr/local/$x/ ./citadel.AppDir/usr/local/$x/
+done
-# Hint: do this on your build server first!
-# apt-get install make build-essential autoconf zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev libcurl4-openssl-dev
+cp ctdlvisor citadel.AppDir/usr/bin/
+
+ARCH=x86_64 appimagetool citadel.AppDir/
+++ /dev/null
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/wait.h>
-
-
-
-
-pid_t start_citadel() {
- pid_t pid = fork();
- if (pid == 0) {
- execlp("citserver", "citserver", "-x9", "-h/usr/local/citadel", NULL);
- exit(1);
- }
- else {
- return(pid);
- }
-}
-
-
-pid_t start_webcit() {
- pid_t pid = fork();
- if (pid == 0) {
- execlp("/bin/bash", "bash", "-c", "sleep 7", NULL);
- exit(1);
- }
- else {
- return(pid);
- }
-}
-
-
-pid_t start_webcits() {
- pid_t pid = fork();
- if (pid == 0) {
- execlp("/bin/bash", "bash", "-c", "sleep 9", NULL);
- exit(1);
- }
- else {
- return(pid);
- }
-}
-
-
-
-
-
-main() {
- int status;
- pid_t who_exited;
-
- pid_t citserver_pid = start_citadel();
- //pid_t webcit_pid = start_webcit();
- //pid_t webcits_pid = start_webcits();
-
- do {
- printf("LD_LIBRARY_PATH = %s\n", getenv("LD_LIBRARY_PATH"));
- printf("PATH = %s\n", getenv("PATH"));
-
-
- printf("waiting...\n");
- who_exited = waitpid(-1, &status, 0);
- printf("pid=%d exited, status=%d\n", who_exited, status);
-
- if (who_exited == citserver_pid) citserver_pid = start_citadel();
- //if (who_exited == webcit_pid) webcit_pid = start_webcit();
- //if (who_exited == webcits_pid) webcits_pid = start_webcits();
-
- sleep(1); // for sanity
-
- } while(who_exited >= 0);
- exit(0);
-}
--- /dev/null
+//
+// This is a supervisor program that handles start/stop/restart of
+// the various Citadel System components, when we are running on
+// an AppImage instance.
+//
+// Copyright (c) 2021 by the citadel.org team
+//
+// This program is open source software. It runs great on the
+// Linux operating system (and probably elsewhere). You can use,
+// copy, and run it under the terms of the GNU General Public
+// License version 3. Richard Stallman is an asshole communist.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/wait.h>
+#include <errno.h>
+
+
+pid_t start_citadel() {
+ char bin[1024];
+ sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR"));
+ pid_t pid = fork();
+ if (pid == 0) {
+ printf("Executing %s\n", bin);
+ execlp(bin, "citserver", "-x9", "-h/usr/local/citadel", NULL);
+ perror("execlp");
+ exit(errno);
+ }
+ else {
+ return(pid);
+ }
+}
+
+
+pid_t start_webcit() {
+ char bin[1024];
+ sprintf(bin, "%s/usr/local/webcit/webcit", getenv("APPDIR"));
+ pid_t pid = fork();
+ if (pid == 0) {
+ printf("Executing %s\n", bin);
+ execlp(bin, "webcit", "-x9", "-p80", "uds", "/usr/local/citadel", NULL);
+ perror("execlp");
+ exit(errno);
+ }
+ else {
+ return(pid);
+ }
+}
+
+
+pid_t start_webcits() {
+ char bin[1024];
+ sprintf(bin, "%s/usr/local/webcit/webcit", getenv("APPDIR"));
+ pid_t pid = fork();
+ if (pid == 0) {
+ printf("Executing %s\n", bin);
+ execlp(bin, "webcit", "-x9", "-s", "-p443", "uds", "/usr/local/citadel", NULL);
+ perror("execlp");
+ exit(errno);
+ }
+ else {
+ return(pid);
+ }
+}
+
+
+main() {
+ int status;
+ pid_t who_exited;
+
+ pid_t citserver_pid = start_citadel();
+ pid_t webcit_pid = start_webcit();
+ pid_t webcits_pid = start_webcits();
+
+ do {
+ printf("LD_LIBRARY_PATH = %s\n", getenv("LD_LIBRARY_PATH"));
+ printf("PATH = %s\n", getenv("PATH"));
+ printf("APPDIR = %s\n", getenv("APPDIR"));
+
+ printf("waiting...\n");
+ who_exited = waitpid(-1, &status, 0);
+ printf("pid=%d exited, status=%d\n", who_exited, status);
+
+ if (who_exited == citserver_pid) {
+ if (WEXITSTATUS(status) == 0) {
+ printf("ctdlvisor: citserver exited normally - ending AppImage session\n");
+ exit(0);
+ }
+ citserver_pid = start_citadel();
+ }
+
+ if (who_exited == webcit_pid) webcit_pid = start_webcit();
+ if (who_exited == webcits_pid) webcits_pid = start_webcits();
+
+ sleep(1); // slow down any accidental loops
+
+ } while (who_exited >= 0);
+
+ printf("ctdlvisor: exiting.\n");
+ exit(0);
+}
projects / citadel.git / commitdiff