merchant

commit fb6cf950d8ecf0f082d390ac6b3c53ace3c5b152
parent 0ccc6504209c155ee036893288ac0bc7e988d43a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat,  2 Jan 2021 21:35:06 +0100

fix web server integration

Diffstat:
M
debian/conf/apache.conf
 | 
10
++++++++++
M
debian/taler-merchant.config
 | 
3
+++
M
debian/taler-merchant.postinst
 | 
16
----------------
M
debian/taler-merchant.templates
 | 
3
++-

4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
@@ -1,3 +1,13 @@
+<!--
+  Make sure to enable the following Apache modules before
+  integrating this into your configuration:
+
+  # a2enmod proxy
+  # a2enmod proxy_http
+  # a2enmod headers
+  # a2enmod rewrite
+-->
+
 <Location "/taler-merchant/">
 RewriteEngine On
 RewriteCond "%{HTTP:AUTHORIZATION}" "!= %SECURITYTOKEN%"
diff --git a/debian/taler-merchant.config b/debian/taler-merchant.config
@@ -10,6 +10,9 @@ db_go
 db_input low taler-merchant/groupname || true
 db_go
 
+db_input low taler-merchant/reconfigure-webserver || true
+db_go
+
 # Set permissions for sqlite3 file
 # (for when we support sqlite3 in the future)
 dbc_dbfile_owner="${_USERNAME}:${_GROUPNAME}"
diff --git a/debian/taler-merchant.postinst b/debian/taler-merchant.postinst
@@ -15,11 +15,6 @@ apache_install() {
     then
 	    cat /etc/taler-merchant/apache.conf | sed -e "s/%SECURITYTOKEN%/$1/" > /etc/apache2/conf-available/taler-merchant.conf
     fi
-    # TODO: might want to remember if *we* enabled those, and disable in postrm
-    a2enmod proxy
-    a2enmod proxy_http
-    a2enmod headers
-    a2enmod rewrite
 }
 
 # 1st argument will be the SECURITYTOKEN to use.
@@ -122,17 +117,6 @@ EOF
 			else
 				apache_install "$SECRET"
 			fi
- 		        if [ -f /etc/init.d/$webserver ] ; then
-        		    	if which invoke-rc.d > /dev/null ; then
-                			if invoke-rc.d $webserver status > /dev/null 2>&1 ; then
-                  				invoke-rc.d $webserver reload 3>/dev/null || true
-	                		fi
-        	    		else
-                			if /etc/init.d/$webserver status > /dev/null 2>&1 ; then
-                    				/etc/init.d/$webserver reload 3>/dev/null || true
-                			fi
-	            		fi
-        		fi
 		done
 		db_stop
 
diff --git a/debian/taler-merchant.templates b/debian/taler-merchant.templates
@@ -1,6 +1,7 @@
 Template: taler-merchant/reconfigure-webserver
 Type: multiselect
-Choices: apache2, lighttpd, nginx
+Choices: apache2, nginx
+Default: apache2, nginx
 _Description: Web server to reconfigure automatically:
  Please choose the web server that should be automatically configured
  as a frontend for taler-merchant-httpd.