-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix: workflofs, apache-config and some link issues
- Loading branch information
Showing
11 changed files
with
85 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| public/ | ||
| .hugo_build.lock | ||
| resources/_gen/ | ||
| www/ | ||
| www-dev/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,33 @@ | ||
| <VirtualHost *:80> | ||
| ServerName dev.ff.berlin | ||
| ServerName dev.berlin.freifunk.net | ||
| ServerAdmin "[email protected]" | ||
|
|
||
| DocumentRoot /var/www/404 | ||
|
|
||
| RewriteEngine On | ||
| RewriteCond %{REQUEST_URI} !^/.well-known/ | ||
| RewriteRule .* https://dev.ff.berlin%{REQUEST_URI} [R=301,L] | ||
| RewriteRule .* https://dev.berlin.freifunk.net%{REQUEST_URI} [R=301,L] | ||
| </VirtualHost> | ||
|
|
||
| <VirtualHost *:443> | ||
| ServerName dev.ff.berlin | ||
| ServerName dev.berlin.freifunk.net | ||
| ServerAdmin "[email protected]" | ||
| SSLEngine on | ||
| SSLCertificateFile /etc/letsencrypt/live/dev.ff.berlin/cert.pem | ||
| SSLCertificateChainFile /etc/letsencrypt/live/dev.ff.berlin/chain.pem | ||
| SSLCertificateKeyFile /etc/letsencrypt/live/dev.ff.berlin/privkey.pem | ||
| SSLCertificateFile /etc/letsencrypt/live/dev.berlin.freifunk.net/cert.pem | ||
| SSLCertificateChainFile /etc/letsencrypt/live/dev.berlin.freifunk.net/chain.pem | ||
| SSLCertificateKeyFile /etc/letsencrypt/live/dev.berlin.freifunk.net/privkey.pem | ||
|
|
||
| DocumentRoot /var/www/dev.berlin.freifunk.net/www/dev | ||
| DocumentRoot /var/www/berlin.freifunk.net/www-dev | ||
|
|
||
| <Directory "/var/www/dev.berlin.freifunk.net/www"> | ||
| Header set Content-Security-Policy "script-src dev.berlin.freifunk.net" | ||
| Header set Strict-Transport-Security "max-age=63072000; includeSubDomains" | ||
|
|
||
| <Directory "/var/www/berlin.freifunk.net/www-dev"> | ||
| Options FollowSymLinks | ||
| AllowOverride None | ||
| Require all granted | ||
| </Directory> | ||
|
|
||
| ErrorLog "/var/log/apache2/dev.berlin.freifunk.net-error.log" | ||
| CustomLog "/var/log/apache2/dev.berlin.freifunk.net-access.log" combined | ||
| ErrorLog "/var/log/apache2/berlin.freifunk.net-error.log" | ||
| CustomLog "/var/log/apache2/berlin.freifunk.net-access.log" combined | ||
| </VirtualHost> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,27 @@ | ||
| <VirtualHost *:80> | ||
| ServerName website.ff.berlin | ||
| ServerName berlin.freifunk.net | ||
| ServerAdmin "[email protected]" | ||
|
|
||
| DocumentRoot /var/www/404 | ||
|
|
||
| RewriteEngine On | ||
| RewriteCond %{REQUEST_URI} !^/.well-known/ | ||
| RewriteRule .* https://website.ff.berlin%{REQUEST_URI} [R=301,L] | ||
| RewriteRule .* https://berlin.freifunk.net%{REQUEST_URI} [R=301,L] | ||
| </VirtualHost> | ||
|
|
||
| <VirtualHost *:443> | ||
| ServerName website.ff.berlin | ||
| ServerName berlin.freifunk.net | ||
| ServerAdmin "[email protected]" | ||
| SSLEngine on | ||
| SSLCertificateFile /etc/letsencrypt/live/website.ff.berlin/cert.pem | ||
| SSLCertificateChainFile /etc/letsencrypt/live/website.ff.berlin/chain.pem | ||
| SSLCertificateKeyFile /etc/letsencrypt/live/website.ff.berlin/privkey.pem | ||
| SSLCertificateFile /etc/letsencrypt/live/berlin.freifunk.net/cert.pem | ||
| SSLCertificateChainFile /etc/letsencrypt/live/berlin.freifunk.net/chain.pem | ||
| SSLCertificateKeyFile /etc/letsencrypt/live/berlin.freifunk.net/privkey.pem | ||
|
|
||
| DocumentRoot /var/www/berlin.freifunk.net/www | ||
|
|
||
| Header set Content-Security-Policy "script-src berlin.freifunk.net" | ||
| Header set Strict-Transport-Security "max-age=63072000; includeSubDomains" | ||
|
|
||
| <Directory "/var/www/berlin.freifunk.net/www"> | ||
| Options FollowSymLinks | ||
| AllowOverride None | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <!-- | ||
| Image template - Renders a full html figure. | ||
| Everything could be set with named variables. | ||
| Only src and alt are required. | ||
| --> | ||
| {{ if .Get "alt" }} | ||
| <figure{{ with .Get "class" }} class="{{ . }}"{{ end }}> | ||
| {{- if .Get "link" -}} | ||
| <a href="{{ .Get "link" }}"{{ with .Get "target" }} target="{{ . }}"{{ end }}{{ with .Get "rel" }} rel="{{ . }}"{{ end }}> | ||
| {{- end -}} | ||
| <img src="{{ .Get "src" | relURL }}" | ||
| {{- if or (.Get "alt") (.Get "caption") }} | ||
| alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}" | ||
| {{- end -}} | ||
| {{- with .Get "width" }} width="{{ . }}"{{ end -}} | ||
| {{- with .Get "height" }} height="{{ . }}"{{ end -}} | ||
| {{- with .Get "loading" }} loading="{{ . }}"{{ end -}} | ||
| /><!-- Closing img tag --> | ||
| {{- if .Get "link" }}</a>{{ end -}} | ||
| {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}} | ||
| <figcaption> | ||
| {{ with (.Get "title") -}} | ||
| <h4>{{ . }}</h4> | ||
| {{- end -}} | ||
| {{- if or (.Get "caption") (.Get "attr") -}}<p> | ||
| {{- .Get "caption" | markdownify -}} | ||
| {{- with .Get "attrlink" }} | ||
| <a href="{{ . }}"> | ||
| {{- end -}} | ||
| {{- .Get "attr" | markdownify -}} | ||
| {{- if .Get "attrlink" }}</a>{{ end }}</p> | ||
| {{- end }} | ||
| </figcaption> | ||
| {{- end }} | ||
| </figure> | ||
| {{ else }} | ||
| {{ print "Alt text missing!" }} | ||
| {{ end }} |