Fix refactor (#7597)

Clean up some places missed by #7544.

Found this when running test farm tests. They were working as of 5d90544, and I will truly shocked if subsequent changes (all to the windows installer) made them stop working.

* Release script needs to target new CHANGELOG location

* Clean up various other CHANGELOG path references

* Update windows paths for new certbot location

* Add certbot to packages list for windows installer

tools/_release.sh

@@ -65,8 +65,8 @@ fi
 git checkout "$RELEASE_BRANCH"
 
 # Update changelog
-sed -i "s/master/$(date +'%Y-%m-%d')/" CHANGELOG.md
-git add CHANGELOG.md
+sed -i "s/master/$(date +'%Y-%m-%d')/" certbot/CHANGELOG.md
+git add certbot/CHANGELOG.md
 git diff --cached
 git commit -m "Update changelog for $version release"
 
@@ -249,17 +249,17 @@ echo gpg2 -U $RELEASE_GPG_KEY --detach-sign --armor $name.$rev.tar.xz
 cd ~-
 
 # Add master section to CHANGELOG.md
-header=$(head -n 4 CHANGELOG.md)
+header=$(head -n 4 certbot/CHANGELOG.md)
 body=$(sed s/nextversion/$nextversion/ tools/_changelog_top.txt)
-footer=$(tail -n +5 CHANGELOG.md)
+footer=$(tail -n +5 certbot/CHANGELOG.md)
 echo "$header
 
 $body
 
-$footer" > CHANGELOG.md
-git add CHANGELOG.md
+$footer" > certbot/CHANGELOG.md
+git add certbot/CHANGELOG.md
 git diff --cached
-git commit -m "Add contents to CHANGELOG.md for next version"
+git commit -m "Add contents to certbot/CHANGELOG.md for next version"
 
 echo "New root: $root"
 echo "Test commands (in the letstest repo):"

tools/extract_changelog.py

@@ -16,7 +16,7 @@ def main():
     section_pattern = re.compile(r'^##\s*{0}\s*-\s*[\d-]+$'
                                  .format(version.replace('.', '\\.')))
 
-    with open(os.path.join(CERTBOT_ROOT, 'CHANGELOG.md')) as file_h:
+    with open(os.path.join(CERTBOT_ROOT, 'certbot', 'CHANGELOG.md')) as file_h:
         lines = file_h.read().splitlines()
 
     changelog = []