Merge ~hloeung/ubuntu-repository-cache:fixes into ubuntu-repository-cache:master

[Haw Loeung]

bzr to git conversion clean up

[Paul Collins (pjdc)]

review: Approve (lgtm)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Merge proposal is approved, but source revision has changed, setting status to needs review.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 2d80ed1f021242d64ba05dec2cf43d751e437898

diff --git a/.bzrignore b/.gitignore
similarity index 100%
rename from .bzrignore
rename to .gitignore
diff --git a/Makefile b/Makefile
index db53b16..3221da9 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,6 @@ lint:
 
 clean:
 	@echo "Cleaning files"
-	@rm -rf build
-	@rm -rf htmlcov
-	@rm -rf .venv
-	@rm -rf .tox
-	@rm -rf ./tests/unit/__pycache__ ./reactive/__pycache__ ./lib/ubuntu_repository_cache/__pycache__ ./lib/ubuntu_repository_cache/tests/__pycache__ ./files/__pycache__
-	@rm -rf ./.coverage ./.juju-persistent-config ./.unit-state.db
+	@git clean -ffXd
 
 .PHONY: proof test lint
diff --git a/lib/ubuntu-repository-cache/__init__.py b/lib/ubuntu-repository-cache/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/lib/ubuntu-repository-cache/__init__.py
+++ /dev/null
diff --git a/lib/ubuntu-repository-cache/util.py b/lib/ubuntu-repository-cache/util.py
deleted file mode 100644
index 97f797d..0000000
--- a/lib/ubuntu-repository-cache/util.py
+++ /dev/null
@@ -1,158 +0,0 @@
-import aptsources.sourceslist
-import functools
-import glob
-import os
-import pwd
-import random
-import subprocess
-import sys
-
-sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
-
-from charmhelpers.core import (  # pylint: disable=F0401
-    hookenv,
-    host,
-    templating,
-)
-
-LOG = hookenv.log
-SERVICE = 'ubuntu-repository-cache'
-
-
-def become_user(uname):
-    '''Change the effective uid/gid to that of the user specified by uname'''
-
-    # Change effective uid/gid back to value from saved uid/gid
-    os.seteuid(os.getresuid()[2])
-    os.setegid(os.getresgid()[2])
-
-    # Change to the requested user's uid/gid
-    pw_record = pwd.getpwnam(uname)
-    os.setegid(pw_record.pw_gid)
-    os.seteuid(pw_record.pw_uid)
-
-
-# TODO Submit MP to include this in charmhelpers.core.host
-def run_as_user(user_name):
-    '''A decorator to run a function as a particular user.
-
-    This works as long as the saved uid (see os.getresuid()[2])
-    has permission to change the effective to that of the
-    desired uid/gid of the provided user name.
-    '''
-    def decorator(function):
-        def restore_saved_id():
-            os.seteuid(os.getresuid()[2])
-            os.setegid(os.getresgid()[2])
-
-        def become_user(uname):
-            '''Change the effective uid/gid to the specified user
-            '''
-
-            restore_saved_id()
-            pw_record = pwd.getpwnam(uname)
-            os.setegid(pw_record.pw_gid)
-            os.seteuid(pw_record.pw_uid)
-
-        @functools.wraps(function)
-        def wrapper(*args, **kwargs):
-            # Remember the current effective uid/gid
-            orig_id = os.geteuid(), os.getegid()
-
-            # Change to saved uid/gid so that wrapped functions can nest
-            # This assumes that the saved id has
-            restore_saved_id()
-
-            # Set effective uid/gid for speficied user
-            pw_record = pwd.getpwnam(user_name)
-            os.setegid(pw_record.pw_gid)
-            os.seteuid(pw_record.pw_uid)
-
-            result = function(*args, **kwargs)
-
-            # Restore effective uid/gid
-            restore_saved_id()
-            os.seteuid(orig_id[0])
-            os.setegid(orig_id[1])
-
-            return result
-        return wrapper
-    return decorator
-
-
-def change_aptsources_url(url='http://archive.ubuntu.com/ubuntu'):
-    '''Change the URL for the current /etc/apt/sources.list
-
-    This affects the URL for all sources in /etc/apt/sources.list
-    so care must be taken if the charm has added any custom source
-    URLs as it will alter them as well.
-
-    Sources added with charmhelpers.fetch.add_source() are not affected
-    as those are added under /etc/apt/sources.list.d/.
-    '''
-
-    sourceslist = aptsources.sourceslist.SourcesList()
-    sourceslist.refresh()
-    if not glob.glob('/etc/apt/sources.list.%s' % SERVICE):
-        sourceslist.backup(backup_ext=SERVICE)
-    distro = aptsources.distro.get_distro()
-    distro.get_sources(sourceslist)
-    distro.change_server(url)
-    sourceslist.save()
-
-
-def render_configs():
-    '''Render the configuration templates for all required services'''
-
-    LOG('Rendering configuration templates')
-    # Configure apache2
-    config = hookenv.config()
-    apache_context = {}
-    apache_context['DocumentRoot'] = '/srv/archive.ubuntu.com/'
-    apache_context['Sync_Host'] = config['sync-host']
-    templating.render('apache2/archive_ubuntu_com.conf',
-                      '/etc/apache2/sites-available/archive_ubuntu_com.conf',
-                      apache_context)
-    subprocess.check_call(['a2ensite', 'archive_ubuntu_com'])
-
-    # Configure squid-deb-proxy
-    squid_context = {}
-    squid_context['Cache_Dir'] = '/var/cache/squid-deb-proxy'
-    squid_context['Cache_Size'] = config['cache-size']
-    squid_context['Cache_Mem'] = config['cache-mem']
-    squid_context['Max_Obj_Size'] = '512'
-    squid_context['Max_Obj_Size_Mem'] = '30'
-    templating.render('squid-deb-proxy/squid-deb-proxy.conf',
-                      '/etc/squid-deb-proxy/squid-deb-proxy.conf',
-                      squid_context)
-
-    templating.render('squid-deb-proxy/allowed-networks-src.conf',
-                      '/etc/squid-deb-proxy/allowed-networks-src.conf',
-                      {})
-
-    cron_context = {}
-    if not getattr(config, 'rsync-minutes', None):
-        config['rsync-minutes'] = random.randint(0, 59)
-        config.save()
-    cron_context['Minutes'] = config['rsync-minutes']
-    templating.render('cron/ubuntu-repository-cache_rsync.cron',
-                      '/etc/cron.d/ubuntu-repository-cache_rsync',
-                      cron_context)
-
-
-def restart_services():
-    '''Reload/Restart all of the required services'''
-
-    LOG('(Re)Starting required services')
-    if not os.access('/srv/archive.ubuntu.com/www/ubuntu', os.R_OK):
-        LOG('Mirrored metadata unavailble, not starting services')
-        host.service_stop('squid-deb-proxy')
-        host.service_stop('apache2')
-        return
-
-    # TODO check that /srv/archive.ubuntu.com/www/ubuntu exists
-    # Start the services
-    host.service_reload('squid-deb-proxy', restart_on_failure=True)
-    # TODO check that http://localhost/ubuntu/pool/ responds
-    host.service_reload('apache2', restart_on_failure=True)
-    # TODO check that http://localhost/ubuntu/ responds