Sfoglia il codice sorgente

Minor adjustments preparing to enable selinux

George Baugh 5 mesi fa
parent
commit
33fee858b9
2 ha cambiato i file con 7 aggiunte e 6 eliminazioni
  1. 3 3
      Installer.mk
  2. 4 3
      tcms

+ 3 - 3
Installer.mk

@@ -38,7 +38,8 @@ prereq-debs:
 	    libtext-xslate-perl libplack-perl libconfig-tiny-perl libdatetime-format-http-perl libjson-maybexs-perl          \
 	    libuuid-tiny-perl libcapture-tiny-perl libconfig-simple-perl libdbi-perl libfile-slurper-perl libfile-touch-perl \
 	    libfile-copy-recursive-perl libxml-rss-perl libmodule-install-perl libio-string-perl uuid-dev                    \
-	    libmoose-perl libmoosex-types-datetime-perl libxml-libxml-perl liblist-moreutils-perl libclone-perl libpath-tiny-perl
+	    libmoose-perl libmoosex-types-datetime-perl libxml-libxml-perl liblist-moreutils-perl libclone-perl libpath-tiny-perl \
+		selinux-utils setools policycoreutils-python-utils policycoreutils selinux-basics auditd
 
 .PHONY: prereq-perl
 prereq-perl:
@@ -89,8 +90,7 @@ nginx:
 	rm nginx/tcms.conf.intermediate
 	mkdir run
 	chown $(USER):www-data run
-	touch run/tcms.sock
-	chown $(USER):www-data run/tcms.sock
+	chmod 0770 run
 	sudo mkdir -p '/var/www/$(SERVER_NAME)'
 	sudo mkdir -p '/var/www/mail.$(SERVER_NAME)'
 	sudo mkdir -p '/etc/letsencrypt/live/$(SERVER_NAME)'

+ 4 - 3
tcms

@@ -1,5 +1,6 @@
 #!/bin/bash
-pkill -F run/tcms.pid
-sudo WWW_VERBOSE=1 www/server.psgi --listen run/tcms.sock --group www-data --user $USER --daemonize --pid run/tcms.pid
+[[ -e run/tcms.pid ]] && pkill -F run/tcms.pid
+sudo www/server.psgi --listen run/tcms.sock --group www-data --user $USER --daemonize --pid run/tcms.pid
 #XXX Net::Server does not expect to run as a user other than that of the webserver
-sudo chmod 0775 run/tcms.sock
+sudo chmod 0770 run/tcms.sock
+echo "tCMS running as PID "`cat run/tcms.pid`