diff --git a/global/overlay/etc/puppet/modules/net/manifests/forum.pp b/global/overlay/etc/puppet/modules/net/manifests/forum.pp new file mode 100644 index 0000000..5b36fd8 --- /dev/null +++ b/global/overlay/etc/puppet/modules/net/manifests/forum.pp @@ -0,0 +1,26 @@ +class net::forum { + # Required packages + package { ['php', 'mysql-server', 'mysql-client']: + ensure => installed, + } + + # Create virtual host configuration file + file { '/etc/apache2/sites-enabled/humhub.conf': + ensure => file, + content => template('net/forum/humhub.conf.erb'), + mode => '0644', + require => Package['apache2'], + notify => Service['apache2'], + } + + # Create a basic index.html + file { '/var/www/index.html': + ensure => file, + content => template('net/forum/index.html.erb'), + owner => 'www-data', + group => 'www-data', + mode => '0644', + require => Package['apache2'], + } +} + diff --git a/global/overlay/etc/puppet/modules/net/templates/forum/humhub.conf.erb b/global/overlay/etc/puppet/modules/net/templates/forum/humhub.conf.erb new file mode 100644 index 0000000..1664e93 --- /dev/null +++ b/global/overlay/etc/puppet/modules/net/templates/forum/humhub.conf.erb @@ -0,0 +1,52 @@ + + ServerName <%= @networking['fqdn'] %> + ServerAdmin kristofer@sunet.se + + SSLEngine on + SSLCertificateFile /etc/ssl/private/forum-sto3-prod-1.sunet.se_infra.pem + SSLCertificateKeyFile /etc/ssl/private/forum-sto3-prod-1.sunet.se_infra.key + SSLCertificateChainFile /etc/ssl/certs/forum-sto3-prod-1.sunet.se_infra.crt + + #DocumentRoot /var/www/ + DocumentRoot /var/www/humhub + +Define VPATH /ooffice +Define DS_ADDRESS localhost:8080 + + + Require all granted + SetEnvIf Host "^(.*)$" THE_HOST=$1 + RequestHeader setifempty X-Forwarded-Proto http + RequestHeader setifempty X-Forwarded-Host %{THE_HOST}e + RequestHeader edit X-Forwarded-Host (.*) $1${VPATH} + ProxyAddHeaders Off + + +ProxyPassMatch ^\${VPATH}(.*)(\/websocket)$ "ws://${DS_ADDRESS}/$1$2" +ProxyPass ${VPATH} "http://${DS_ADDRESS}" +ProxyPassReverse ${VPATH} "http://${DS_ADDRESS}" + + + Options -Indexes -FollowSymLinks + AllowOverride All + + + + Order Deny,Allow + Deny from all + + + + Order Deny,Allow + Deny from all + + + + Header set Cache-Control "max-age=172800, public" + + + + + ServerName forum.sunet.se + Redirect / https://forum.sunet.se + \ No newline at end of file diff --git a/global/overlay/etc/puppet/modules/net/templates/forum/index.html.erb b/global/overlay/etc/puppet/modules/net/templates/forum/index.html.erb new file mode 100644 index 0000000..7cfa325 --- /dev/null +++ b/global/overlay/etc/puppet/modules/net/templates/forum/index.html.erb @@ -0,0 +1,7632 @@ + + + + + + Sunet Forum + + + + +
+
+ +
+
+
+
+
+

+ + + Sunet Forum +

+

En mötesplats för kommunikation, nätverkande och utbyte av erfarenheter inom Sunets communities.

+
+
+
+
+
+
+
+
+ +
+
+

Logga in

+
+


Klicka här för att logga in via din organisation.

+
+ +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/lb-common/overlay/etc/hiera/data/group.yaml b/lb-common/overlay/etc/hiera/data/group.yaml index 869a354..d536792 100644 --- a/lb-common/overlay/etc/hiera/data/group.yaml +++ b/lb-common/overlay/etc/hiera/data/group.yaml @@ -175,8 +175,8 @@ sunet_frontend: ips: ['37.156.192.14', '2001:6b0:60:c0::14'] backends: default: - 'humhub-idp-proxy-1.sunet.se': - ips: ['89.45.236.42'] + 'humhubproxy-sto1-prod-2.sunet.se': + ips: ['89.47.185.154'] server_args: 'ssl check verify none' 'humhub-idp-proxy-2.sunet.se': ips: ['89.47.185.213']