Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Commit

Permalink
bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mon-ius
Mon-ius committed Mar 18, 2019
1 parent 2daa8cd commit 35bc229
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 67 deletions.
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ Suppose location : `/opt/anaconda3`
- bug fixed
- Version 0.3.2 March 18,2019
- bug fixed
- Version 0.3.3 March 18,2019
- bug fixed
- Version 0.3.4 March 18,2019
- deploy bug fixed

## MIT License

Expand Down
0 flaskdeploy/run_proto.py → flaskdeploy/prototype/run_proto.py
View file
File renamed without changes.
59 changes: 57 additions & 2 deletions flaskdeploy/scripts/deploy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from ..validation import *
from ..utils import *

from .dns import *
# from .dns import *

import subprocess
import getpass
Expand All @@ -23,6 +23,59 @@
# raise JumpOutFuckingClick


@click.command(context_settings=dict(
allow_extra_args=True
))
@click.option('--dns_type', prompt='Service options. \n [1] CloudFlare \n [2] AliYun \n\n\nYour Choice')
@click.pass_context
def miss_ssl(ctx,dns_type):
"""
These are available DNS provider servie options. \n
[1] CloudFlare <CF_Email,CF_Key> --dns dns_cf \n
[2] AliYun <Ali_Key,Ali_Secret> --dns dns_ali \n
"""
# if not dns_type:
if(str(dns_type)=="1"):
try:
op_cf()
except JumpOutFuckingClick2:
pass
if(str(dns_type)=="2"):
try:
op_ali()
except JumpOutFuckingClick2:
pass
raise JumpOutFuckingClick


@click.command(short_help='AliYun Option',context_settings=dict(
allow_extra_args=True
))
@click.option('--ali_key', prompt='Ali_Key')
@click.option('--ali_secret', prompt='Ali_Secret')
@click.pass_context
def op_ali(ctx,ali_key,ali_secret):
dns_op = "dns_ali"
op_1 = "Ali_Key={}".format(ali_key)
op_2 = "Ali_Secret={}".format(ali_secret)
ssl_multi_gen(DOMAIN, USR, CUR_LOC, op_1,op_2,dns_op)

raise JumpOutFuckingClick2

@click.command(short_help='CloudFlare Option',context_settings=dict(
allow_extra_args=True
))
@click.option('--cf_email', prompt='CF_Email')
@click.option('--cf_key', prompt='CF_Key')
@click.pass_context
def op_cf(ctx,cf_email,cf_key):
dns_op = "dns_cf"
op_1 = "CF_Email={}".format(cf_email)
op_2 = "CF_Key={}".format(cf_key)
ssl_multi_gen(DOMAIN, USR, CUR_LOC, op_1,op_2,dns_op)

raise JumpOutFuckingClick2

@click.command()
@click.option('--domain', prompt='Your domain', help='The domain to be configured.',
callback=validate_domain
Expand Down Expand Up @@ -77,4 +130,6 @@ def cli(ctx, domain, dns_option,docker):
except JumpOutFuckingClick2:
pass

script_files_run(DOMAIN, USR, CUR_LOC)
script_files_gen(DOMAIN, USR, CUR_LOC)
script_files_run(DOMAIN, USR, CUR_LOC)

62 changes: 62 additions & 0 deletions flaskdeploy/scripts/dns(drop).py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# from ..config import *
# from ..validation import *
# from ..utils import *

# import subprocess
# import getpass
# import os
# import click

# @click.command(context_settings=dict(
# allow_extra_args=True
# ))
# @click.option('--dns_type', prompt='Service options. \n [1] CloudFlare \n [2] AliYun \n\n\nYour Choice')
# @click.pass_context
# def miss_ssl(ctx,dns_type):
# """
# These are available DNS provider servie options. \n
# [1] CloudFlare <CF_Email,CF_Key> --dns dns_cf \n
# [2] AliYun <Ali_Key,Ali_Secret> --dns dns_ali \n
# """
# # if not dns_type:
# if(str(dns_type)=="1"):
# try:
# op_cf()
# except JumpOutFuckingClick2:
# pass
# if(str(dns_type)=="2"):
# try:
# op_ali()
# except JumpOutFuckingClick2:
# pass
# raise JumpOutFuckingClick


# @click.command(short_help='AliYun Option',context_settings=dict(
# allow_extra_args=True
# ))
# @click.option('--ali_key', prompt='Ali_Key')
# @click.option('--ali_secret', prompt='Ali_Secret')
# @click.pass_context
# def op_ali(ctx,ali_key,ali_secret):
# dns_op = "dns_ali"
# op_1 = "Ali_Key={}".format(ali_key)
# op_2 = "Ali_Secret={}".format(ali_secret)
# ssl_multi_gen(DOMAIN, USR, CUR_LOC, op_1,op_2,dns_op)

# raise JumpOutFuckingClick2

# @click.command(short_help='CloudFlare Option',context_settings=dict(
# allow_extra_args=True
# ))
# @click.option('--cf_email', prompt='CF_Email')
# @click.option('--cf_key', prompt='CF_Key')
# @click.pass_context
# def op_cf(ctx,cf_email,cf_key):
# dns_op = "dns_cf"
# op_1 = "CF_Email={}".format(cf_email)
# op_2 = "CF_Key={}".format(cf_key)
# ssl_multi_gen(DOMAIN, USR, CUR_LOC, op_1,op_2,dns_op)

# raise JumpOutFuckingClick2

62 changes: 0 additions & 62 deletions flaskdeploy/scripts/dns.py
View file

This file was deleted.

60 changes: 58 additions & 2 deletions flaskdeploy/scripts/generation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
from ..validation import *
from ..utils import *

from .dns import *
# from .dns import *

import subprocess
import getpass
import os

import click


# @click.command(context_settings=dict(
# allow_extra_args=True
# ))
Expand All @@ -22,6 +23,59 @@
# ssl_file_gen(DOMAIN, USR, CUR_LOC, email, key)
# raise JumpOutFuckingClick

@click.command(context_settings=dict(
allow_extra_args=True
))
@click.option('--dns_type', prompt='Service options. \n [1] CloudFlare \n [2] AliYun \n\n\nYour Choice')
@click.pass_context
def miss_ssl(ctx,dns_type):
"""
These are available DNS provider servie options. \n
[1] CloudFlare <CF_Email,CF_Key> --dns dns_cf \n
[2] AliYun <Ali_Key,Ali_Secret> --dns dns_ali \n
"""
# if not dns_type:
if(str(dns_type)=="1"):
try:
op_cf()
except JumpOutFuckingClick2:
pass
if(str(dns_type)=="2"):
try:
op_ali()
except JumpOutFuckingClick2:
pass
raise JumpOutFuckingClick


@click.command(short_help='AliYun Option',context_settings=dict(
allow_extra_args=True
))
@click.option('--ali_key', prompt='Ali_Key')
@click.option('--ali_secret', prompt='Ali_Secret')
@click.pass_context
def op_ali(ctx,ali_key,ali_secret):
dns_op = "dns_ali"
op_1 = "Ali_Key={}".format(ali_key)
op_2 = "Ali_Secret={}".format(ali_secret)
ssl_multi_gen(DOMAIN, USR, CUR_LOC, op_1,op_2,dns_op)

raise JumpOutFuckingClick2

@click.command(short_help='CloudFlare Option',context_settings=dict(
allow_extra_args=True
))
@click.option('--cf_email', prompt='CF_Email')
@click.option('--cf_key', prompt='CF_Key')
@click.pass_context
def op_cf(ctx,cf_email,cf_key):
dns_op = "dns_cf"
op_1 = "CF_Email={}".format(cf_email)
op_2 = "CF_Key={}".format(cf_key)
ssl_multi_gen(DOMAIN, USR, CUR_LOC, op_1,op_2,dns_op)

raise JumpOutFuckingClick2

@click.command()
@click.option('--domain', prompt='Your domain', help='The domain to be configured.',
callback=validate_domain
Expand Down Expand Up @@ -73,4 +127,6 @@ def cli(ctx, domain, dns_option,docker):
try:
op_ali()
except JumpOutFuckingClick2:
pass
pass
script_files_gen(DOMAIN, USR, CUR_LOC)

2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setuptools.setup(
name='flask-deploy',
version='0.3.2',
version='0.3.4',
description='A quick deploy script for productive flask app',
url='https://github.com/Mon-ius/flask-deploy',
author='Mon-ius',
Expand Down

0 comments on commit 35bc229

Please sign in to comment.