Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/187186
Change subject: add basic Apache site and docroot for dev.wm.org ...................................................................... add basic Apache site and docroot for dev.wm.org Add a basic Apache site and docroot for the upcoming developer portal page at dev.wikimedia.org. For now just a placeholder but already doing what we will need anyways and avoiding to show an error page. Bug:T308 Bug:T372 Change-Id: Ifef09d4fc29828823dca640095ba1dafff0ad941 --- A manifests/role/devportal.pp M manifests/site.pp A modules/devportal/manifests/init.pp A modules/devportal/templates/dev.wikimedia.org.erb 4 files changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/187186/1 diff --git a/manifests/role/devportal.pp b/manifests/role/devportal.pp new file mode 100644 index 0000000..a7b870e --- /dev/null +++ b/manifests/role/devportal.pp @@ -0,0 +1,10 @@ +# https://dev.wikimedia.org/ +# developer portal page - T308 +class role::devportal { + + system::role { 'role::devportal': description => 'dev.wikimedia.org' } + + include ::devportal + +} + diff --git a/manifests/site.pp b/manifests/site.pp index c2c95fe..768bfa9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2688,6 +2688,7 @@ include role::grafana include role::iegreview include role::annualreport + include role::devportal interface::add_ip6_mapped { 'main': interface => 'eth0', diff --git a/modules/devportal/manifests/init.pp b/modules/devportal/manifests/init.pp new file mode 100644 index 0000000..51642bd --- /dev/null +++ b/modules/devportal/manifests/init.pp @@ -0,0 +1,18 @@ +# https://dev.wikimedia.org/ +# T308 +class devportal { + + include ::apache + + file { '/srv/org/wikimedia/devportal': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755'; + } + + apache::site { 'dev.wikimedia.org': + content => template('devportal/dev.wikimedia.org.erb'), + } + +} diff --git a/modules/devportal/templates/dev.wikimedia.org.erb b/modules/devportal/templates/dev.wikimedia.org.erb new file mode 100644 index 0000000..8e06760 --- /dev/null +++ b/modules/devportal/templates/dev.wikimedia.org.erb @@ -0,0 +1,28 @@ +# vim: filetype=apache +# https://dev.wikimedia.org (T308) + +<VirtualHost *:80> + ServerAdmin [email protected] + ServerName dev.wikimedia.org + + DocumentRoot /srv/org/wikimedia/devportal + + 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 + + <Directory /> + Order Deny,Allow + AllowOverride All + </Directory> + + <Directory /srv/org/wikimedia/devportal> + Allow from all + </Directory> + +</VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/187186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifef09d4fc29828823dca640095ba1dafff0ad941 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
