diff --git a/roles/pdc/frontend/templates/pdc.conf b/roles/pdc/frontend/templates/pdc.conf
index cf92ee1914..4cd2f9c95a 100644
--- a/roles/pdc/frontend/templates/pdc.conf
+++ b/roles/pdc/frontend/templates/pdc.conf
@@ -9,83 +9,89 @@ WSGIPythonOptimize 1
WSGIScriptAlias / /usr/lib/python2.7/site-packages/pdc/wsgi.py
-RewriteEngine on
-# First try to find the files in pdc
-RewriteCond "/usr/lib/python2.7/site-packages/pdc/static/$1" -f
-RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pdc/static/$1" [L]
-# Try to find them in the patternfly files
-RewriteRule "^/static/(.*)" "/usr/share/patternfly1/resources/$1" [L]
-
- SetHandler wsgi-script
+
+ ServerName https://pdc.stg.fedoraproject.org
+ UseCanonicalName on
- LimitRequestBody 256000000
- AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
- Require all granted
- MellonEnable "info"
- MellonSPPrivateKeyFile "/etc/httpd/saml2/certificate.key"
- MellonSPCertFile "/etc/httpd/saml2/certificate.pem"
- MellonSPMetadataFile "/etc/httpd/saml2/metadata.xml"
- MellonIdPMetadataFile "/etc/httpd/saml2/idp-metadata.xml"
- MellonEndpointPath /saml2
- MellonVariable "saml-sesion-cookie"
+ RewriteEngine on
+ # First try to find the files in pdc
+ RewriteCond "/usr/lib/python2.7/site-packages/pdc/static/$1" -f
+ RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pdc/static/$1" [L]
+ # Try to find them in the patternfly files
+ RewriteRule "^/static/(.*)" "/usr/share/patternfly1/resources/$1" [L]
- MellonUser "NAME_ID"
- MellonIdP "IDP"
- MellonSessionLength 3600
- # MellonNoCookieErrorPage "https://idp.example.com/no-cookie-error.html"
- # MellonPostDirectory "/var/lib/ipsilon/post_cache"
- # MellonPostReplay On
-
+
+ SetHandler wsgi-script
-
- WSGIProcessGroup pdc
- MellonEnable "auth"
- Header append Cache-Control "no-cache"
-
+ LimitRequestBody 256000000
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
+ Require all granted
+ MellonEnable "info"
+ MellonSPPrivateKeyFile "/etc/httpd/saml2/certificate.key"
+ MellonSPCertFile "/etc/httpd/saml2/certificate.pem"
+ MellonSPMetadataFile "/etc/httpd/saml2/metadata.xml"
+ MellonIdPMetadataFile "/etc/httpd/saml2/idp-metadata.xml"
+ MellonEndpointPath /saml2
+ MellonVariable "saml-sesion-cookie"
+
+ MellonUser "NAME_ID"
+ MellonIdP "IDP"
+ MellonSessionLength 3600
+ # MellonNoCookieErrorPage "https://idp.example.com/no-cookie-error.html"
+ # MellonPostDirectory "/var/lib/ipsilon/post_cache"
+ # MellonPostReplay On
+
+
+
+ WSGIProcessGroup pdc
+ MellonEnable "auth"
+ Header append Cache-Control "no-cache"
+
-WSGIPassAuthorization On
-
- WSGIProcessGroup pdc
-
+ WSGIPassAuthorization On
+
+ WSGIProcessGroup pdc
+
-
- SetHandler None
+
+ SetHandler None
- # Disable auth on the static content, so that we're aren't forced to
- # use Kerberos. Doing so would remove "Expires" headers from the static
- # content, which would lead to poor page-load times.
- AuthType none
- Satisfy Any
- Require all granted
+ # Disable auth on the static content, so that we're aren't forced to
+ # use Kerberos. Doing so would remove "Expires" headers from the static
+ # content, which would lead to poor page-load times.
+ AuthType none
+ Satisfy Any
+ Require all granted
- # Many file types are likely to benefit from compression
- # Enable gzip compression on them:
- AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
+ # Many file types are likely to benefit from compression
+ # Enable gzip compression on them:
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
- # Set far-future Expires headers on static content
- # (trac 184):
- ExpiresActive On
- ExpiresDefault "access plus 10 years"
-
+ # Set far-future Expires headers on static content
+ # (trac 184):
+ ExpiresActive On
+ ExpiresDefault "access plus 10 years"
+
-
- SetHandler None
+
+ SetHandler None
- # Disable auth on the static content, so that we're aren't forced to
- # use Kerberos. Doing so would remove "Expires" headers from the static
- # content, which would lead to poor page-load times.
- AuthType none
- Satisfy Any
- Require all granted
+ # Disable auth on the static content, so that we're aren't forced to
+ # use Kerberos. Doing so would remove "Expires" headers from the static
+ # content, which would lead to poor page-load times.
+ AuthType none
+ Satisfy Any
+ Require all granted
- # Many file types are likely to benefit from compression
- # Enable gzip compression on them:
- AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
+ # Many file types are likely to benefit from compression
+ # Enable gzip compression on them:
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
- # Set far-future Expires headers on static content
- # (trac 184):
- ExpiresActive On
- ExpiresDefault "access plus 2 weeks"
-
+ # Set far-future Expires headers on static content
+ # (trac 184):
+ ExpiresActive On
+ ExpiresDefault "access plus 2 weeks"
+
+
diff --git a/roles/pdc/frontend/templates/raw b/roles/pdc/frontend/templates/raw
new file mode 100644
index 0000000000..dcdeb2cb32
--- /dev/null
+++ b/roles/pdc/frontend/templates/raw
@@ -0,0 +1,97 @@
+Alias /docs/ /usr/share/doc/pdc/docs/build/html/
+Alias /saml2protected /usr/share/ipsilon/ui/saml2sp
+
+WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes=2 threads=2
+WSGISocketPrefix run/wsgi
+WSGIRestrictStdout On
+WSGIRestrictSignal Off
+WSGIPythonOptimize 1
+
+WSGIScriptAlias / /usr/lib/python2.7/site-packages/pdc/wsgi.py
+
+
+
+ ServerName https://pdc.stg.fedoraproject.org
+ UseCanonicalName on
+
+ RewriteEngine on
+ # First try to find the files in pdc
+ RewriteCond "/usr/lib/python2.7/site-packages/pdc/static/$1" -f
+ RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pdc/static/$1" [L]
+ # Try to find them in the patternfly files
+ RewriteRule "^/static/(.*)" "/usr/share/patternfly1/resources/$1" [L]
+
+
+ SetHandler wsgi-script
+
+ LimitRequestBody 256000000
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
+ Require all granted
+ MellonEnable "info"
+ MellonSPPrivateKeyFile "/etc/httpd/saml2/certificate.key"
+ MellonSPCertFile "/etc/httpd/saml2/certificate.pem"
+ MellonSPMetadataFile "/etc/httpd/saml2/metadata.xml"
+ MellonIdPMetadataFile "/etc/httpd/saml2/idp-metadata.xml"
+ MellonEndpointPath /saml2
+ MellonVariable "saml-sesion-cookie"
+
+ MellonUser "NAME_ID"
+ MellonIdP "IDP"
+ MellonSessionLength 3600
+ # MellonNoCookieErrorPage "https://idp.example.com/no-cookie-error.html"
+ # MellonPostDirectory "/var/lib/ipsilon/post_cache"
+ # MellonPostReplay On
+
+
+
+ WSGIProcessGroup pdc
+ MellonEnable "auth"
+ Header append Cache-Control "no-cache"
+
+
+
+ WSGIPassAuthorization On
+
+ WSGIProcessGroup pdc
+
+
+
+ SetHandler None
+
+ # Disable auth on the static content, so that we're aren't forced to
+ # use Kerberos. Doing so would remove "Expires" headers from the static
+ # content, which would lead to poor page-load times.
+ AuthType none
+ Satisfy Any
+ Require all granted
+
+ # Many file types are likely to benefit from compression
+ # Enable gzip compression on them:
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
+
+ # Set far-future Expires headers on static content
+ # (trac 184):
+ ExpiresActive On
+ ExpiresDefault "access plus 10 years"
+
+
+
+ SetHandler None
+
+ # Disable auth on the static content, so that we're aren't forced to
+ # use Kerberos. Doing so would remove "Expires" headers from the static
+ # content, which would lead to poor page-load times.
+ AuthType none
+ Satisfy Any
+ Require all granted
+
+ # Many file types are likely to benefit from compression
+ # Enable gzip compression on them:
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
+
+ # Set far-future Expires headers on static content
+ # (trac 184):
+ ExpiresActive On
+ ExpiresDefault "access plus 2 weeks"
+
+