Merge freephile:34.x into enterprisemediawiki:34.x

.github/workflows/ci.yml

@@ -0,0 +1,49 @@
+---
+"on":
+  # Trigger the workflow on pushes to these branches
+  push:
+    branches:
+      - master
+      - 34.x
+jobs:
+  one:
+    # ubuntu-18.04
+    # runs-on: ubuntu-latest 
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      # GitHub Runners include a LOT of software by default
+      # https://github.com/actions/virtual-environments/blob/master/images/linux/Ubuntu1804-README.md
+      - name: Uninstall MySQL so we can use MariaDB
+        run: sudo apt-get remove --purge mysql-server
+
+      - name: Make target directory for sources
+        run: mkdir -p /opt/meza
+
+      - name: Copy code
+        run: sudo cp -r ${{ github.workspace }} /opt/
+
+      - name: Install prerequisites
+        run: sudo apt install -y git ansible
+
+      # - name: Clone Meza
+      #   run: sudo git clone https://github.com/freephile/meza /opt/meza
+
+      - name: Run "getmeza with sudo -H to avoid cache warnings"
+        run: sudo -H bash /opt/meza/src/scripts/getmeza.sh
+
+      - name: Setup the monolith environment
+        run: sudo meza setup env monolith --fqdn="127.0.0.1" --db_pass=1234 --private_net_zone=public
+
+      # The --no-firewall option does not exist
+      - name: Deploy Meza
+        run: sudo meza deploy monolith -vvv
+
+      - name: Print hosts file as a rudimentary "test"
+        run: cat /opt/conf-meza/secret/monolith/hosts

README.md

@@ -1,20 +1,16 @@
-# meza
+# QualityBox 
 
-[![Build Status](https://travis-ci.org/enterprisemediawiki/meza.svg?branch=master)](https://travis-ci.org/enterprisemediawiki/meza)
-[![Code Climate](https://codeclimate.com/github/enterprisemediawiki/meza/badges/gpa.svg)](https://codeclimate.com/github/enterprisemediawiki/meza)
+Setup an enterprise MediaWiki server with **simple commands**. Put all components on a single monolithic server or split them out over many. Run a single database or have replicas. Deploy to multiple environments. Run backups. Do it all using the `meza` command. Run `meza --help` for more info.
 
-<img src="https://raw.githubusercontent.com/enterprisemediawiki/meza/master/manual/commands.gif">
+> Note: This project is a fork of the original Meza project developed at NASA. We still use the same 'meza' command internally but are gradually updating the system to be consistent with the QualityBox (or qb) brand.
 
-Setup an enterprise MediaWiki server with **simple commands**. Put all components on a single monolithic server or split them out over many. Run a solitary master database or have replicas. Deploy to multiple environments. Run backups. Do it all using the `meza` command. Run `meza --help` for more info.
+## Why QualityBox?
 
-## Why meza?
-
-Standard MediaWiki is easy to install, but increasingly its newer and better features are contained within extensions that are more complicated. Additionally, they may be particularly difficult to install on Enterprise Linux derivatives. This project aims to make these features (VisualEditor, CirrusSearch, etc) easy to *install, backup, reconfigure, and maintain* in a robust and well-tested way.
+Standard MediaWiki is easy to install, but increasingly its newer and better features are contained within extensions that are more complicated. Additionally, they may be particularly difficult to install on Enterprise Linux derivatives. This project aims to make these features (VisualEditor, CirrusSearch, etc) easy to *install, backup, reconfigure, and maintain* in a robust and well-tested way.  Furthermore, we aim to package all the extra security, tools and configuration that enable scalable PUBLIC wikis to thrive in a hostile Internet.
 
 ## Requirements
 
-1. CentOS 7 or RHEL 7 (for now, with Debian support in the works)
-2. Minimal install: Attempting to install it on a server with many other things already installed may not work properly due to conflicts.
+1. CentOS 7 RHEL 7 or Debian 10
 
 ## Install and usage
 

Vagrantfile

@@ -28,7 +28,7 @@ elsif configuration.key?("box_os")
   box_os = configuration["box_os"]
 
   if box_os == "debian"
-    baseBox = "debian/contrib-stretch64"
+    baseBox = "debian/contrib-buster64"
   elsif box_os == "centos"
     baseBox = "bento/centos-7.4"
   else

config/Debian.yml

@@ -7,46 +7,11 @@ package_firewall: ufw
 package_openssh_client: openssh-client
 package_cron: cron
 package_apache: apache2
-
-# RedHat install has a lot of php/apache dependencies, but these may be carry-overs
-# from when Meza installed Apache and PHP from source. They probably are not needed
-# anymore.
 package_php_apache_deps: []
-  # Did not immediately find a replacement package in Debian for these RH packages
-  # - zlib-devel
-  # - sqlite-devel
-  # - bzip2-devel
-  # - pcre-devel
-  # - libXpm-devel
-  # - gmp-devel
-  # - t1lib-devel
-  # - aspell-devel
-  # - libvpx-devel
-  # - readline-devel
-  # - libmcrypt-devel
-  # - pam-devel
-  # - m4
-  # - xz-libs
-  # These are either named the same in RE vs Debian, or were easily found
-  # - libcurl4-openssl-dev
-  # - libssl-dev
-  # - libxml2-dev
-  # - libicu-dev
-  # - libjpeg-dev
-  # - libpng-dev
-  # - libfreetype6-dev
-  # - libtidy-dev
-  # - sendmail
-  # - sendmail-cf
-  # - mariadb-common
-  # These are required to install PHP from source.
-  # - libxpm-dev
-  # - libmysqlclient-dev
-  # - libpq-dev
-  # - libldap2-dev
-  # - libxslt-dev
-  # - libldb-dev
 
+# Use Tokyo Cabinet for on-disk support if you know your distro supports it
+# override with goaccess-tcb 
+package_goaccess: goaccess
 package_java: "default-jre"
 package_python3: python3
 package_python3_pip: python3-pip

config/MezaCoreExtensions.yml

@@ -3,7 +3,7 @@ list:
 
   - name: Semantic MediaWiki
     composer: "mediawiki/semantic-media-wiki"
-    version: "3.0.0"
+    version: "~3.1"
     config: |
       // Enable Semantic MediaWiki semantics
       enableSemantics( $wikiId );
@@ -23,11 +23,11 @@ list:
       // created them, and thus they effectively don't replicate). Picking
       // DB_SLAVE since temporary tables are effectively a read-action since
       // they are used only for making more efficient queries.
-      $smwgLocalConnectionConf['mw.db.queryengine'] = [ 'read' => DB_SLAVE, 'write' => DB_SLAVE ];
+      $smwgLocalConnectionConf['mw.db.queryengine'] = [ 'read' => DB_REPLICA, 'write' => DB_REPLICA ];
 
   - name: Semantic Result Formats
     composer: "mediawiki/semantic-result-formats"
-    version: "3.0.0"
+    version: "~3.2"
     config: |
       // In SRF 3.0+ you need to do this, too:
       wfLoadExtension( 'SemanticResultFormats' );
@@ -38,18 +38,22 @@ list:
       // $srfgFormats[] = 'googlebar';
       // $srfgFormats[] = 'googlepie';
 
-      // Disabled until the proper dependencies are added (PHPExcel I think)
+      // Disabled until the proper dependencies are added (the phpspreadsheet library from phpoffice)
       // $srfgFormats[] = 'excel';
 
       // Enables the "filtered" format. Where do we use this?
       $srfgFormats[] = 'filtered';
 
       // Disabled due to some issue on FOD wikis. Confirm, reenable if possible
       // $srfgFormats[] = 'exhibit';
-
+
+  # Allows for the display of more than one SMW inline query in one results display set.
   - name: SemanticCompoundQueries
     composer: "mediawiki/semantic-compound-queries"
-    version: "1.2.0"
+    version: "~2.1"
+    config: |
+      wfLoadExtension( 'SemanticCompoundQueries' );
+
   - name: Scribunto
     repo: https://github.com/wikimedia/mediawiki-extensions-Scribunto.git
     version: "{{ mediawiki_default_branch }}"
@@ -59,22 +63,22 @@ list:
       $wgScribuntoUseCodeEditor = true;
   - name: "Semantic Scribunto"
     composer: "mediawiki/semantic-scribunto"
-    version: 2.0.0
+    version: ~2.1
     config: |
       wfLoadExtension( 'SemanticScribunto' );
   - name: SubPageList
     composer: "mediawiki/sub-page-list"
-    version: "1.5.0"
+    version: "1.6.1"
   - name: Maps
     composer: "mediawiki/maps"
-    version: "6.0.3"
+    version: "~7.0"
     config: |
       // In Maps 6.0+ you need to also load the extension
       wfLoadExtension( 'Maps' );
 
   - name: DisplayTitle
     repo: https://github.com/wikimedia/mediawiki-extensions-DisplayTitle.git
-    version: tags/1.2
+    version: "{{ mediawiki_default_branch }}"
 
 
   #
@@ -89,7 +93,7 @@ list:
       $wgPFEnableStringFunctions = true;
   - name: ExternalData
     repo: https://github.com/wikimedia/mediawiki-extensions-ExternalData.git
-    version: "{{ mediawiki_default_branch }}"
+    version: "master"
   - name: LabeledSectionTransclusion
     repo: https://github.com/wikimedia/mediawiki-extensions-LabeledSectionTransclusion.git
     version: "{{ mediawiki_default_branch }}"
@@ -106,8 +110,10 @@ list:
     version: "{{ mediawiki_default_branch }}"
   - name: PageForms
     repo: https://github.com/wikimedia/mediawiki-extensions-PageForms.git
-    # commit includes spreadsheet sorting which didn't make PageForms 4.4.1
-    version: "730390a31a56c001af83948af1eefc5174abbe06"
+    version: "master"
+    config: |
+      // If enabled all "red links" will bring up a form chooser
+      $wgPageFormsLinkAllRedLinksToForms = false;
   - name: DismissableSiteNotice
     repo: https://github.com/wikimedia/mediawiki-extensions-DismissableSiteNotice.git
     version: "{{ mediawiki_default_branch }}"
@@ -130,10 +136,10 @@ list:
     version: "{{ mediawiki_default_branch }}"
   - name: InputBox
     repo: https://github.com/wikimedia/mediawiki-extensions-InputBox.git
-    version: "{{ mediawiki_default_branch }}"
+    version: "master"
   - name: ReplaceText
     repo: https://github.com/wikimedia/mediawiki-extensions-ReplaceText.git
-    version: tags/1.4
+    version: "master"
   - name: Interwiki
     repo: https://github.com/wikimedia/mediawiki-extensions-Interwiki.git
     version: "{{ mediawiki_default_branch }}"
@@ -222,11 +228,11 @@ list:
       $wgPageShowWatchingUsers = true;
   - name: SemanticInternalObjects
     repo: https://github.com/wikimedia/mediawiki-extensions-SemanticInternalObjects.git
-    version: "{{ mediawiki_default_branch }}"
+    version: "master"
     legacy_load: true
   - name: SemanticDrilldown
     repo: https://github.com/wikimedia/mediawiki-extensions-SemanticDrilldown.git
-    version: "{{ mediawiki_default_branch }}"
+    version: "master"
     legacy_load: true
   - name: Arrays
     repo: https://github.com/wikimedia/mediawiki-extensions-Arrays.git
@@ -238,8 +244,7 @@ list:
     legacy_load: true
   - name: AdminLinks
     repo: https://github.com/wikimedia/mediawiki-extensions-AdminLinks.git
-    version: "{{ mediawiki_default_branch }}"
-    legacy_load: true
+    version: "master"
     config: |
       $wgGroupPermissions['sysop']['adminlinks'] = true;
   - name: BatchUserRights
@@ -251,16 +256,15 @@ list:
     config: |
       $wgHeaderTabsEditTabLink = false;
       $wgHeaderTabsRenderSingleTab = true;
-  - name: CopyWatchers
-    repo: https://github.com/jamesmontalvo3/MediaWiki-CopyWatchers.git
-    version: tags/0.10.0
+#  - name: CopyWatchers
+#    repo: https://github.com/jamesmontalvo3/MediaWiki-CopyWatchers.git
+#    version: tags/0.10.0
   - name: Wiretap
     repo: https://github.com/enterprisemediawiki/Wiretap.git
-    version: tags/0.1.0
+    version: master 
   - name: ApprovedRevs
     repo: https://github.com/wikimedia/mediawiki-extensions-ApprovedRevs.git
-    # Use this commit until a release tag for v1.0 is created
-    version: tags/1.0
+    version: master
     config: |
       $egApprovedRevsAutomaticApprovals = false;
   - name: ImagesLoaded
@@ -269,11 +273,11 @@ list:
   - name: MasonryMainPage
     repo: https://github.com/enterprisemediawiki/MasonryMainPage.git
     version: tags/0.3.0
-  - name: WatchAnalytics
-    repo: https://github.com/enterprisemediawiki/WatchAnalytics.git
-    version: tags/3.1.1
-    config: |
-      $egPendingReviewsEmphasizeDays = 10; // makes Pending Reviews shake after X days
+#  - name: WatchAnalytics
+#    repo: https://github.com/enterprisemediawiki/WatchAnalytics.git
+#    version: tags/3.1.1
+#    config: |
+#      $egPendingReviewsEmphasizeDays = 10; // makes Pending Reviews shake after X days
   - name: Variables
     repo: https://github.com/wikimedia/mediawiki-extensions-Variables.git
     version: "{{ mediawiki_default_branch }}"
@@ -328,7 +332,7 @@ list:
       $wgApiFrameOptions = 'SAMEORIGIN';
 
       // Use UploadWizard by default in navigation bar
-      $wgUploadNavigationUrl = "$wgScriptPath/index.php/Special:UploadWizard";
+      // $wgUploadNavigationUrl = "$wgScriptPath/index.php/Special:UploadWizard";
       $wgUploadWizardConfig = array(
         'debug' => false,
         'autoCategory' => 'Uploaded with UploadWizard',
@@ -369,7 +373,7 @@ list:
 
   - name: DataTransfer
     repo: https://github.com/wikimedia/mediawiki-extensions-DataTransfer.git
-    version: "{{ mediawiki_default_branch }}"
+    version: "master"
   - name: PageImporter
     repo: https://github.com/enterprisemediawiki/PageImporter.git
     version: tags/0.1.0

config/RedHat.yml

@@ -34,6 +34,7 @@ package_php_apache_deps:
   - m4
   - xz-libs
   - mariadb-libs
+package_goaccess: goaccess
 package_java: java-1.8.0-openjdk
 package_python3: python35u
 package_python3_pip: python35u-pip

config/defaults.yml

@@ -9,6 +9,10 @@ m_meza: /opt/meza
 # production being as performant and secure as possible
 # development being less secure and providing optional features useful for dev
 m_use_production_settings: True
+# default (False) will fail on local mediawiki extension modifcations
+# Overriding can be useful to add to public.yml for development environments
+m_ignore_local_mods: False
+m_use_subdomains: false
 
 # config dir
 m_config_core: /opt/meza/config
@@ -101,6 +105,11 @@ wiki_id_redirects: {}
 
 m_force_debug: false
 
+# if you enable certbot, make sure you add m_httpd_server_admin in your public.yml
+enable_certbot: false 
+
+enable_goaccess: false
+
 enable_wiki_emails: true
 
 enable_haproxy_stats: false
@@ -151,23 +160,23 @@ m_meza_sudeoers_file: "/etc/sudoers.d/meza-ansible"
 #
 
 # Version of MediaWiki core
-mediawiki_version: "REL1_32"
+mediawiki_version: "REL1_34"
 
 # Branch to use on many extensions extensions and skins
-mediawiki_default_branch: "REL1_32"
+mediawiki_default_branch: "REL1_34"
 
 # PHP version
-php_ius_version: "php71u"
-php_debian_version: "7.1"
+php_ius_version: "php72u"
+php_debian_version: "7.2"
 
 # Parsoid version
 # e6b708 is commit on 16-OCT-2018, the day the REL1_32 branch was made
-m_parsoid_version: "e6b708b3d7ff50a314d021295dce874574aa3e9e"
+m_parsoid_version: "master"
 
 # MediaWiki 1.27 and earlier require ElasticSearch 1.6
 # MediaWiki 1.28 and higher require ElasticSearch 2.x
 # MediaWiki 1.29 and higher require ElasticSearch 5.x
-elasticsearch_major_version: "5.x"
+elasticsearch_major_version: "6.x"
 
 # Whether or not to install Lua/luasandbox
 m_install_lua: true
@@ -199,9 +208,6 @@ packages_php_debian:
   - php-pear
   - php-memcached
 
-  # No PHP 7.2 version of this (just like with IUS)
-  - php{{ php_debian_version }}-mcrypt
-
   # No apt package corresponding to:
   #   "{{ php_ius_version }}-process"
   #   "{{ php_ius_version }}-pdo"