From e23dd7b2422923288862879f1c2be328a4543a05 Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Sun, 31 May 2020 19:40:39 -0700
Subject: [PATCH] added noblogs-wp-ssl submodule
---
.gitmodules | 3 +++
composer.json | 10 ++++++++--
composer.lock | 26 ++++++++++++++++++++++++--
mu-plugins-src/noblogs-wp-ssl | 1 +
4 files changed, 36 insertions(+), 4 deletions(-)
create mode 160000 mu-plugins-src/noblogs-wp-ssl
diff --git a/.gitmodules b/.gitmodules
index 09c812c6..7e8ed248 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "mu-plugins-src/ai-mu-plugins"]
path = mu-plugins-src/ai-mu-plugins
url = git@git.autistici.org:lucha/ai-mu-plugins.git
+[submodule "mu-plugins-src/noblogs-wp-ssl"]
+ path = mu-plugins-src/noblogs-wp-ssl
+ url = git@git.autistici.org:ai/noblogs-wp-ssl.git
diff --git a/composer.json b/composer.json
index 4d63fc7d..aff1ec62 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,10 @@
{
"type": "vcs",
"url": "git@git.autistici.org:lucha/ai-mu-plugins.git"
+ },
+ {
+ "type": "vcs",
+ "url": "git@git.autistici.org:ai/noblogs-wp-ssl.git"
}
],
"config": {
@@ -64,7 +68,8 @@
"package:wpackagist-plugin/wpmu-new-blog-defaults:cets_blog_defaults.php",
"package:wpackagist-plugin/more-privacy-options:ds_wp3_private_blog.php",
"package:wpackagist-plugin/disable-emojis:disable-emojis.php",
- "package:lucha/ai-mu-plugins:embed.php,remove-password-change-notification.php,send-smtp-email.php"
+ "package:lucha/ai-mu-plugins:embed.php,remove-password-change-notification.php,send-smtp-email.php",
+ "package:ai/noblogs-wp-ssl:noblogs-wp-ssl.php"
],
"app/wp-content": ["package:wpackagist-plugin/hyperdb:db.php"],
"app": ["package:lucha/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"]
@@ -72,6 +77,7 @@
},
"require-dev": {
"lucha/r2db": "dev-master",
- "lucha/ai-mu-plugins": "dev-master"
+ "lucha/ai-mu-plugins": "dev-master",
+ "ai/noblogs-wp-ssl": "dev-master"
}
}
diff --git a/composer.lock b/composer.lock
index 926368d7..ac4f77d8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "46c43279e2627da3199145fca88ef9ca",
+ "content-hash": "e7d9006f3ea383c37020ea371d52dd64",
"packages": [
{
"name": "bjornjohansen/wplang",
@@ -537,6 +537,27 @@
}
],
"packages-dev": [
+ {
+ "name": "ai/noblogs-wp-ssl",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "git@git.autistici.org:ai/noblogs-wp-ssl.git",
+ "reference": "da8fc9084507a66d29e211d757878e5097426f19"
+ },
+ "require": {
+ "composer/installers": "^1.9"
+ },
+ "type": "wordpress-muplugin",
+ "authors": [
+ {
+ "name": "sand",
+ "email": "sand@autistici.org"
+ }
+ ],
+ "description": "git@git.autistici.org:ai/noblogs-wp-ssl.git",
+ "time": "2020-06-01T02:35:28+00:00"
+ },
{
"name": "lucha/ai-mu-plugins",
"version": "dev-master",
@@ -587,7 +608,8 @@
"minimum-stability": "stable",
"stability-flags": {
"lucha/r2db": 20,
- "lucha/ai-mu-plugins": 20
+ "lucha/ai-mu-plugins": 20,
+ "ai/noblogs-wp-ssl": 20
},
"prefer-stable": false,
"prefer-lowest": false,
diff --git a/mu-plugins-src/noblogs-wp-ssl b/mu-plugins-src/noblogs-wp-ssl
new file mode 160000
index 00000000..da8fc908
--- /dev/null
+++ b/mu-plugins-src/noblogs-wp-ssl
@@ -0,0 +1 @@
+Subproject commit da8fc9084507a66d29e211d757878e5097426f19
--
GitLab