diff --git a/Libros/K8S/libros-deployment.yaml b/Libros/K8S/libros-deployment.yaml index c36c179..068f97b 100644 --- a/Libros/K8S/libros-deployment.yaml +++ b/Libros/K8S/libros-deployment.yaml @@ -48,17 +48,22 @@ spec: name: libros resources: {} volumeMounts: - - mountPath: /libros/instance - name: libros-instance - - mountPath: /libros/migrations + - mountPath: /libros/media + name: libros-media + - mountPath: /libros/datos + name: libros-datos + - mountPath: /libros/gestion/migrations name: libros-migrations imagePullSecrets: - name: myregistrykey restartPolicy: Always volumes: - - name: libros-instance + - name: libros-media persistentVolumeClaim: - claimName: libros-instance + claimName: libros-media + - name: libros-datos + persistentVolumeClaim: + claimName: libros-datos - name: libros-migrations persistentVolumeClaim: claimName: libros-migrations diff --git a/Libros/K8S/libros-prod-persistentvolumeclaim.yaml b/Libros/K8S/libros-prod-persistentvolumeclaim.yaml index 416c734..c747431 100644 --- a/Libros/K8S/libros-prod-persistentvolumeclaim.yaml +++ b/Libros/K8S/libros-prod-persistentvolumeclaim.yaml @@ -3,8 +3,8 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: libros-instance - name: libros-instance + io.kompose.service: libros-media + name: libros-media spec: accessModes: - ReadWriteOnce @@ -27,4 +27,19 @@ spec: requests: storage: 50Mi status: {} +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: libros-datos + name: libros-datos +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 150Mi +status: {} diff --git a/Libros/K8S/pv-local-libros.yaml b/Libros/K8S/pv-local-libros.yaml index 2c503a2..9fb0283 100644 --- a/Libros/K8S/pv-local-libros.yaml +++ b/Libros/K8S/pv-local-libros.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: libros-instance-folder + name: libros-media-folder labels: app: libros spec: @@ -10,7 +10,7 @@ spec: accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/libros/instance" + path: "/mnt/Externo/libros/media" --- apiVersion: v1 kind: PersistentVolume @@ -25,4 +25,18 @@ spec: - ReadWriteOnce hostPath: path: "/mnt/Externo/libros/migrations" +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: libros-datos-folder + labels: + app: libros +spec: + capacity: + storage: 50Mi + accessModes: + - ReadWriteOnce + hostPath: + path: "/mnt/Externo/libros/datos" diff --git a/Libros/biblioteca/datos/libros.sqlite3 b/Libros/biblioteca/datos/libros.sqlite3 index 4d98560..c4fb94b 100644 Binary files a/Libros/biblioteca/datos/libros.sqlite3 and b/Libros/biblioteca/datos/libros.sqlite3 differ diff --git a/Libros/biblioteca/gestion/migrations/0001_initial.py b/Libros/biblioteca/gestion/migrations/0001_initial.py index fbf1070..bf54df8 100644 --- a/Libros/biblioteca/gestion/migrations/0001_initial.py +++ b/Libros/biblioteca/gestion/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.1 on 2024-08-13 12:55 +# Generated by Django 5.1 on 2024-08-13 14:36 import django.core.validators import django.db.models.deletion diff --git a/Libros/biblioteca/gestion/migrations/0002_autor_reymotauser_is_active_reymotauser_is_staff_and_more.py b/Libros/biblioteca/gestion/migrations/0002_autor_reymotauser_is_active_reymotauser_is_staff_and_more.py deleted file mode 100644 index daa1d50..0000000 --- a/Libros/biblioteca/gestion/migrations/0002_autor_reymotauser_is_active_reymotauser_is_staff_and_more.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-09 09:13 - -import django.core.validators -import django.db.models.deletion -import gestion.models -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('gestion', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='reymotauser', - name='is_active', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='reymotauser', - name='is_staff', - field=models.BooleanField(default=False), - ), - ] diff --git a/Libros/biblioteca/gestion/migrations/0003_autor_libro.py b/Libros/biblioteca/gestion/migrations/0003_autor_libro.py deleted file mode 100644 index 74044a7..0000000 --- a/Libros/biblioteca/gestion/migrations/0003_autor_libro.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-09 11:18 - -import django.core.validators -import django.db.models.deletion -import gestion.models -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('gestion', '0002_autor_reymotauser_is_active_reymotauser_is_staff_and_more'), - ] - - operations = [ - migrations.CreateModel( - name='Autor', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nombre', models.CharField(max_length=200)), - ('biografia', models.TextField(blank=True, null=True)), - ('foto', models.ImageField(blank=True, null=True, upload_to='autores/')), - ], - ), - migrations.CreateModel( - name='Libro', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('titulo', models.CharField(max_length=200)), - ('fecha_publicacion', models.PositiveBigIntegerField(default=2024, validators=[django.core.validators.MinValueValidator(1984), gestion.models.max_value_current_year])), - ('descripcion', models.TextField(blank=True, null=True)), - ('archivo', models.FileField(upload_to='libros/')), - ('portada', models.ImageField(blank=True, null=True, upload_to='portadas/')), - ('autor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gestion.autor')), - ], - ), - ] diff --git a/Libros/biblioteca/gestion/migrations/0004_reymotauser_nombre.py b/Libros/biblioteca/gestion/migrations/0004_reymotauser_nombre.py deleted file mode 100644 index c0d361e..0000000 --- a/Libros/biblioteca/gestion/migrations/0004_reymotauser_nombre.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-09 11:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('gestion', '0003_autor_libro'), - ] - - operations = [ - migrations.AddField( - model_name='reymotauser', - name='nombre', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/Libros/biblioteca/gestion/migrations/0005_alter_reymotauser_nombre.py b/Libros/biblioteca/gestion/migrations/0005_alter_reymotauser_nombre.py deleted file mode 100644 index 03fbf53..0000000 --- a/Libros/biblioteca/gestion/migrations/0005_alter_reymotauser_nombre.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-09 11:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('gestion', '0004_reymotauser_nombre'), - ] - - operations = [ - migrations.AlterField( - model_name='reymotauser', - name='nombre', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_5U31hTv.jpg b/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_5U31hTv.jpg new file mode 100644 index 0000000..8043105 Binary files /dev/null and b/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_5U31hTv.jpg differ diff --git a/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234_YeZB9yy.epub b/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234_YeZB9yy.epub new file mode 100644 index 0000000..c7ba50f Binary files /dev/null and b/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234_YeZB9yy.epub differ diff --git a/Libros/biblioteca/portadas/lecciones.jpeg b/Libros/biblioteca/media/portadas/lecciones_NYOL9o4.jpeg similarity index 100% rename from Libros/biblioteca/portadas/lecciones.jpeg rename to Libros/biblioteca/media/portadas/lecciones_NYOL9o4.jpeg diff --git a/Libros/biblioteca/media/profile_images/foto.jpeg b/Libros/biblioteca/media/profile_images/foto.jpeg deleted file mode 100644 index 464838d..0000000 Binary files a/Libros/biblioteca/media/profile_images/foto.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/profile_images/gravatar-tino_HwEb5r4.jpeg b/Libros/biblioteca/media/profile_images/gravatar-tino_HwEb5r4.jpeg deleted file mode 100644 index 98ef9b0..0000000 Binary files a/Libros/biblioteca/media/profile_images/gravatar-tino_HwEb5r4.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/profile_images/gravatar-tino_gfVAoVx.jpeg b/Libros/biblioteca/media/profile_images/gravatar-tino_gfVAoVx.jpeg deleted file mode 100644 index 98ef9b0..0000000 Binary files a/Libros/biblioteca/media/profile_images/gravatar-tino_gfVAoVx.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/profile_images/nebraska.jpg b/Libros/biblioteca/media/profile_images/nebraska.jpg deleted file mode 100644 index eebc1a5..0000000 Binary files a/Libros/biblioteca/media/profile_images/nebraska.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/profile_images/theriver.jpg b/Libros/biblioteca/media/profile_images/theriver.jpg deleted file mode 100644 index 3caa7cd..0000000 Binary files a/Libros/biblioteca/media/profile_images/theriver.jpg and /dev/null differ diff --git a/Libros/biblioteca/portadas/invisible.jpeg b/Libros/biblioteca/portadas/invisible.jpeg deleted file mode 100644 index e09fb7f..0000000 Binary files a/Libros/biblioteca/portadas/invisible.jpeg and /dev/null differ diff --git a/Libros/biblioteca/portadas/palacio.jpeg b/Libros/biblioteca/portadas/palacio.jpeg deleted file mode 100644 index df52665..0000000 Binary files a/Libros/biblioteca/portadas/palacio.jpeg and /dev/null differ diff --git a/Libros/biblioteca/portadas/sunsetpark.jpeg b/Libros/biblioteca/portadas/sunsetpark.jpeg deleted file mode 100644 index 0f249cd..0000000 Binary files a/Libros/biblioteca/portadas/sunsetpark.jpeg and /dev/null differ diff --git a/Libros/biblioteca/profile_images/gravatar-tino.jpeg b/Libros/biblioteca/profile_images/gravatar-tino.jpeg deleted file mode 100644 index 98ef9b0..0000000 Binary files a/Libros/biblioteca/profile_images/gravatar-tino.jpeg and /dev/null differ diff --git a/Libros/biblioteca/profile_images/nebraska.jpg b/Libros/biblioteca/profile_images/nebraska.jpg deleted file mode 100644 index eebc1a5..0000000 Binary files a/Libros/biblioteca/profile_images/nebraska.jpg and /dev/null differ diff --git a/Libros/biblioteca/profile_images/theriver.jpg b/Libros/biblioteca/profile_images/theriver.jpg deleted file mode 100644 index 3caa7cd..0000000 Binary files a/Libros/biblioteca/profile_images/theriver.jpg and /dev/null differ