Github-like sites due to DNS and SSL limitations

app.py

@@ -1521,6 +1521,11 @@ def repository_settings_post(username, repository):

                                
                                
                                
                            
                                
                                    
                                        
                                            1521  
                                                    # Remove the site
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1522  
                                                    result = celery_tasks.delete_site.delay(repo.route)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1523  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1524 +
                                            if repo.has_site == 2 or (had_site == 2 and had_site != repo.has_site):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1525 +
                                                # Deploy all other sites which were destroyed by the primary site
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1526 +
                                                for other_repo in Repo.query.filter_by(owner=repo.owner, has_site=1):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1527 +
                                                    result = celery_tasks.copy_site.delay(other_repo.route)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1528 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1529  
                                                return flask.redirect(f"/{username}/{repository}/settings", 303)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1530  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1531  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

celery_tasks.py

@@ -92,11 +92,9 @@ def copy_site(route):

                                
                                
                                
                            
                                
                                    
                                        
                                            92  
                                                from models import Repo
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            93  
                                                repo = db.session.get(Repo, route)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            94  
                                                server_repo_location = os.path.join(config.REPOS_PATH, route.lstrip("/"))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        95 -
                                            if repo.has_site == 2:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        96 -
                                                subdomain = repo.owner.username
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        97 -
                                            else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 -
                                                subdomain = repo.name + "." + repo.owner.username
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        99 -
                                            site_location = os.path.join(config.SITE_PATH, subdomain)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        95 +
                                            subdomain = repo.owner.username
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        96 +
                                            subpath = repo.name if repo.has_site != 2 else "."
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        97 +
                                            site_location = os.path.join(config.SITE_PATH, subdomain, subpath)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            98  
                                                # Get the branch to be used for the site; if it somehow doesn't exist, use the default branch.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            99  
                                                branch = repo.site_branch or repo.default_branch
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            100  
                                                # Make a shallow clone of the repo; this prevents getting the full git database when it's not needed.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -104,17 +102,20 @@ def copy_site(route):

                                
                                
                                
                            
                                
                                    
                                        
                                            102  
                                                    # Delete the old site.
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            103  
                                                    shutil.rmtree(site_location)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            104  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        107 -
                                            common.git_command(config.SITE_PATH, b"", "clone", "--depth=1", f"--branch={branch}", os.path.join(os.getcwd(), server_repo_location), subdomain)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        105 +
                                            common.git_command(config.SITE_PATH, b"", "clone", "--depth=1", f"--branch={branch}", os.path.join(os.getcwd(), server_repo_location), os.path.join(subdomain, subpath))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            106  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            107  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            108  
                                            @shared_task(ignore_result=False)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            109  
                                            def delete_site(route):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            110  
                                                from models import Repo
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            111  
                                                repo = db.session.get(Repo, route)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        114 -
                                            if repo.has_site == 2:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        115 -
                                                subdomain = repo.owner.username
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        116 -
                                            else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        117 -
                                                subdomain = repo.name + "." + repo.owner.username
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        118 -
                                            site_location = os.path.join(config.SITE_PATH, subdomain)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        112 +
                                            subdomain = repo.owner.username
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        113 +
                                            subpath = repo.name if repo.has_site != 2 else "."
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        114 +
                                            site_location = os.path.join(config.SITE_PATH, subdomain, subpath)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            115  
                                                if os.path.isdir(site_location):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            116  
                                                    shutil.rmtree(site_location)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        117 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        118 +
                                            # Redo the primary site.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        119 +
                                            primary_site = Repo.query.filter_by(owner=repo.owner, has_site=2).first()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        120 +
                                            if primary_site:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        121 +
                                                copy_site(primary_site.route)