gonzopi

commit 3faf9a9517359813698c50c283cb71ed91333215
parent 26ee746f9bde4adc6535bb8d52e68794882c8ca5
Author: rob <rob@tarina.org>
Date:   Mon, 20 Nov 2023 12:40:56 +0000

renaming

Diffstat:
A
extras/gonzopi.conf
 | 
33
+++++++++++++++++++++++++++++++++
D
extras/tarinaretake.conf
 | 
34
----------------------------------
M
gonzopi.py
 | 
2
+-
R
srv/tarinaserver.py -> srv/gonzopiserver.py
 | 
0

4 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/extras/gonzopi.conf b/extras/gonzopi.conf
@@ -0,0 +1,33 @@
+<VirtualHost *:80>
+        WSGIScriptAlias / /home/pi/gonzopi/srv/gonzopiserver.py
+        WSGIPassAuthorization On
+        AddType text/html .py
+        Alias /static /home/pi/gonzopi/srv/static
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /home/pi/srv>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>
diff --git a/extras/tarinaretake.conf b/extras/tarinaretake.conf
@@ -1,34 +0,0 @@
-<VirtualHost *:80>
-	ServerAdmin info@tarina.org
-        WSGIScriptAlias / /home/pi/tarinaretake/srv/tarinaserver.py
-        WSGIPassAuthorization On
-        AddType text/html .py
-        Alias /static /home/pi/tarinaretake/srv/static
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	<Directory /home/pi/srv>
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-		Order allow,deny
-		allow from all
-	</Directory>
-
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride None
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
-
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-</VirtualHost>
diff --git a/gonzopi.py b/gonzopi.py
@@ -4769,7 +4769,7 @@ def stopinterface(camera):
         print('no camera to close')
     os.system('pkill arecord')
     os.system('pkill startinterface')
-    os.system('pkill gonzopigui')
+    os.system('pkill tarinagui')
     #run_command('sudo systemctl stop apache2')
     return camera
 
diff --git a/srv/tarinaserver.py b/srv/gonzopiserver.py