nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NickDaly/Plinth into replace-minified-js

Browse Source
This commit is contained in:
James Valleroy 2013-10-20 08:18:50 -04:00
commit 13bbe7ea25
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -97,7 +97,12 @@ apache-install:
install -D -m644 share/apache2/plinth.conf $(DESTDIR)/etc/apache2/sites-available/plinth.conf install -D -m644 share/apache2/plinth.conf $(DESTDIR)/etc/apache2/sites-available/plinth.conf
apache-config: apache-install apache-ssl apache-config: apache-install apache-ssl
a2ensite plinth a2ensite plinth
service apache2 reload
apache-ssl: apache-ssl:
make-ssl-cert generate-default-snakeoil make-ssl-cert generate-default-snakeoil
a2enmod ssl a2enmod ssl
a2enmod rewrite
a2enmod proxy
a2enmod proxy_http
service apache2 restart

2
share/apache2/plinth.conf
View File

@ -22,7 +22,7 @@
## Use this rule to hang plinth off of plinth.(servername) ## Use this rule to hang plinth off of plinth.(servername)
## The DocumentRoot is set by fabric ## The DocumentRoot is set by fabric
DocumentRoot /dev/null DocumentRoot /home/fbx/plinth/static
ServerName plinth ServerName plinth
ServerAlias plinth.* ServerAlias plinth.*
ProxyPreserveHost on ProxyPreserveHost on

4
templates/base.tmpl
View File

@ -106,9 +106,7 @@
</script> </script>
</head> </head>
<body onload="javascript:onload_handler();"> <body onload="javascript:onload_handler();">
<!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]--> <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://mozilla.org/firefox">Upgrade to a modern version of Firefox</a> to experience this site.</p><![endif]-->
<!-- ^ FreedomBox needs a better version of "Browse Happy", with freedom and privacy-respecting browsers only -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container-fluid"> <div class="container-fluid">