Moved most of the command line logic to the shell script
authorArt Cancro <ajc@citadel.org>
Tue, 26 Jan 2021 04:14:29 +0000 (04:14 +0000)
committerArt Cancro <ajc@citadel.org>
Tue, 26 Jan 2021 04:14:29 +0000 (04:14 +0000)
appimage/citadel.AppDir/AppRun
appimage/ctdlvisor.c
citadel/server_main.c

index 0c0ecec..027c553 100755 (executable)
@@ -1,5 +1,83 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=$APPDIR/usr/lib
-export PATH=$APPDIR/usr/bin
-exec ctdlvisor $*
+// This is an AppImage control script for the Citadel system.
+//
+// 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.
+
+# Default values
+HTTP_PORT=80
+HTTPS_PORT=443
+CTDL_DIR=/usr/local/citadel
+export APPDIR
+
+usage() {
+       echo usage
+       exit 2
+}
+
+PARSED_ARGUMENTS=$(getopt -o h:p:s: -- "$@")
+VALID_ARGUMENTS=$?
+if [ "$VALID_ARGUMENTS" != "0" ]; then
+       echo $0: usage: $0 '[-h data_directory] [-p http_port] [-s https_port] command'
+       echo 'command must be one of: run, test, install'
+fi
+
+eval set -- ${PARSED_ARGUMENTS}
+while :
+do
+       case ${1} in
+               -h)     CTDL_DIR=${2}   ; shift 2 ;;
+               -p)     HTTP_PORT=${2}  ; shift 2 ;;
+               -s)     HTTPS_PORT=${2} ; shift 2 ;;
+               --)     shift; break;;
+               *)      echo Unexpected option: ${1}
+                       usage;
+       esac
+done
+
+case ${1} in
+       run)
+               export APPDIR CTDL_DIR HTTP_PORT HTTPS_PORT
+               export LD_LIBRARY_PATH=$APPDIR/usr/lib
+               export PATH=$APPDIR/usr/bin
+               exec ctdlvisor $*
+               ;;
+       test)
+               export LD_LIBRARY_PATH=$APPDIR/usr/lib
+               export PATH=$APPDIR/usr/bin
+               $APPDIR/usr/local/citadel/citserver -c
+               exit $?
+               ;;
+       *)
+               echo Unexpected command: ${1} 
+               usage
+               exit 1
+               ;;
+esac
+exit 0
+
+
+
+
+# This unit file starts all Citadel services via the AppImage distribution.
+[Unit]
+Description=Citadel
+After=network.target
+[Service]
+ExecStart=/root/citadel/appimage/Citadel-x86_64.AppImage run -h /usr/local/citadel -s 80 -s 443
+ExecStop=/bin/kill $MAINPID
+KillMode=process
+Restart=on-failure
+LimitCORE=infinity
+[Install]
+WantedBy=multi-user.target
index 6257947..d08b636 100644 (file)
@@ -27,9 +27,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-char *data_directory = "/usr/local/citadel";
-char *http_port = "80";
-char *https_port = "443";
 pid_t citserver_pid;
 pid_t webcit_pid;
 pid_t webcits_pid;
@@ -104,7 +101,7 @@ pid_t start_citadel() {
        if (pid == 0) {
                fprintf(stderr, "ctdlvisor: executing %s\n", bin);
                detach_from_tty();
-               execlp(bin, "citserver", "-x9", "-h", data_directory, NULL);
+               execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), NULL);
                exit(errno);
        }
        else {
@@ -122,7 +119,7 @@ pid_t start_webcit() {
        if (pid == 0) {
                fprintf(stderr, "ctdlvisor: executing %s\n", bin);
                detach_from_tty();
-               execlp(bin, "webcit", "-x9", wchome, "-p", http_port, "uds", data_directory, NULL);
+               execlp(bin, "webcit", "-x9", wchome, "-p", getenv("HTTP_PORT"), "uds", getenv("CTDL_DIR"), NULL);
                exit(errno);
        }
        else {
@@ -140,7 +137,7 @@ pid_t start_webcits() {
        if (pid == 0) {
                fprintf(stderr, "ctdlvisor: executing %s\n", bin);
                detach_from_tty();
-               execlp(bin, "webcit", "-x9", wchome, "-s", "-p", https_port, "uds", data_directory, NULL);
+               execlp(bin, "webcit", "-x9", wchome, "-s", "-p", getenv("HTTPS_PORT"), "uds", getenv("CTDL_DIR"), NULL);
                exit(errno);
        }
        else {
@@ -209,17 +206,23 @@ void main_loop(void) {
 }
 
 
-void run_in_foreground(void) {
+int main(int argc, char **argv) {
+
+       if (getenv("APPDIR") == NULL) {
+               fprintf(stderr, "ctdlvisor: APPDIR is not set.  This program must be run from within an AppImage.\n");
+               ctdlvisor_exit(1);
+       }
+
        fprintf(stderr, "ctdlvisor: Welcome to the Citadel System, brought to you using AppImage.\n");
        fprintf(stderr, "ctdlvisor: LD_LIBRARY_PATH = %s\n", getenv("LD_LIBRARY_PATH"));
        fprintf(stderr, "ctdlvisor:            PATH = %s\n", getenv("PATH"));
        fprintf(stderr, "ctdlvisor:          APPDIR = %s\n", getenv("APPDIR"));
-       fprintf(stderr, "ctdlvisor:  data directory = %s\n", data_directory);
-       fprintf(stderr, "ctdlvisor:       HTTP port = %s\n", http_port);
-       fprintf(stderr, "ctdlvisor:      HTTPS port = %s\n", https_port);
+       fprintf(stderr, "ctdlvisor:  data directory = %s\n", getenv("CTDL_DIR"));
+       fprintf(stderr, "ctdlvisor:       HTTP port = %s\n", getenv("HTTP_PORT"));
+       fprintf(stderr, "ctdlvisor:      HTTPS port = %s\n", getenv("HTTPS_PORT"));
 
-       if (access(data_directory, R_OK|W_OK|X_OK)) {
-               fprintf(stderr, "ctdlvisor: %s: %s\n", data_directory, strerror(errno));
+       if (access(getenv("CTDL_DIR"), R_OK|W_OK|X_OK)) {
+               fprintf(stderr, "ctdlvisor: %s: %s\n", getenv("CTDL_DIR"), strerror(errno));
                ctdlvisor_exit(errno);
        }
 
@@ -235,111 +238,3 @@ void run_in_foreground(void) {
        main_loop();
        ctdlvisor_exit(0);
 }
-
-
-void install_as_service(void) {
-
-       // FIXME fail if some other citadel distribution is already there
-       // FIXME fail if any server processes are running
-       // FIXME interact with the user
-       // FIXME get port numbers and data directory
-       // FIXME create the data directory
-       // FIXME move the appimage into its permanent location
-
-       fprintf(stderr, "Installing as service\n");
-
-       FILE *fp = fopen("/etc/systemd/system/ctdl.service", "w");
-       fprintf(fp,     "# This unit file starts all Citadel services via the AppImage distribution.\n"
-                       "[Unit]\n"
-                       "Description=Citadel\n"
-                       "After=network.target\n"
-                       "[Service]\n"
-                       "ExecStart=/root/citadel/appimage/Citadel-x86_64.AppImage run -h %s -s %s -s %s\n"
-                       "ExecStop=/bin/kill $MAINPID\n"
-                       "KillMode=process\n"
-                       "Restart=on-failure\n"
-                       "LimitCORE=infinity\n"
-                       "[Install]\n"
-                       "WantedBy=multi-user.target\n"
-               ,
-                       data_directory, http_port, https_port
-       );
-       fclose(fp);
-
-       fprintf(stderr, "systemd unit file is installed.  Type 'systemctl enable ctdl' to have it start at boot.\n");
-}
-
-
-static char *usage =
-       "\n"
-       "ctdlvisor: usage: ctdlvisor [-h data_directory] [-p http_port] [-s https_port] command\n"
-       "           'command' must be one of: run, install, remove, upgrade, test, help\n"
-       "\n"
-;
-
-int main(int argc, char **argv) {
-       int c;
-
-       if (getenv("APPDIR") == NULL) {
-               fprintf(stderr, "ctdlvisor: APPDIR is not set.  This program must be run from within an AppImage.\n");
-               ctdlvisor_exit(1);
-       }
-
-       while ((c = getopt (argc, argv, "h:p:s:")) != -1)  switch(c) {
-               case 'h':
-                       data_directory = optarg;
-                       break;
-               case 'p':
-                       http_port = optarg;
-                       break;
-               case 's':
-                       https_port = optarg;
-                       break;
-               default:
-                       fprintf(stderr, "%s", usage);
-                       ctdlvisor_exit(1);
-       }
-
-
-       if (argc != optind+1) {
-               fprintf(stderr, "%s", usage);
-               ctdlvisor_exit(1);
-       }
-
-       if (!strcasecmp(argv[optind], "run")) {
-               run_in_foreground();
-       }
-       else if (!strcasecmp(argv[optind], "install")) {
-               install_as_service();
-       }
-       else if (!strcasecmp(argv[optind], "remove")) {
-               fprintf(stderr, "oops, this is not implemented yet\n");
-       }
-       else if (!strcasecmp(argv[optind], "upgrade")) {
-               fprintf(stderr, "oops, this is not implemented yet\n");
-       }
-       else if (!strcasecmp(argv[optind], "test")) {
-               test_binary_compatibility();
-       }
-       else if (!strcasecmp(argv[optind], "help")) {
-               fprintf(stderr, "%s", usage);
-               fprintf(stderr, "[-h dir]  Use 'dir' as the Citadel data directory (this directory must exist)\n"
-                               "[-p port] Listen for HTTP connections on 'port'\n"
-                               "[-s port] Listen for HTTPS connections on 'port'\n"
-                               "'command' must be one of:\n"
-                               "       run     - launch Citadel services (does not detach from terminal)\n"
-                               "       install - create systemd unit files for automatic startup at boot\n"
-                               "       remove  - delete systemd unit files to end automatic startup\n"
-                               "       upgrade - download and install a new version of this appimage\n"
-                               "       test    - test the appimage for binary compatibility with this host\n"
-                               "       help    - display this message\n"
-                               "\n"
-               );
-       }
-       else {
-               fprintf(stderr, "%s", usage);
-               ctdlvisor_exit(1);
-       }
-
-       ctdlvisor_exit(0);
-}
index 6a4e224..b08d070 100644 (file)
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 
                // test this binary for compatibility and exit
                case 'c':
-                       fprintf(stderr, "%d: binary compatibility confirmed\n", argv[0]);
+                       fprintf(stderr, "%s: binary compatibility confirmed\n", argv[0]);
                        exit(0);
                        break;