Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/206978
Change subject: policy.wm.org: minimal module/role for microsite ...................................................................... policy.wm.org: minimal module/role for microsite Minimal module to Setup Apache and docroot for new microsite policy.wikimedia.org. Bug:97329 Change-Id: I707c3f7c21db3147739fa280a5c8c75029514e7e --- A manifests/role/policysite.pp A modules/policysite/files/policy.wikimedia.org A modules/policysite/manifests/init.pp 3 files changed, 63 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/78/206978/1 diff --git a/manifests/role/policysite.pp b/manifests/role/policysite.pp new file mode 100644 index 0000000..19bc8a5 --- /dev/null +++ b/manifests/role/policysite.pp @@ -0,0 +1,15 @@ +# https://policy.wikimedia.org/ +# T97329 +class role::policysite { + + system::role { 'role::policysite': description => 'policy.wikimedia.org' } + + include ::policysite + + ferm::service { 'policysite_http': + proto => 'tcp', + port => '80', + } + +} + diff --git a/modules/policysite/files/policy.wikimedia.org b/modules/policysite/files/policy.wikimedia.org new file mode 100644 index 0000000..840867e --- /dev/null +++ b/modules/policysite/files/policy.wikimedia.org @@ -0,0 +1,29 @@ +# vim: filetype=apache +# https://policy.wikimedia.org (T97329) + +<VirtualHost *:80> + ServerAdmin [email protected] + ServerName policy.wikimedia.org + + DocumentRoot /srv/org/wikimedia/policyreport + + ErrorLog /var/log/apache2/error.log + LogLevel warn + CustomLog /var/log/apache2/access.log combined + + RewriteEngine On + RewriteCond %{HTTP:X-Forwarded-Proto} !https + RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,E=ProtoRedirect] + Header always merge Vary X-Forwarded-Proto + Header set Strict-Transport-Security "max-age=604800" + + <Directory /> + Order Deny,Allow + AllowOverride All + </Directory> + + <Directory /srv/org/wikimedia/policyreport> + Allow from all + </Directory> + +</VirtualHost> diff --git a/modules/policysite/manifests/init.pp b/modules/policysite/manifests/init.pp new file mode 100644 index 0000000..66beda8 --- /dev/null +++ b/modules/policysite/manifests/init.pp @@ -0,0 +1,19 @@ +# https://policy.wikimedia.org/ +# T97329 +class policysite { + + include ::apache + include ::apache::mod::headers + + file { '/srv/org/wikimedia/policy': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', + } + + apache::site { 'policy.wikimedia.org': + source => 'puppet:///modules/policysite/policy.wikimedia.org', + } + +} -- To view, visit https://gerrit.wikimedia.org/r/206978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I707c3f7c21db3147739fa280a5c8c75029514e7e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
