diff --git a/firewall/migrations/0021_auto__add_field_host_created_at__add_field_host_modified_at__add_field.py b/firewall/migrations/0021_auto__add_field_host_created_at__add_field_host_modified_at__add_field.py new file mode 100644 index 0000000..217cbee --- /dev/null +++ b/firewall/migrations/0021_auto__add_field_host_created_at__add_field_host_modified_at__add_field.py @@ -0,0 +1,230 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Host.created_at' + db.add_column('firewall_host', 'created_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Host.modified_at' + db.add_column('firewall_host', 'modified_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Group.created_at' + db.add_column('firewall_group', 'created_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Group.modified_at' + db.add_column('firewall_group', 'modified_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Vlan.created_at' + db.add_column('firewall_vlan', 'created_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Vlan.modified_at' + db.add_column('firewall_vlan', 'modified_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Rule.created_at' + db.add_column('firewall_rule', 'created_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Rule.modified_at' + db.add_column('firewall_rule', 'modified_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Alias.owner' + db.add_column('firewall_alias', 'owner', + self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True), + keep_default=False) + + # Adding field 'Alias.created_at' + db.add_column('firewall_alias', 'created_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + # Adding field 'Alias.modified_at' + db.add_column('firewall_alias', 'modified_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2013, 1, 28, 0, 0), blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Host.created_at' + db.delete_column('firewall_host', 'created_at') + + # Deleting field 'Host.modified_at' + db.delete_column('firewall_host', 'modified_at') + + # Deleting field 'Group.created_at' + db.delete_column('firewall_group', 'created_at') + + # Deleting field 'Group.modified_at' + db.delete_column('firewall_group', 'modified_at') + + # Deleting field 'Vlan.created_at' + db.delete_column('firewall_vlan', 'created_at') + + # Deleting field 'Vlan.modified_at' + db.delete_column('firewall_vlan', 'modified_at') + + # Deleting field 'Rule.created_at' + db.delete_column('firewall_rule', 'created_at') + + # Deleting field 'Rule.modified_at' + db.delete_column('firewall_rule', 'modified_at') + + # Deleting field 'Alias.owner' + db.delete_column('firewall_alias', 'owner_id') + + # Deleting field 'Alias.created_at' + db.delete_column('firewall_alias', 'created_at') + + # Deleting field 'Alias.modified_at' + db.delete_column('firewall_alias', 'modified_at') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'firewall.alias': { + 'Meta': {'object_name': 'Alias'}, + 'alias': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'host': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['firewall.Host']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + 'firewall.firewall': { + 'Meta': {'object_name': 'Firewall'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'rules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['firewall.Rule']", 'null': 'True', 'blank': 'True'}) + }, + 'firewall.group': { + 'Meta': {'object_name': 'Group'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'rules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['firewall.Rule']", 'null': 'True', 'blank': 'True'}) + }, + 'firewall.host': { + 'Meta': {'object_name': 'Host'}, + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['firewall.Group']", 'null': 'True', 'blank': 'True'}), + 'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), + 'ipv6': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'pub_ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}), + 'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}), + 'rules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['firewall.Rule']", 'null': 'True', 'blank': 'True'}), + 'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['firewall.Vlan']"}) + }, + 'firewall.rule': { + 'Meta': {'object_name': 'Rule'}, + 'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'direction': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'nat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'nat_dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'proto': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'r_type': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'sport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'vlan': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}) + }, + 'firewall.setting': { + 'Meta': {'object_name': 'Setting'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'firewall.vlan': { + 'Meta': {'object_name': 'Vlan'}, + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'domain': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), + 'ipv6': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'net4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), + 'net6': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}), + 'prefix4': ('django.db.models.fields.IntegerField', [], {'default': '16'}), + 'prefix6': ('django.db.models.fields.IntegerField', [], {'default': '80'}), + 'rules': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'firewall_vlan_related'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['firewall.Rule']"}), + 'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}), + 'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}), + 'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}) + } + } + + complete_apps = ['firewall'] \ No newline at end of file diff --git a/firewall/models.py b/firewall/models.py index 2a2fef1..e4799ee 100644 --- a/firewall/models.py +++ b/firewall/models.py @@ -31,6 +31,8 @@ class Rule(models.Model): r_type = models.CharField(max_length=10, choices=CHOICES_type) nat = models.BooleanField(default=False) nat_dport = models.IntegerField(blank=True, null=True, validators=[MinValueValidator(1), MaxValueValidator(65535)]) + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) def __unicode__(self): return self.desc() @@ -79,6 +81,8 @@ class Vlan(models.Model): comment = models.TextField(blank=True) domain = models.TextField(blank=True, validators=[val_domain]) dhcp_pool = models.TextField(blank=True) + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) def __unicode__(self): return self.name @@ -100,6 +104,8 @@ class Vlan(models.Model): class Group(models.Model): name = models.CharField(max_length=20, unique=True) rules = models.ManyToManyField('Rule', symmetrical=False, blank=True, null=True) + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) def __unicode__(self): return self.name @@ -107,6 +113,9 @@ class Group(models.Model): class Alias(models.Model): host = models.ForeignKey('Host') alias = models.CharField(max_length=40, unique=True, validators=[val_domain]) + owner = models.ForeignKey(User, null=True, blank=True) + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) class Meta: verbose_name_plural = 'aliases' @@ -125,6 +134,8 @@ class Host(models.Model): owner = models.ForeignKey(User) groups = models.ManyToManyField('Group', symmetrical=False, blank=True, null=True) rules = models.ManyToManyField('Rule', symmetrical=False, blank=True, null=True) + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) def __unicode__(self): return self.hostname diff --git a/miscellaneous/devenv/init.sh b/miscellaneous/devenv/init.sh index c7ae71d..951ba52 100755 --- a/miscellaneous/devenv/init.sh +++ b/miscellaneous/devenv/init.sh @@ -49,4 +49,27 @@ cd cloud ./manage.py loaddata /home/cloud/user.yaml 2>/dev/null || true ./manage.py loaddata /home/cloud/fw.yaml ./manage.py loaddata /home/cloud/one.yaml +./manage.py loaddata /home/cloud/store.yaml ./manage.py update + +#Set up store server +rm -rf /var/www/* +mkdir -p /var/www +cd /opt/webadmin/cloud/miscellaneous/store-server/ +LOCAL_IP=$(ip addr show dev eth0|grep inet|head -1|awk '{print $2}'|cut -d '/' -f 1) +cat <<EOF > store.config +[store] +#Default root folder (for download and upload) +root_www_folder = /var/www +#Deafult binary folder (for executables) +root_bin_folder = /opt/webadmin/cloud/miscellaneous/store-server/ +#Site host (for standalone server) +site_host = 0.0.0.0 +#Site port (for standalone server) +site_port = 9000 +#Site url (for download and upload links) %(variable)formatter ex: %(port)s +site_url = http://${LOCAL_IP}:%(site_port)s +#User manager script (add, del, set, update) +user_manager = FAKEUserManager.sh +EOF +sudo /opt/webadmin/cloud/miscellaneous/store-server/CloudStore.py >/dev/null 2>&1 & diff --git a/miscellaneous/devenv/user.yaml b/miscellaneous/devenv/user.yaml index e3030cb..23d2aa0 100644 --- a/miscellaneous/devenv/user.yaml +++ b/miscellaneous/devenv/user.yaml @@ -83,7 +83,7 @@ is_superuser: true last_login: 2013-01-22 15:21:22+00:00 last_name: '' - password: pbkdf2_sha256$10000$gx04X6OpW8kW$iCU3cuhqQcvq7I8tRVkrnES03ty/3vqN8ou4xZgfPBQ= + password: pbkdf2_sha256$10000$tHbyy0OTBCBQ$YVdhrXZVK6wi7Px/zX5zmpOGkQUnddXXdrwNFnJskx0= user_permissions: [] username: test model: auth.user diff --git a/miscellaneous/store-server/CloudStore.py b/miscellaneous/store-server/CloudStore.py index 79e62d2..9a8d257 100755 --- a/miscellaneous/store-server/CloudStore.py +++ b/miscellaneous/store-server/CloudStore.py @@ -11,7 +11,7 @@ from pwd import getpwnam #Get configuration file config = ConfigParser.ConfigParser() -config.read('store.config') +config.read('/opt/webadmin/cloud/miscellaneous/store-server/store.config') #ROOT_WWW_FOLDER='/var/www' diff --git a/store/api.py b/store/api.py index cb6563a..d8837db 100644 --- a/store/api.py +++ b/store/api.py @@ -20,23 +20,23 @@ class StoreApi: headers = {'content-type': 'application/json'} if settings['ssl_auth'] == 'True' and settings['basic_auth'] == 'True': r = requests.post(url, data=payload, headers=headers, \ - verify = settings['verify_ssl'], \ + verify = settings['verify_ssl']=='True', \ cert=(settings['store_client_cert'], settings['store_client_key']), \ auth=(settings['store_client_user'], settings['store_client_pass']) ) elif settings['ssl_auth'] == 'True': r = requests.post(url, data=payload, headers=headers, \ - verify = settings['verify_ssl'], \ + verify = settings['verify_ssl']=='True', \ cert=(settings['store_client_cert'], settings['store_client_key']) \ ) elif settings['basic_auth'] == 'True': r = requests.post(url, data=payload, headers=headers, \ - verify = settings['verify_ssl'], \ + verify = settings['verify_ssl']=='True', \ auth=(settings['store_client_user'], settings['store_client_pass']) \ ) else: r = requests.post(url, data=payload, headers=headers, \ - verify = settings['verify_ssl'] \ + verify = settings['verify_ssl']=='True' \ ) return r @staticmethod @@ -44,23 +44,23 @@ class StoreApi: headers = {'content-type': 'application/json'} if settings['ssl_auth'] == 'True' and settings['basic_auth'] == 'True': r = requests.get(url, headers=headers, \ - verify = settings['verify_ssl'], \ + verify = settings['verify_ssl']=='True', \ cert=(settings['store_client_cert'], settings['store_client_key']), \ auth=(settings['store_client_user'], settings['store_client_pass']) ) elif settings['ssl_auth'] == 'True': r = requests.get(url, headers=headers, \ - verify = settings['verify_ssl'], \ + verify = settings['verify_ssl']=='True', \ cert=(settings['store_client_cert'], settings['store_client_key']) \ ) elif settings['basic_auth'] == 'True': r = requests.get(url, headers=headers, \ - verify = settings['verify_ssl'], \ + verify = settings['verify_ssl']=='True', \ auth=(settings['store_client_user'], settings['store_client_pass']) \ ) else: r = requests.get(url, headers=headers, \ - verify = settings['verify_ssl'] \ + verify = settings['verify_ssl']=='True' \ ) return r @staticmethod