Replace strings.Template with str.format() in Python code

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Resolves: #163

Author: frozencemetery

tests/httpd.conf

@@ -1,7 +1,7 @@
-ServerRoot "${HTTPROOT}"
-ServerName "${HTTPNAME}"
-Listen ${HTTPADDR}:${HTTPPORT}
-Listen ${HTTPADDR}:${PROXYPORT}
+ServerRoot "{HTTPROOT}"
+ServerName "{HTTPNAME}"
+Listen {HTTPADDR}:{HTTPPORT}
+Listen {HTTPADDR}:{PROXYPORT}
 
 LoadModule access_compat_module modules/mod_access_compat.so
 LoadModule actions_module modules/mod_actions.so
@@ -77,7 +77,7 @@ LoadModule proxy_http_module modules/mod_proxy_http.so
 
 LoadModule auth_gssapi_module mod_auth_gssapi.so
 
-Mutex file:${HTTPROOT}
+Mutex file:{HTTPROOT}
 
 <Directory />
     Options +Includes
@@ -86,13 +86,13 @@ Mutex file:${HTTPROOT}
     Require all denied
 </Directory>
 
-DocumentRoot "${HTTPROOT}/html"
-<Directory "${HTTPROOT}">
+DocumentRoot "{HTTPROOT}/html"
+<Directory "{HTTPROOT}">
     AllowOverride None
     # Allow open access:
     Require all granted
 </Directory>
-<Directory "${HTTPROOT}/html">
+<Directory "{HTTPROOT}/html">
     Options Indexes FollowSymLinks
     Options +Includes
     AddOutputFilter INCLUDES .html
@@ -108,10 +108,10 @@ DocumentRoot "${HTTPROOT}/html"
     Require all denied
 </Files>
 
-PidFile "${HTTPROOT}/logs/httpd.pid"
+PidFile "{HTTPROOT}/logs/httpd.pid"
 
 <IfModule log_config_module>
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{{Referer}}i\" \"%{{User-Agent}}i\"" combined
 CustomLog "logs/access_log" combined
 </IfModule>
 
@@ -131,7 +131,7 @@ AddDefaultCharset UTF-8
 
 IncludeOptional conf.d/*.conf
 
-CoreDumpDirectory "${HTTPROOT}"
+CoreDumpDirectory "{HTTPROOT}"
 
 
 <Location /spnego>
@@ -141,11 +141,11 @@ CoreDumpDirectory "${HTTPROOT}"
   GssapiUseSessions On
   Session On
   SessionCookieName gssapi_session path=/spnego;httponly
-  GssapiSessionKey file:${HTTPROOT}/session.key
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
-  GssapiDelegCcacheDir ${HTTPROOT}
+  GssapiSessionKey file:{HTTPROOT}/session.key
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
+  GssapiDelegCcacheDir {HTTPROOT}
   GssapiDelegCcachePerms mode:0666
   GssapiBasicAuth Off
   GssapiAllowedMech krb5
@@ -158,14 +158,14 @@ CoreDumpDirectory "${HTTPROOT}"
 
   AuthType GSSAPI
   AuthName "Login"
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiAllowedMech krb5
   Require valid-user
 
   RewriteEngine on
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{{REQUEST_FILENAME}} !-d
+  RewriteCond %{{REQUEST_FILENAME}} !-f
   RewriteRule . /spnego_rewrite/index.html [L]
 </Location>
 
@@ -176,9 +176,9 @@ CoreDumpDirectory "${HTTPROOT}"
   GssapiUseSessions On
   Session On
   SessionCookieName gssapi_session path=/spnego_negotiate_once;httponly
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiBasicAuth Off
   GssapiAllowedMech krb5
   GssapiNegotiateOnce On
@@ -191,9 +191,9 @@ CoreDumpDirectory "${HTTPROOT}"
   AuthType GSSAPI
   AuthName "Password Login"
   GssapiSSLonly Off
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiBasicAuth On
   GssapiBasicAuthMech krb5
   GssapiConnectionBound On
@@ -205,9 +205,9 @@ CoreDumpDirectory "${HTTPROOT}"
   AuthType GSSAPI
   AuthName "Bad Acceptor Name"
   GssapiSSLonly Off
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiAcceptorName BAD@example.com
   Require valid-user
 </Location>
@@ -217,9 +217,9 @@ CoreDumpDirectory "${HTTPROOT}"
   AuthType GSSAPI
   AuthName "Login"
   GssapiSSLonly Off
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiBasicAuth On
   GssapiAllowedMech krb5
   Require valid-user
@@ -229,19 +229,19 @@ CoreDumpDirectory "${HTTPROOT}"
   AuthType GSSAPI
   AuthName "Login"
   GssapiSSLonly Off
-  GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-  GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+  GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiBasicAuth Off
   GssapiAllowedMech krb5
-  GssapiAcceptorName {HOSTNAME}
+  GssapiAcceptorName {{HOSTNAME}}
   Require valid-user
 </Location>
 
 <Location /required_name_attr1>
   AuthType GSSAPI
   AuthName "Required Name Attributes"
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiRequiredNameAttributes auth-indicators=na1
   LogLevel debug
   Require valid-user
@@ -250,7 +250,7 @@ CoreDumpDirectory "${HTTPROOT}"
 <Location /required_name_attr2>
   AuthType GSSAPI
   AuthName "Required Name Attributes"
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiRequiredNameAttributes auth-indicators:=bmEx
   LogLevel debug
   Require valid-user
@@ -259,7 +259,7 @@ CoreDumpDirectory "${HTTPROOT}"
 <Location /required_name_attr3>
   AuthType GSSAPI
   AuthName "Required Name Attributes"
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiRequiredNameAttributes (auth-indicators=foo and auth-indicators=na2) or auth-indicators=na3
   LogLevel debug
   Require valid-user
@@ -268,22 +268,22 @@ CoreDumpDirectory "${HTTPROOT}"
 <Location /required_name_attr4>
   AuthType GSSAPI
   AuthName "Required Name Attributes"
-  GssapiCredStore keytab:${HTTPROOT}/http.keytab
+  GssapiCredStore keytab:{HTTPROOT}/http.keytab
   GssapiRequiredNameAttributes auth-indicators=foo
   LogLevel debug
   Require valid-user
 </Location>
 
-<VirtualHost *:${PROXYPORT}>
+<VirtualHost *:{PROXYPORT}>
   ProxyRequests On
   ProxyVia On
 
   <Proxy *>
     AuthType GSSAPI
     AuthName "Proxy Login"
-    GssapiCredStore ccache:${HTTPROOT}/tmp/httpd_krb5_ccache
-    GssapiCredStore client_keytab:${HTTPROOT}/http.keytab
-    GssapiCredStore keytab:${HTTPROOT}/http.keytab
+    GssapiCredStore ccache:{HTTPROOT}/tmp/httpd_krb5_ccache
+    GssapiCredStore client_keytab:{HTTPROOT}/http.keytab
+    GssapiCredStore keytab:{HTTPROOT}/http.keytab
     GssapiBasicAuth On
     Require valid-user
   </Proxy>