Merge pull request #7531 from freedomofpress/noble-mon-1

zenmonkeykstop · web-flow · commit 8aae8beb5852 · 2025-05-06T13:54:24.000-04:00
SecureDrop 2.12.6 / upgrade 20% of mon servers
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.12.6
+
+* Do fully automated upgrade of 20% of mon servers (#7531)
+
 ## 2.12.5
 
 * Do fully automated upgrade of 100% of app servers (#7530)
diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop
@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in
 # hosts_vars/app.yml or host_vars/mon.yml
-securedrop_version: "2.12.5"
+securedrop_version: "2.12.6"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true
diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver
@@ -1 +1 @@
-2.12.5
+2.12.6
diff --git a/securedrop/debian/changelog b/securedrop/debian/changelog
@@ -1,3 +1,9 @@
+securedrop (2.12.6) unstable; urgency=medium
+
+  * see changelog.md 
+
+ -- SecureDrop Team <securedrop@freedom.press>  Tue, 06 May 2025 10:17:51 -0400
+
 securedrop (2.12.5) unstable; urgency=medium
 
   * see changelog.md 
diff --git a/securedrop/debian/config/usr/share/securedrop/noble-upgrade.json b/securedrop/debian/config/usr/share/securedrop/noble-upgrade.json
@@ -4,7 +4,7 @@
         "bucket": 5
     },
     "mon": {
-        "enabled": false,
-        "bucket": 0
+        "enabled": true,
+        "bucket": 1
     }
 }
diff --git a/securedrop/setup.py b/securedrop/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.12.5",
+    version="2.12.6",
     author="Freedom of the Press Foundation",
     author_email="securedrop@freedom.press",
     description="SecureDrop Server",
diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = "2.12.5"
+__version__ = "2.12.6"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"bucket": 5`
`5`	`5`	`},`
`6`	`6`	`"mon": {`
`7`		`- "enabled": false,`
`8`		`- "bucket": 0`
	`7`	`+ "enabled": true,`
	`8`	`+ "bucket": 1`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "2.12.5"`
	`1`	`+__version__ = "2.12.6"`