From 86de78348ae517587a528e5f4937dd3623a4460b Mon Sep 17 00:00:00 2001 From: Vyacheslav Anzhiganov Date: Sat, 2 Apr 2016 08:33:34 +0300 Subject: [PATCH] move exec files --- swscloud-admin-add.py => exec/swscloud-admin-add.py | 0 cli-admin-ls.py => exec/swscloud-admin-ls.py | 1 + cli-admin-passwd.py => exec/swscloud-admin-passwd.py | 0 swscloud-db-init.py => exec/swscloud-db-init.py | 2 +- cli-dc-add.py => exec/swscloud-dc-add.py | 2 ++ cli-dc-ls.py => exec/swscloud-dc-ls.py | 2 ++ cli-ip-add.py => exec/swscloud-ip-add.py | 2 ++ swscloud-runserver.py => exec/swscloud-runserver.py | 2 +- cli-server-add.py => exec/swscloud-server-add.py | 6 ++---- cli-server-ls.py => exec/swscloud-server-ls.py | 1 + cli-settings-init.py => exec/swscloud-settings-init.py | 6 +++--- 11 files changed, 15 insertions(+), 9 deletions(-) rename swscloud-admin-add.py => exec/swscloud-admin-add.py (100%) rename cli-admin-ls.py => exec/swscloud-admin-ls.py (95%) rename cli-admin-passwd.py => exec/swscloud-admin-passwd.py (100%) rename swscloud-db-init.py => exec/swscloud-db-init.py (96%) rename cli-dc-add.py => exec/swscloud-dc-add.py (97%) rename cli-dc-ls.py => exec/swscloud-dc-ls.py (96%) rename cli-ip-add.py => exec/swscloud-ip-add.py (97%) rename swscloud-runserver.py => exec/swscloud-runserver.py (80%) rename cli-server-add.py => exec/swscloud-server-add.py (96%) rename cli-server-ls.py => exec/swscloud-server-ls.py (96%) rename cli-settings-init.py => exec/swscloud-settings-init.py (91%) diff --git a/swscloud-admin-add.py b/exec/swscloud-admin-add.py similarity index 100% rename from swscloud-admin-add.py rename to exec/swscloud-admin-add.py diff --git a/cli-admin-ls.py b/exec/swscloud-admin-ls.py similarity index 95% rename from cli-admin-ls.py rename to exec/swscloud-admin-ls.py index 33c5438..7481075 100644 --- a/cli-admin-ls.py +++ b/exec/swscloud-admin-ls.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # coding: utf-8 from SWSCloudCore import models diff --git a/cli-admin-passwd.py b/exec/swscloud-admin-passwd.py similarity index 100% rename from cli-admin-passwd.py rename to exec/swscloud-admin-passwd.py diff --git a/swscloud-db-init.py b/exec/swscloud-db-init.py similarity index 96% rename from swscloud-db-init.py rename to exec/swscloud-db-init.py index a2ca406..514a606 100644 --- a/swscloud-db-init.py +++ b/exec/swscloud-db-init.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python from SWSCloudCore import models diff --git a/cli-dc-add.py b/exec/swscloud-dc-add.py similarity index 97% rename from cli-dc-add.py rename to exec/swscloud-dc-add.py index 23a7d99..93d3a64 100644 --- a/cli-dc-add.py +++ b/exec/swscloud-dc-add.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import argparse from uuid import uuid4 diff --git a/cli-dc-ls.py b/exec/swscloud-dc-ls.py similarity index 96% rename from cli-dc-ls.py rename to exec/swscloud-dc-ls.py index 22254de..d4c409b 100644 --- a/cli-dc-ls.py +++ b/exec/swscloud-dc-ls.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import argparse from SWSCloudCore import models diff --git a/cli-ip-add.py b/exec/swscloud-ip-add.py similarity index 97% rename from cli-ip-add.py rename to exec/swscloud-ip-add.py index fa1ccef..a1b9889 100644 --- a/cli-ip-add.py +++ b/exec/swscloud-ip-add.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import argparse from SWSCloudCore import models diff --git a/swscloud-runserver.py b/exec/swscloud-runserver.py similarity index 80% rename from swscloud-runserver.py rename to exec/swscloud-runserver.py index 2a0cbec..a771076 100644 --- a/swscloud-runserver.py +++ b/exec/swscloud-runserver.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python # coding: utf-8 from SWSCloudCore import app diff --git a/cli-server-add.py b/exec/swscloud-server-add.py similarity index 96% rename from cli-server-add.py rename to exec/swscloud-server-add.py index dfa4f80..ea94b70 100644 --- a/cli-server-add.py +++ b/exec/swscloud-server-add.py @@ -1,11 +1,9 @@ +#!/usr/bin/env python + import argparse from uuid import uuid4 - from SWSCloudCore.controllers import ControllerManageServer -__author__ = 'vanzhiganov' - - parser = argparse.ArgumentParser(description='') parser.add_argument('--dc', dest="datacenter") parser.add_argument('--secret', dest="secret") diff --git a/cli-server-ls.py b/exec/swscloud-server-ls.py similarity index 96% rename from cli-server-ls.py rename to exec/swscloud-server-ls.py index 380e9c3..e8c22a7 100644 --- a/cli-server-ls.py +++ b/exec/swscloud-server-ls.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python import argparse from SWSCloudCore import models diff --git a/cli-settings-init.py b/exec/swscloud-settings-init.py similarity index 91% rename from cli-settings-init.py rename to exec/swscloud-settings-init.py index ffbcccc..6018890 100644 --- a/cli-settings-init.py +++ b/exec/swscloud-settings-init.py @@ -1,6 +1,6 @@ -from SWSCloudCore import models +#!/usr/bin/env python -__author__ = 'vanzhiganov' +from SWSCloudCore import models def create_key(key, val=''): @@ -32,7 +32,7 @@ create_key('CLOUDNS_HOST_BALANCE', 'lb.gocloud.ru') create_key('footer_code', '') create_key("mail.template_name", "simple") -create_key('mail.logotype', "https://procdn.ru/static/images/logo/procdn-logo-48.png") +create_key('mail.logotype', "https://gocloud.ru/static/images/logo/procdn-logo-48.png") create_key("mail.company_name", "ProCDN.ru") create_key("contacts.email", "support@procdn.ru")