Merge pull request #7406 from freedomofpress/stg-upgrade-script

Script to upgrade from focal to noble

install_files/ansible-base/roles/app/tasks/install_and_harden_apache.yml

@@ -80,18 +80,6 @@
     - apache
     - hardening
 
-  # The default html directory gets created during installation
-  # of the apache package, so this task must run after installing.
-- name: Remove default Apache site directory /var/www/html/.
-  file:
-    state: absent
-    dest: /var/www/html
-  notify:
-    - restart apache2
-  tags:
-    - apache
-    - hardening
-
   # because we no longer call the `journalist interface` the `document interface`
 - name: Remove old config files
   file:

noble-migration/Cargo.toml

@@ -5,6 +5,9 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.93"
+env_logger = { version = "0.11.5", features = ["humantime"] , default-features = false }
+log = "0.4.22"
+rand = "0.8.5"
 rustix = { version = "0.38.40", features = ["process"] }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.132"

noble-migration/files/apt_freedom_press.list

@@ -0,0 +1 @@
+deb [arch=amd64] https://apt.freedom.press noble main

noble-migration/files/sources.list

@@ -0,0 +1,13 @@
+## newer versions of the distribution.
+deb http://archive.ubuntu.com/ubuntu/ noble main
+
+## newer versions of the distribution.
+deb http://archive.ubuntu.com/ubuntu/ noble universe
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://archive.ubuntu.com/ubuntu/ noble-updates main
+
+### Security fixes for distribution packages
+deb http://security.ubuntu.com/ubuntu noble-security main
+deb http://security.ubuntu.com/ubuntu noble-security universe

noble-migration/files/ubuntu.sources

@@ -0,0 +1,11 @@
+Types: deb
+URIs: http://archive.ubuntu.com/ubuntu/
+Suites: noble noble-updates
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+Types: deb
+URIs: http://security.ubuntu.com/ubuntu/
+Suites: noble-security
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg